[ros-diffs] [sserapion] 47469: sync to trunk (r47468)

sserapion at svn.reactos.org sserapion at svn.reactos.org
Mon May 31 00:17:14 CEST 2010


Author: sserapion
Date: Mon May 31 00:17:13 2010
New Revision: 47469

URL: http://svn.reactos.org/svn/reactos?rev=47469&view=rev
Log:
sync to trunk (r47468)

Modified:
    branches/ros-amd64-bringup/reactos/   (props changed)
    branches/ros-amd64-bringup/reactos/base/applications/calc/convert.c
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ro-RO.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc
    branches/ros-amd64-bringup/reactos/base/applications/calc/resource.h
    branches/ros-amd64-bringup/reactos/base/applications/calc/utl.c
    branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c
    branches/ros-amd64-bringup/reactos/base/applications/dxdiag/ddtest.c
    branches/ros-amd64-bringup/reactos/base/applications/dxdiag/input.c
    branches/ros-amd64-bringup/reactos/base/applications/dxdiag/network.c
    branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c
    branches/ros-amd64-bringup/reactos/base/applications/fontview/fontview.c
    branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c
    branches/ros-amd64-bringup/reactos/base/applications/magnify/magnifier.c
    branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c
    branches/ros-amd64-bringup/reactos/base/applications/network/arp/arp.c
    branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.c
    branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c
    branches/ros-amd64-bringup/reactos/base/applications/network/nslookup/nslookup.c
    branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
    branches/ros-amd64-bringup/reactos/base/applications/regedit/edit.c
    branches/ros-amd64-bringup/reactos/base/services/   (props changed)
    branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlv/kbdlv.c
    branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/find.c
    branches/ros-amd64-bringup/reactos/dll/win32/mshtml/   (props changed)
    branches/ros-amd64-bringup/reactos/include/crt/math.h
    branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h
    branches/ros-amd64-bringup/reactos/include/crt/stdlib.h
    branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h
    branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h
    branches/ros-amd64-bringup/reactos/lib/   (props changed)
    branches/ros-amd64-bringup/reactos/media/drivers/   (props changed)
    branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c
    branches/ros-amd64-bringup/reactos/subsystems/win32/   (props changed)

Propchange: branches/ros-amd64-bringup/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 00:17:13 2010
@@ -1,3 +1,3 @@
 /branches/header-work:45691-46463
 /branches/ros-amd64-bringup:36852
-/trunk/reactos:39350-44067,44371-47451
+/trunk/reactos:39350-44067,44371-47468

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/convert.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/convert.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/convert.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/convert.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -56,35 +56,35 @@
 
 /*
     1 acre ................ = 4840 square yd = 4046,8564224 mq
-    1 acre brazil ......... = 
-    1 acre france ......... = 
+    1 acre brazil ......... =
+    1 acre france ......... =
     1 acre scots .......... = 5000 mq
     1 acre us ............. = 4840*(36/39.37)^2 m = 6272640/1549.9969 m
     1 are ................. = 100 mq
     1 chou ................ = 108000*(10/33)^2 mq
-    1 danbo ............... = 
+    1 danbo ............... =
     1 ha .................. = 10000 mq
-    1 jeongbo ............. = 
-    1 morgen hungary ...... = 
-    1 mu .................. = 
-    1 ping ................ = 
-    1 pyeong .............. = 
-    1 pyeongbangja ........ = 
-    1 rai ................. = 
+    1 jeongbo ............. =
+    1 morgen hungary ...... =
+    1 mu .................. = 2000/3 mq
+    1 ping ................ =
+    1 pyeong .............. =
+    1 pyeongbangja ........ =
+    1 rai ................. = 1600 mq
     1 se .................. = 1080*(10/33)^2 mq
     1 square cm ........... = 0.0001 mq
-    1 square chr .......... = 
+    1 square chr .......... =
     1 square fathom ....... = 1.8288^2 = 3.34450944 mq
     1 square fathom hungary = 1.8964838^2 = 3.59665080366244 mq
     1 square ft ........... = 0,09290304 mq
     1 square in ........... = 0,00064516 mq
     1 square km ........... = 1000000 mq
-    1 square lar .......... = 
+    1 square lar .......... =
     1 square mile ......... = 1609.344^2 = 2589988.110336 mq
     1 square mm ........... = 0,000001 mq
     1 square shaku ........ = (10/33)^2 mq
-    1 square tsuen ........ = 
-    1 square va ........... = 
+    1 square tsuen ........ =
+    1 square va ........... =
     1 square yard ......... = 0,83612736 mq
     1 tan ................. = 10800*(10/33)^2 mq
     1 tsubo ............... = 36*(10/33)^2 mq
@@ -101,11 +101,11 @@
     DECLARE_CONV_UNIT(AREA, HECTARES,               "$*10000",           "$/10000")
 //    DECLARE_CONV_UNIT(AREA, JEONGBO,                "$", "$")
 //    DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY,         "$", "$")
-//    DECLARE_CONV_UNIT(AREA, MU,                     "$", "$")
+    DECLARE_CONV_UNIT(AREA, MU,                     "$*(2000/3)", "$/(2000/3)")
 //    DECLARE_CONV_UNIT(AREA, PING,                   "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONG,                 "$", "$")
 //    DECLARE_CONV_UNIT(AREA, PYEONGBANGJA,           "$", "$")
-//    DECLARE_CONV_UNIT(AREA, RAI,                    "$", "$")
+    DECLARE_CONV_UNIT(AREA, RAI,                    "$*1600", "$/1600")
     DECLARE_CONV_UNIT(AREA, SE,                     "$*108000/1089",     "$*1089/108000")
     DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS,     "$*0,0001",          "$/0,0001")
 //    DECLARE_CONV_UNIT(AREA, SQUARE_CHR,             "$", "$")
@@ -197,46 +197,47 @@
     1 barleycorn ..... = 1/3 inch = 0.9144/108 m
     1 cm ............. = 1/100 m
     1 chain uk ....... = 22 yards = 22*0.9144 m
-    1 chi ............ = 
+    1 chi ............ = 1/3 m
     1 chou ........... = 3600/33 m
-    1 chr ............ = 
+    1 chr ............ =
+    1 cun ............ = 1/10 chi = 1/30 m
     1 fathom ......... = 2 yard = 2*0.9144 m
     1 fathom ungary .. = 1.8964838 m (fixed)
     1 feet ........... = 12 inch = 0.9144/3 m
     1 furlong ........ = 10 chains = 220*0.9144 m
-    1 gan ............ = 
+    1 gan ............ =
     1 hand ........... = 4 inches = 0.9144/9 m
-    1 hunh ........... = 
+    1 hunh ........... =
     1 inch ........... = yard/36 = 0.9144/36 m
-    1 ja ............. = 
-    1 jeong .......... = 
-    1 kabiet ......... = 
+    1 ja ............. =
+    1 jeong .......... =
+    1 kabiet ......... =
     1 ken ............ = 60/33 m
-    1 keub ........... = 
+    1 keub ........... =
     1 km ............. = 1000 m
-    1 lar ............ = 
+    1 lar ............ =
     1 light year ..... = 9460730472580800 m
     1 link uk ........ = 0.01 chains = 0.22*0.9144 m
     1 micron ......... = 0.000001 m
     1 mile ........... = 1760 yards = 1609.344 m
     1 millimeter ..... = 1/1000 m
     1 nautical mile .. = 1852 m
-    1 nieu ........... = 
+    1 nieu ........... =
     1 parsec ......... = 30856800000000000 m
     1 pica ........... = yard/216 = 0.9144/216 m
-    1 ri japan ....... = 
-    1 ri korea ....... = 
+    1 ri japan ....... =
+    1 ri korea ....... =
     1 rod ............ = 5.0292 m
-    1 sawk ........... = 
-    1 sen ............ = 
+    1 sawk ........... =
+    1 sen ............ =
     1 shaku .......... = 10/33 m
     1 span ........... = 9 inches = 0.9144/4 m
-    1 sun ............ = 10/330 m
-    1 tsuen .......... = 
-    1 va ............. = 
+    1 sun ............ = 1/33 m
+    1 tsuen .......... =
+    1 va ............. =
     1 yard ........... = 0.9144 m
-    1 yote ........... = 
-    1 zhang .......... = 
+    1 yote ........... =
+    1 zhang .......... =
 */
 static const conv_t conv_LENGTH[] = {
     DECLARE_CONV_UNIT(LENGTH, ANGSTROMS,            "$*0.0000000001",   "$/0.0000000001")
@@ -244,10 +245,10 @@
     DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS,          "$*0.9144/108",     "$/0.9144*108")
     DECLARE_CONV_UNIT(LENGTH, CENTIMETERS,          "$/100",            "$*100")
     DECLARE_CONV_UNIT(LENGTH, CHAINS_UK,            "$*20.1168",        "$/20.1168")
-//    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, CHI,                  "$/3",              "$*3")
     DECLARE_CONV_UNIT(LENGTH, CHOU,                 "$*3600/33",        "$*33/3600")
 //    DECLARE_CONV_UNIT(LENGTH, CHR,                  "$", "$")
-//    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$", "$")
+    DECLARE_CONV_UNIT(LENGTH, CUN,                  "$/30",             "$*30")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS,              "$*1.8288",         "$/1.8288")
     DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY,      "$*1.8964838",      "$/1.8964838")
     DECLARE_CONV_UNIT(LENGTH, FEET,                 "$*0.3048",         "$/0.3048")
@@ -280,7 +281,7 @@
 //    DECLARE_CONV_UNIT(LENGTH, SEN,                  "$", "$")
     DECLARE_CONV_UNIT(LENGTH, SHAKU,                "$*10/33",          "$*33/10")
     DECLARE_CONV_UNIT(LENGTH, SPAN,                 "$*0.9144/4",       "$*4/0.9144")
-    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*10/330",         "$*330/10")
+    DECLARE_CONV_UNIT(LENGTH, SUN,                  "$*1/33",            "$*33")
 //    DECLARE_CONV_UNIT(LENGTH, TSUEN,                "$", "$")
 //    DECLARE_CONV_UNIT(LENGTH, VA,                   "$", "$")
     DECLARE_CONV_UNIT(LENGTH, YARDS,                "$*0.9144",         "$/0.9144")
@@ -312,7 +313,7 @@
     1 hPa   = 100 Pa
     1 kPa   = 1000 Pa
     1 mm HG = 133.322 Pa
-    1 psi   = 6894.757 Pa 
+    1 psi   = 6894.757 Pa
 */
 static const conv_t conv_PRESSURE[] = {
     DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES,   "$*101325",   "$/101325")
@@ -330,18 +331,20 @@
     1 hour ...... = 3600 s
     1 microsecond = 0.000001 s
     1 millisecond = 0.001 s
+    1 nanosecond. = 0.000000001 s
     1 minute .... = 60 s
     1 week ...... = 669600 s
 */
 static const conv_t conv_TIME[] = {
-    DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",       "$/60")
-    DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",    "$/86400")
-    DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",     "$/3600")
-    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",    "$/0.001")
-    DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001")
-    DECLARE_CONV_UNIT(TIME, SECONDS,      "$",          "$")
-    DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",   "$/604800")
-    DECLARE_CONV_UNIT(TIME, YEARS,        "$*31556952", "$/31556952")
+    DECLARE_CONV_UNIT(TIME, MINUTES,      "$*60",          "$/60")
+    DECLARE_CONV_UNIT(TIME, DAYS,         "$*86400",       "$/86400")
+    DECLARE_CONV_UNIT(TIME, HOURS,        "$*3600",        "$/3600")
+    DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001",       "$/0.001")
+    DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001",    "$/0.000001")
+    DECLARE_CONV_UNIT(TIME, NANOSECONDS,  "$*0.000000001", "$/0.000000001")
+    DECLARE_CONV_UNIT(TIME, SECONDS,      "$",             "$")
+    DECLARE_CONV_UNIT(TIME, WEEKS,        "$*604800",      "$/604800")
+    DECLARE_CONV_UNIT(TIME, YEARS,        "$*31556952",    "$/31556952")
     DECLARE_CONV_END
 };
 
@@ -382,7 +385,7 @@
 /*
     1 barrel uk ...... = 163.65924 l
     1 barrel oil ..... = 158.987295 l
-    1 bun ............ = 
+    1 bun ............ =
     1 bushel uk ...... = 36.36872 l
     1 bushel us ...... = 35.23907017 l
     1 cubic cm  ...... = 0.001 l
@@ -390,17 +393,17 @@
     1 cubic inch ..... = 0.016387064 l
     1 cubic meter .... = 1000 l
     1 cubic yard ..... = 764.554857 l
-    1 doe ............ = 
+    1 doe ............ =
     1 fluid ounce uk   = 0.0284130625 l
     1 fluid ounce us   = 0.0295735295625 l
     1 gallon uk ...... = 4.54609 l
     1 gallon dry us .. = 4.40488377086 l
     1 gallon liquid us = 3.785411784 l
     1 gou ............ = 0.1809 l
-    1 hop ............ = 
-    1 icce ........... = 
-    1 kwian .......... = 
-    1 mal ............ = 
+    1 hop ............ =
+    1 icce ........... =
+    1 kwian .......... =
+    1 mal ............ =
     1 milliliter ..... = 0.001 l
     1 pint uk ........ = 0.56826125 l
     1 pint dry us .... = 0.5506104713575 l
@@ -408,10 +411,10 @@
     1 quart uk ....... = 1.1365225 l
     1 quart dry us ... = 1.101220942715 l
     1 quart liquid us  = 0.946352946 l
-    1 seki ........... = 
-    1 syou ........... = 
-    1 tananloung ..... = 
-    1 tang ........... = 
+    1 seki ........... =
+    1 syou ........... =
+    1 tananloung ..... =
+    1 tang ........... =
     1 to ............. = 18040 l
 */
 static const conv_t conv_VOLUME[] = {
@@ -455,16 +458,16 @@
 /*
     1 baht ............ = 12.244 g
     1 carat ........... = 0.2 g
-    1 chung ........... = 
-    1 don ............. = 
-    1 geun ............ = 
-    1 gwan ............ = 
-    1 harb ............ = 
-    1 jin china ....... = 
-    1 jin taiwan ...... = 
-    1 Kan ............. =
+    1 chung ........... =
+    1 don ............. =
+    1 geun ............ =
+    1 gwan ............ =
+    1 harb ............ =
+    1 jin china ....... =
+    1 jin taiwan ...... =
+    1 Kan ............. = 3750 g
     1 Kilograms ....... = 1000 g
-    1 Kin ............. =
+    1 Kin ............. = 600 g
     1 Liang China ..... =
     1 Liang Taiwan .... =
     1 monme ........... = 3.75 g
@@ -472,9 +475,9 @@
     1 ounce troy ...... = 31.1034768 g
     1 pound ........... = 453.59237 g
     1 quintal metric .. = 100000 g
-    1 saloung ......... = 
+    1 saloung ......... =
     1 stone ........... = 6350.29318 g
-    1 tamlung ......... = 
+    1 tamlung ......... =
     1 ton ............. = 1000000 g
     1 ton uk .......... = 1016046.9088 g  // long ton
     1 ton us .......... = 907184.74 g     // short ton
@@ -490,9 +493,9 @@
 //    DECLARE_CONV_UNIT(WEIGHT, HARB,                 "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA,            "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN,           "$", "$")
-//    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$", "$")
+    DECLARE_CONV_UNIT(WEIGHT, KAN,                  "$*3750",         "$/3750")
     DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS,            "$*1000",         "$/1000")
-//    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$", "$")
+    DECLARE_CONV_UNIT(WEIGHT, KIN,                  "$*600",          "$/600")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA,          "$", "$")
 //    DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN,         "$", "$")
     DECLARE_CONV_UNIT(WEIGHT, MONME,                "$*3.75",         "$/3.75")
@@ -548,7 +551,7 @@
             break;
         }
     }
-    
+
     /* The units can be sorted, so I must search the exact match */
     item = items;
     SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETLBTEXT, from, (LPARAM)txt_cb);

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Äíè"
     IDS_TIME_HOURS        "×àñè"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè"
     IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè"
     IDS_TIME_MINUTES      "Ìèíóòè"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -644,6 +644,7 @@
 BEGIN
     IDS_TIME_DAYS         "Dny"
     IDS_TIME_HOURS        "Hodiny"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
     IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minuty"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Tagen"
     IDS_TIME_HOURS        "Stunden"
+    IDS_TIME_NANOSECONDS  "Nanosekunden"
     IDS_TIME_MICROSECONDS "Mikrosekunden"
     IDS_TIME_MILLISECONDS "Millisekunden"
     IDS_TIME_MINUTES      "Minuten"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "ÌÝñåò"
     IDS_TIME_HOURS        "¿ñåò"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá"
     IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá"
     IDS_TIME_MINUTES      "ËåðôÜ"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -644,6 +644,7 @@
 BEGIN
     IDS_TIME_DAYS         "Días"
     IDS_TIME_HOURS        "Horas"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsegundos"
     IDS_TIME_MILLISECONDS "Milisegundos"
     IDS_TIME_MINUTES      "Minutos"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Jours"
     IDS_TIME_HOURS        "Heures"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsecondes"
     IDS_TIME_MILLISECONDS "Millisecondes"
     IDS_TIME_MINUTES      "Minutes"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Giorni"
     IDS_TIME_HOURS        "Ore"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsecondi"
     IDS_TIME_MILLISECONDS "Millisecondi"
     IDS_TIME_MINUTES      "Minuti"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -643,6 +643,7 @@
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "Dagen"
     IDS_TIME_HOURS        "Uren"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconden"
     IDS_TIME_MILLISECONDS "Milliseconden"
     IDS_TIME_MINUTES      "Minuten"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "**"
     IDS_TIME_HOURS        "**"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "**"
     IDS_TIME_MILLISECONDS "**"
     IDS_TIME_MINUTES      "**"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -646,6 +646,7 @@
 BEGIN
     IDS_TIME_DAYS         "Dni"
     IDS_TIME_HOURS        "Godzin"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Mikrosekund"
     IDS_TIME_MILLISECONDS "Milisekund"
     IDS_TIME_MINUTES      "Minut"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ro-RO.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -641,6 +641,7 @@
 BEGIN
     IDS_TIME_DAYS         "Zile"
     IDS_TIME_HOURS        "Ore"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microsecunde"
     IDS_TIME_MILLISECONDS "Milisecunde"
     IDS_TIME_MINUTES      "Minute"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -639,6 +639,7 @@
 BEGIN
     IDS_TIME_DAYS         "äåíü"
     IDS_TIME_HOURS        "÷àñ"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà"
     IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà"
     IDS_TIME_MINUTES      "ìèíóòà"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -647,6 +647,7 @@
 BEGIN
     IDS_TIME_DAYS         "Dni"
     IDS_TIME_HOURS        "Hodiny"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Mikrosekundy"
     IDS_TIME_MILLISECONDS "Milisekundy"
     IDS_TIME_MINUTES      "Minúty"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -644,6 +644,7 @@
 BEGIN
     IDS_TIME_DAYS         "Days"
     IDS_TIME_HOURS        "Hours"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "Microseconds"
     IDS_TIME_MILLISECONDS "Milliseconds"
     IDS_TIME_MINUTES      "Minutes"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Mon May 31 00:17:13 2010
@@ -647,6 +647,7 @@
 BEGIN
     IDS_TIME_DAYS         "Äîáà"
     IDS_TIME_HOURS        "Ãîäèíà"
+    IDS_TIME_NANOSECONDS  "Nanoseconds"
     IDS_TIME_MICROSECONDS "̳êðîñåêóíäà"
     IDS_TIME_MILLISECONDS "̳ë³ñåêóíäà"
     IDS_TIME_MINUTES      "Õâèëèíà"

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/resource.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/resource.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/resource.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -276,10 +276,11 @@
 #define IDS_TIME_HOURS                  3002
 #define IDS_TIME_MICROSECONDS           3003
 #define IDS_TIME_MILLISECONDS           3004
-#define IDS_TIME_MINUTES                3005
-#define IDS_TIME_SECONDS                3006
-#define IDS_TIME_WEEKS                  3007
-#define IDS_TIME_YEARS                  3008
+#define IDS_TIME_NANOSECONDS            3005
+#define IDS_TIME_MINUTES                3006
+#define IDS_TIME_SECONDS                3007
+#define IDS_TIME_WEEKS                  3008
+#define IDS_TIME_YEARS                  3009
 
 /* TYPES OF VELOCITIES */
 #define IDS_VELOCITY_CMS_SECOND         3100

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/utl.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/utl.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/utl.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/utl.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -2,7 +2,6 @@
 
 void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
 {
-    TCHAR *ptr, *dst;
     calc_number_t tmp;
     int    width;
 
@@ -21,9 +20,12 @@
         /* calculate the width of integer number */
         width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
         if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
-            ptr = buffer + _stprintf(buffer, TEXT("%#e"), rpn->f);
+            _stprintf(buffer, TEXT("%#e"), rpn->f);
         else {
+            TCHAR *ptr, *dst;
+
             ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
+            /* format sring ensures there is a '.': */
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -861,18 +861,18 @@
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-			PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
+            PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
             return TRUE;
         case IDC_BUTTON_CD:
             n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
             if (n == (DWORD)-1)
                 return TRUE;
-			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
+            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
             update_n_stats_items(hWnd, buffer);
             delete_stat_item(n);
             return TRUE;
         case IDC_BUTTON_CAD:
-			SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
+            SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
             clean_stat_list();
             update_n_stats_items(hWnd, buffer);
             return TRUE;
@@ -910,20 +910,20 @@
 static void CopyMemToClipboard(void *ptr)
 {
     if(OpenClipboard(NULL)) {
-	    HGLOBAL  clipbuffer;
-	    TCHAR   *buffer;
-
-	    EmptyClipboard();
-	    clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
-	    buffer = (TCHAR *)GlobalLock(clipbuffer);
-	    _tcscpy(buffer, ptr);
-	    GlobalUnlock(clipbuffer);
+        HGLOBAL  clipbuffer;
+        TCHAR   *buffer;
+
+        EmptyClipboard();
+        clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
+        buffer = (TCHAR *)GlobalLock(clipbuffer);
+        _tcscpy(buffer, ptr);
+        GlobalUnlock(clipbuffer);
 #ifdef UNICODE
-	    SetClipboardData(CF_UNICODETEXT,clipbuffer);
+        SetClipboardData(CF_UNICODETEXT,clipbuffer);
 #else
-	    SetClipboardData(CF_TEXT,clipbuffer);
+        SetClipboardData(CF_TEXT,clipbuffer);
 #endif
-	    CloseClipboard();
+        CloseClipboard();
     }
 }
 
@@ -942,16 +942,16 @@
     char *buffer = NULL;
 
     if (OpenClipboard(NULL)) {
-	    HANDLE  hData = GetClipboardData(CF_TEXT);
+        HANDLE  hData = GetClipboardData(CF_TEXT);
         char   *fromClipboard;
 
         if (hData != NULL) {
             fromClipboard = (char *)GlobalLock(hData);
             if (strlen(fromClipboard))
-    	        buffer = _strupr(_strdup(fromClipboard));
-	        GlobalUnlock( hData );
-        }
-	    CloseClipboard();
+                buffer = _strupr(_strdup(fromClipboard));
+            GlobalUnlock( hData );
+        }
+        CloseClipboard();
     }
     return buffer;
 }
@@ -1110,20 +1110,20 @@
 {
     TCHAR text[64];
     HMENU hMenu = CreatePopupMenu();
-    DWORD idm;
+    BOOL idm;
 
     LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
     AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
-    idm = (DWORD)TrackPopupMenu(hMenu,
-                                TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
-                                LOWORD(lp),
-                                HIWORD(lp),
-                                0,
-                                hWnd,
-                                NULL);
+    idm = TrackPopupMenu( hMenu,
+                          TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
+                          LOWORD(lp),
+                          HIWORD(lp),
+                          0,
+                          hWnd,
+                          NULL);
     DestroyMenu(hMenu);
 #ifndef DISABLE_HTMLHELP_SUPPORT
-    if (idm != 0) {
+    if (idm) {
         HH_POPUP popup;
 
         memset(&popup, 0, sizeof(popup));
@@ -1139,6 +1139,8 @@
         popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
         HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
     }
+#else
+    (void)idm;
 #endif
 } 
 

Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/ddtest.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/dxdiag/ddtest.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -151,7 +151,7 @@
     {
         if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
         {
-			if (msg.message == WM_TIMER && TimerID == msg.wParam)
+            if (msg.message == WM_TIMER && TimerID == msg.wParam)
                 break;
             TranslateMessage(&msg);
             DispatchMessage(&msg);
@@ -200,7 +200,7 @@
 
 
 BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
-    UINT TimerID, TimerIDUpdate;
+    UINT_PTR TimerID, TimerIDUpdate;
     LPDIRECTDRAW lpDD;
     LPDIRECTDRAWSURFACE lpDDPrimarySurface;
     LPDIRECTDRAWSURFACE lpDDBackBuffer;
@@ -288,6 +288,7 @@
     /* set our timers, TimerID - for test timeout, TimerIDUpdate - for frame updating */
     TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL);
     TimerIDUpdate = SetTimer(hWnd, 2, (UINT)10, NULL);
+    (void)TimerIDUpdate;
 
     while (TRUE)
     {

Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/input.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/dxdiag/input.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/input.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/input.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -129,13 +129,13 @@
     ZeroMemory(&GuidPath, sizeof(DIPROPGUIDANDPATH));
     GuidPath.diph.dwSize = sizeof(DIPROPGUIDANDPATH);
     GuidPath.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-	GuidPath.diph.dwHow = DIPH_DEVICE;
+    GuidPath.diph.dwHow = DIPH_DEVICE;
     hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GUIDANDPATH, (LPDIPROPHEADER)&GuidPath);
 
     ZeroMemory(&TypeName, sizeof(TypeName));
     TypeName.diph.dwSize = sizeof(TypeName);
     TypeName.diph.dwHeaderSize = sizeof(DIPROPHEADER);
-	TypeName.diph.dwHow = DIPH_DEVICE;
+    TypeName.diph.dwHow = DIPH_DEVICE;
     hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GETPORTDISPLAYNAME, (LPDIPROPHEADER)&TypeName);
 
 
@@ -191,7 +191,7 @@
     Context.pObj = pObj;
     Context.hwndDlg = hwndDlg;
     InitListViewColumns(&Context);
-    hResult = pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES);
+    pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES);
 
     pObj->lpVtbl->Release(pObj);
 }

Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/network.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/dxdiag/network.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/network.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/network.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -178,10 +178,10 @@
 {
     DWORD dwIndex = 0;
     LONG result;
-	WCHAR szName[50];
+    WCHAR szName[50];
     WCHAR szGUID[40];
     WCHAR szTemp[63];
-	WCHAR szResult[MAX_PATH+20] = {0};
+    WCHAR szResult[MAX_PATH+20] = {0};
     DWORD RegProviders = 0;
     DWORD ProviderIndex;
     DWORD dwName;
@@ -203,13 +203,12 @@
         szResult[0] = L'\0';
         LoadStringW(hInst, PreDefProviders[dwIndex].ResourceID, szResult, sizeof(szResult)/sizeof(WCHAR));
         szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0';
-        lResult = SendMessageW(hDlgCtrl, LVM_INSERTITEM, 0, (LPARAM)&Item);
+        Item.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEM, 0, (LPARAM)&Item);
+        Item.iSubItem = 1;
         szResult[0] = L'\0';
         LoadStringW(hInst, IDS_REG_FAIL, szResult, sizeof(szResult)/sizeof(WCHAR));
         szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0';
-		Item.iItem = lResult;
-        Item.iSubItem = 1;
-        lResult = SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
+        SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
     }
 
     dwIndex = 0;
@@ -228,8 +227,7 @@
             if (ProviderIndex == UINT_MAX)
             {
                 /* a custom service provider was found */
-                lResult = ListView_GetItemCount(hDlgCtrl);
-                Item.iItem = lResult;
+                Item.iItem = ListView_GetItemCount(hDlgCtrl);
 
                 /* FIXME
                  * on Windows Vista we need to use RegLoadMUIString which is not available for older systems 
@@ -291,7 +289,7 @@
                 }
         }
         dwIndex++;
-	}while(result != ERROR_NO_MORE_ITEMS);
+    }while(result != ERROR_NO_MORE_ITEMS);
 
     /* check if all providers have been registered */
 //    if (RegProviders == 15)
@@ -330,7 +328,7 @@
         return;
 
     /* enumerate providers */
-    result = EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP);
+    EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP);
     RegCloseKey(hKey);
 }
 

Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -275,6 +275,7 @@
 
     /* release the DSound object */
 //    pObj->lpVtbl->Release(pObj);
+    (void)hResult;
 }
 
 

Modified: branches/ros-amd64-bringup/reactos/base/applications/fontview/fontview.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/fontview/fontview.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/fontview/fontview.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -60,12 +60,9 @@
 static void
 ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...)
 {
-	HMODULE hModule;
 	HLOCAL hMemCaption = NULL;
 	HLOCAL hMemText = NULL;
 	va_list args;
-
-	hModule = GetModuleHandle(NULL);
 
 	va_start(args, dwMessageId);
 	FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,

Modified: branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -33,7 +33,6 @@
     HDC hdc, hdcsrc;
     HBITMAP hBitmap, hBmpNew, hBmpOld;
     RECT rect;
-    DWORD bkColor, bkText;
     HFONT hFontOld, hFont = NULL;
     ICONINFO IconInfo;
     HICON hIcon = NULL;
@@ -63,8 +62,8 @@
             rect.bottom = 16;
             rect.top = 0;
 
-            bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
-            bkText  = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+            SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
+            SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
 
             ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL);
 

Modified: branches/ros-amd64-bringup/reactos/base/applications/magnify/magnifier.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/magnify/magnifier.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -295,7 +295,7 @@
 //
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    int wmId, wmEvent;
+    int wmId;
 
     switch (message)
     {
@@ -354,7 +354,6 @@
         break;
     case WM_COMMAND:
         wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
         // Parse the menu selections:
         switch (wmId)
         {

Modified: branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -407,7 +407,7 @@
     MCI_PLAY_PARMS mciPlay;
     TCHAR szLocalFileName[MAX_PATH];
     UINT FileType;
-    DWORD dwError;
+    MCIERROR mciError;
 
     if (lpFileName == NULL)
     {
@@ -449,14 +449,14 @@
 
     SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc);
 
-    dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
+    mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
 
     mciPlay.dwCallback = (DWORD_PTR)hwnd;
     mciPlay.dwFrom = 0;
     mciPlay.dwTo = MaxFilePos;
 
-    dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
-    if (dwError != 0)
+    mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
+    if (mciError != 0)
     {
         MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);
     }
@@ -641,12 +641,12 @@
                     break;
 
                 case IDM_ABOUT:
-		{
+        {
                     HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
                     ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
-		    DeleteObject(mplayIcon);
-                    break;
-		}
+            DeleteObject(mplayIcon);
+                    break;
+        }
                 case IDM_EXIT:
                     PostMessage(hwnd, WM_CLOSE, 0, 0);
                     return 0;

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -506,7 +506,6 @@
     DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags;
     LPWSTR lpSourceName;
     LPWSTR lpComputerName;
-    LPWSTR lpEventStr;
     LPWSTR lpData;
     BOOL bResult = TRUE; /* Read succeeded. */
 
@@ -608,9 +607,6 @@
 
             // This ist the data section of the current event
             lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset);
-
-            // This is the text of the current event
-            lpEventStr = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset);
 
             // Compute the event type
             EventTimeToSystemTime(pevlr->TimeWritten, &time);

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/arp/arp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/arp/arp.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/arp/arp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/arp/arp.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -170,9 +170,7 @@
 
     ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
 
-    iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
-
-    if (iRet != NO_ERROR)
+    if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
     {
         _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
         DoFormatMessage();
@@ -201,9 +199,7 @@
 
     ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
 
-    iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE);
-
-    if (iRet != NO_ERROR)
+    if ((iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE)) != NO_ERROR)
     {
         _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
         DoFormatMessage();
@@ -272,7 +268,7 @@
     PMIB_IPNETTABLE pIpNetTable = NULL;
     DWORD dwIpAddr = 0;
     ULONG Size = 0;
-    INT iRet, i, val, c;
+    INT i, val, c;
 
     /* error checking */
 
@@ -320,9 +316,7 @@
 
     ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
 
-    iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
-
-    if (iRet != NO_ERROR)
+    if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
     {
         _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
         DoFormatMessage();
@@ -382,7 +376,7 @@
 
 
     /* Add the ARP entry */
-    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR)
+    if (SetIpNetEntry(pAddHost) != NO_ERROR)
     {
         DoFormatMessage();
         goto cleanup;
@@ -415,7 +409,6 @@
     PMIB_IPNETTABLE pIpNetTable = NULL;
     ULONG Size = 0;
     DWORD dwIpAddr = 0;
-    INT iRet;
     BOOL bFlushTable = FALSE;
 
     /* error checking */
@@ -449,9 +442,7 @@
 
     ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
 
-    iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
-
-    if (iRet != NO_ERROR)
+    if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
     {
         _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
         DoFormatMessage();
@@ -485,7 +476,7 @@
     if (bFlushTable == TRUE)
     {
         /* delete arp cache */
-        if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR)
+        if (FlushIpNetTable(pDelHost->dwIndex) != NO_ERROR)
         {
             DoFormatMessage();
             goto cleanup;
@@ -501,7 +492,7 @@
         pDelHost->dwAddr = dwIpAddr;
 
     /* Add the ARP entry */
-    if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR)
+    if (DeleteIpNetEntry(pDelHost) != NO_ERROR)
     {
         DoFormatMessage();
         goto cleanup;

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/fake.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -29,10 +29,10 @@
 
 void blkfree(char **av0)
 {
-	register char **av = av0;
-
-	while (*av)
-		free(*av++);
+    register char **av = av0;
+
+    while (*av)
+        free(*av++);
 }
 
 char **glob(register char *v)
@@ -52,16 +52,16 @@
 
 #if 0
 int gettimeofday(struct timeval *timenow,
-				 struct timezone *zone)
-{
-	time_t t;
-
-	t = clock();
-
-	timenow->tv_usec = t;
-	timenow->tv_sec = t / CLK_TCK;
-
-	return 0;
+                 struct timezone *zone)
+{
+    time_t t;
+
+    t = clock();
+
+    timenow->tv_usec = t;
+    timenow->tv_sec = t / CLK_TCK;
+
+    return 0;
 }
 
 int fgetcSocket(int s)
@@ -100,13 +100,13 @@
        total = recv(s, buffer, sizeof(buffer), 0);
 
        if (total == SOCKET_ERROR)
-	 {
-	   total = 0;
-	   return ERROR;
-	 }
+     {
+       total = 0;
+       return ERROR;
+     }
 
        if (total == 0)
-	 return EOF;
+     return EOF;
      }
    return buffer[index++];
 }
@@ -142,29 +142,29 @@
    buffer[1] = '\0';
 
    if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
-	   int iret=WSAGetLastError ();
-	   fprintf(stdout,"fputcSocket: %d\n",iret);
-	   return 0;
+       int iret=WSAGetLastError ();
+       fprintf(stdout,"fputcSocket: %d\n",iret);
+       return 0;
    }
    else {
-	return putChar;
+    return putChar;
    }
 }
 int fputSocket(int s, char *buffer, int len)
 {
-	int iret;
-	while(len) {
-		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
-		{
-			iret=WSAGetLastError ();
-			fprintf(stdout,"fputcSocket: %d\n",iret);
-			return 0;
-		}
-		else {
-			return len-=iret;
-		}
-	}
-	return 0;
+    int iret;
+    while(len) {
+        if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
+        {
+            iret=WSAGetLastError ();
+            fprintf(stdout,"fputcSocket: %d\n",iret);
+            return 0;
+        }
+        else {
+            return len-=iret;
+        }
+    }
+    return 0;
 }
 
 char *fgetsSocket(int s, char *string)
@@ -180,31 +180,31 @@
 
       if (count == SOCKET_ERROR)
       {
-	 printf("Error in fgetssocket");
-	 return NULL;
+     printf("Error in fgetssocket");
+     return NULL;
       }
 
       if (count == 1)
       {
-	 string[i] = buffer[0];
-
-	 if (i == MAX_ASCII - 3)
-	 {
-	    count = 0;
-	    string[++i] = '\n';
-	    string[++i] = '\0';
-	 }
+     string[i] = buffer[0];
+
+     if (i == MAX_ASCII - 3)
+     {
+        count = 0;
+        string[++i] = '\n';
+        string[++i] = '\0';
+     }
       }
       else
       {
-	 if (i == 0)
-	    return NULL;
-	 else
-	 {
-	    string[i] = '\n';
-	    string[i + 1] = '\0'; // This is risky
-	    return string;
-	 }
+     if (i == 0)
+        return NULL;
+     else
+     {
+        string[i] = '\n';
+        string[i + 1] = '\0'; // This is risky
+        return string;
+     }
 
       }
 
@@ -250,44 +250,44 @@
       int rc;
 
       if (istty)
-	{
-	  if (GetConsoleMode (in, &old_flags))
-	    SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
-	  else
-	    istty = 0;
-	}
+    {
+      if (GetConsoleMode (in, &old_flags))
+        SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+      else
+        istty = 0;
+    }
       /* Need to read line one byte at time to avoid blocking, if not a
          tty, so always do it this way.  */
       count = 0;
       while (1)
-	{
-	  DWORD  dummy;
-	  char   one_char;
-
-	  rc = ReadFile (in, &one_char, 1, &dummy, NULL);
-	  if (rc == 0)
-	    break;
-	  if (one_char == '\r')
-	    {
-	      /* CR is always followed by LF if reading from tty.  */
-	      if (istty)
-		continue;
-	      else
-		break;
-	    }
-	  if (one_char == '\n')
-	    break;
-	  /* Silently truncate password string if overly long.  */
-	  if (count < sizeof (input) - 1)
-	    input[count++] = one_char;
-	}
+    {
+      DWORD  dummy;
+      char   one_char;
+
+      rc = ReadFile (in, &one_char, 1, &dummy, NULL);
+      if (rc == 0)
+        break;
+      if (one_char == '\r')
+        {
+          /* CR is always followed by LF if reading from tty.  */
+          if (istty)
+        continue;
+          else
+        break;
+        }
+      if (one_char == '\n')
+        break;
+      /* Silently truncate password string if overly long.  */
+      if (count < sizeof (input) - 1)
+        input[count++] = one_char;
+    }
       input[count] = '\0';
 
       WriteFile (err, "\r\n", 2, &count, NULL);
       if (istty)
-	SetConsoleMode (in, old_flags);
+    SetConsoleMode (in, old_flags);
       if (rc)
-	return input;
+    return input;
     }
 
   return NULL;

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -345,7 +345,7 @@
 		cp = reply_string;
 		while ((c = fgetcSocket(cin)) != '\n') {
 			if (c == IAC) {     /* handle telnet commands */
-				switch (c = fgetcSocket(cin)) {
+				switch (fgetcSocket(cin)) {
 				case WILL:
 				case WONT:
 					c = fgetcSocket(cin);
@@ -745,7 +745,7 @@
 	long bytes = 0, hashbytes = HASHBYTES;
 //	struct
 		fd_set mask;
-	register int c, d;
+	register int c;
 	struct timeval start, stop;
 //	struct stat st;
 
@@ -781,6 +781,7 @@
 null();//	oldintr = signal(SIGINT, abortrecv);
 	if (strcmp(local, "-") && *local != '|') {
 #ifndef _WIN32
+	register int d;
 // This whole thing is a problem... access Won't work on non-existent files
 		if (access(local, 2) < 0) {
 			char *dir = rindex(local, '/');
@@ -919,7 +920,7 @@
 				(*closefunc)(fout);
 			return;
 		}
-		errno = d = 0;
+		errno = 0;
 //		while ((c = recv(din, buf, bufsize, 1)) > 0) {
 //			if ((d = write(fileno(fout), buf, c)) != c)
 //			if ((d = write(fileno(fout), buf, c)) != c)
@@ -1106,10 +1107,10 @@
 		lostpeer();
 	}
 	if (din && FD_ISSET(din, &mask)) {
-		while ((c = recv(din, buf, bufsize, 0)) > 0)
+		while (recv(din, buf, bufsize, 0) > 0)
 			;
 	}
-	if ((c = getreply(0)) == ERROR && code == 552) { /* needed for nic style abort */
+	if (getreply(0) == ERROR && code == 552) { /* needed for nic style abort */
 		if (data >= 0) {
 			(void) close(data);
 			data = -1;

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/nslookup/nslookup.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/network/nslookup/nslookup.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/nslookup/nslookup.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/nslookup/nslookup.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -90,11 +90,7 @@
     BOOL bOk = FALSE;
 
     /* Makes things easier when parsing the response packet. */
-    UCHAR Header1, Header2;
     USHORT NumQuestions;
-    USHORT NumAnswers;
-    USHORT NumAuthority;
-    USHORT NumAdditional;
     USHORT Type;
 
     if( (strlen( pAddr ) + 1) > 255 ) return FALSE;
@@ -198,12 +194,7 @@
     if( !bOk ) goto cleanup;
 
     /* Start parsing the received packet. */
-    Header1 = RecBuffer[2];
-    Header2 = RecBuffer[3];
     NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] );
-    NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] );
-    NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] );
-    NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] );
 
     k = 12;
 
@@ -257,11 +248,10 @@
     BOOL bOk = FALSE;
 
     /* Makes things easier when parsing the response packet. */
-    UCHAR Header1, Header2;
+    UCHAR Header2;
     USHORT NumQuestions;
     USHORT NumAnswers;
     USHORT NumAuthority;
-    USHORT NumAdditional;
     USHORT Type;
 
     if( (strlen( pAddr ) + 1) > 255 ) return;
@@ -368,19 +358,17 @@
     ((PSHORT)&Buffer[i])[0] = htons( ClassNametoClassID( State.Class ) );
 
     /* Ship off the request to the DNS server. */
-	bOk = SendRequest( Buffer,
+    bOk = SendRequest( Buffer,
                        BufferLength,
                        RecBuffer,
                        &RecBufferLength );
     if( !bOk ) goto cleanup;
 
     /* Start parsing the received packet. */
-    Header1 = RecBuffer[2];
     Header2 = RecBuffer[3];
     NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] );
     NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] );
     NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] );
-    NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] );
     Type = 0;
 
     /* Check the RCODE for failure. */

Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -400,7 +400,6 @@
 {
     TCHAR szText[128];
     HWND hCombo;
-    OFNOTIFY *pNotify;
 
     UNREFERENCED_PARAMETER(wParam);
 
@@ -440,15 +439,13 @@
         case WM_NOTIFY:
             if (((NMHDR *) lParam)->code == CDN_FILEOK)
             {
-                pNotify = (OFNOTIFY *) lParam;
-
                 hCombo = GetDlgItem(hDlg, ID_ENCODING);
-				if (hCombo)
-	                Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
+                if (hCombo)
+                    Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
 
                 hCombo = GetDlgItem(hDlg, ID_EOLN);
-				if (hCombo)
-	                Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
+                if (hCombo)
+                    Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
             }
             break;
     }
@@ -808,11 +805,11 @@
     TCHAR szText[32];
 
     switch(uMsg) {
-	case WM_INITDIALOG:
+    case WM_INITDIALOG:
         hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
-		_sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
+        _sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
         SetWindowText(hTextBox, szText);
-		break;
+        break;
     case WM_COMMAND:
         if (HIWORD(wParam) == BN_CLICKED)
         {
@@ -823,11 +820,11 @@
                 EndDialog(hwndDialog, _ttoi(szText));
                 bResult = TRUE;
             }
-			else if (LOWORD(wParam) == IDCANCEL)
-			{
+            else if (LOWORD(wParam) == IDCANCEL)
+            {
                 EndDialog(hwndDialog, 0);
                 bResult = TRUE;
-			}
+            }
         }
         break;
     }
@@ -862,7 +859,7 @@
         Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine);
 
     if (nLine >= 1)
-	{
+    {
         for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++)
         {
             if (pszText[i] == '\n')
@@ -870,8 +867,8 @@
         }
         SendMessage(Globals.hEdit, EM_SETSEL, i, i);
         SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0);
-	}
-	HeapFree(GetProcessHeap(), 0, pszText);
+    }
+    HeapFree(GetProcessHeap(), 0, pszText);
 }
 
 VOID DIALOG_StatusBarUpdateCaretPos(VOID)

Modified: branches/ros-amd64-bringup/reactos/base/applications/regedit/edit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/regedit/edit.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/regedit/edit.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/regedit/edit.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -276,7 +276,6 @@
 {
     WNDPROC oldproc;
     HWND hwndValue;
-    int len;
     TCHAR ValueString[32];
     LPTSTR Remainder;
     DWORD Base;
@@ -319,7 +318,7 @@
                 dwordEditMode = EDIT_MODE_HEX;
                 if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
                 {
-                    if ((len = GetWindowTextLength(hwndValue)))
+                    if (GetWindowTextLength(hwndValue))
                     {
                         if (GetWindowText(hwndValue, ValueString, 32))
                         {
@@ -339,7 +338,7 @@
                 dwordEditMode = EDIT_MODE_DEC;
                 if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
                 {
-                    if ((len = GetWindowTextLength(hwndValue)))
+                    if (GetWindowTextLength(hwndValue))
                     {
                         if (GetWindowText(hwndValue, ValueString, 32))
                         {
@@ -356,7 +355,7 @@
         case IDOK:
             if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
             {
-                if ((len = GetWindowTextLength(hwndValue)))
+                if (GetWindowTextLength(hwndValue))
                 {
                     if (!GetWindowText(hwndValue, ValueString, 32))
                     {

Propchange: branches/ros-amd64-bringup/reactos/base/services/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 00:17:13 2010
@@ -1,3 +1,3 @@
 /branches/header-work/base/services:45691-46463
 /branches/ros-amd64-bringup/base/services:36852
-/trunk/reactos/base/services:39350-44067,44371-47451
+/trunk/reactos/base/services:39350-44067,44371-47468

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

Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/find.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/find.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -54,7 +54,7 @@
 
 /* FUNCTIONS ****************************************************************/
 
-static HANDLE
+static VOID
 InternalCopyDeviceFindDataW(LPWIN32_FIND_DATAW lpFindFileData,
                             LPCWSTR lpFileName,
                             ULONG DeviceNameInfo)
@@ -71,11 +71,9 @@
     RtlCopyMemory(lpFindFileData->cFileName,
                   DeviceName.Buffer,
                   DeviceName.Length);
-
-    return FIND_DEVICE_HANDLE;
-}
-
-static HANDLE
+}
+
+static VOID
 InternalCopyDeviceFindDataA(LPWIN32_FIND_DATAA lpFindFileData,
                             PUNICODE_STRING FileName,
                             ULONG DeviceNameInfo)
@@ -101,8 +99,6 @@
     RtlCopyMemory(lpFindFileData->cFileName,
                   BufferA.Buffer,
                   BufferA.Length);
-
-    return FIND_DEVICE_HANDLE;
 }
 
 static VOID

Propchange: branches/ros-amd64-bringup/reactos/dll/win32/mshtml/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 00:17:13 2010
@@ -1,3 +1,3 @@
 /branches/header-work/dll/win32/mshtml:45691-46463
 /branches/ros-amd64-bringup/dll/win32/mshtml:36852
-/trunk/reactos/dll/win32/mshtml:39350-44067,44371-47464
+/trunk/reactos/dll/win32/mshtml:39350-44067,44371-47468

Modified: branches/ros-amd64-bringup/reactos/include/crt/math.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/crt/math.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/math.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -449,8 +449,6 @@
     return res;
   }
 
-  extern long double __cdecl modfl (long double, long double*);
-
   /* 7.12.6.13 */
   extern double __cdecl scalbn (double, int);
   extern float __cdecl scalbnf (float, int);
@@ -472,7 +470,6 @@
   extern long double __cdecl expl(long double);
   extern long double expm1l(long double);
   extern long double __cdecl coshl(long double);
-  extern long double __cdecl fabsl (long double);
   extern long double __cdecl acosl(long double);
   extern long double __cdecl asinl(long double);
   extern long double __cdecl atanl(long double);

Modified: branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -879,14 +879,14 @@
 	return retval;
 }
 
-__INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift)
+__INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift)
 {
 	unsigned long retval;
 	__asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift));
 	return retval;
 }
 
-__INTRIN_INLINE unsigned int __cdecl _rotr(unsigned int value, int shift)
+__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift)
 {
 	unsigned long retval;
 	__asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift));
@@ -956,14 +956,14 @@
 	return retval;
 }
 
-__INTRIN_INLINE unsigned short __cdecl _byteswap_ushort(unsigned short value)
+__INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value)
 {
 	unsigned short retval;
 	__asm__("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value));
 	return retval;
 }
 
-__INTRIN_INLINE unsigned long __cdecl _byteswap_ulong(unsigned long value)
+__INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value)
 {
 	unsigned long retval;
 	__asm__("bswapl %[retval]" : [retval] "=r" (retval) : "[retval]" (value));
@@ -971,7 +971,7 @@
 }
 
 #ifdef _M_AMD64
-__INTRIN_INLINE unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 value)
+__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value)
 {
 	unsigned __int64 retval;
 	__asm__("bswapq %[retval]" : [retval] "=r" (retval) : "[retval]" (value));

Modified: branches/ros-amd64-bringup/reactos/include/crt/stdlib.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/crt/stdlib.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/crt/stdlib.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -279,11 +279,15 @@
   void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
   void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
 #endif
+
+#if !defined(__GNUC__) && !defined(__clang)
   unsigned short __cdecl _byteswap_ushort(unsigned short _Short);
-  /*unsigned long __cdecl _byteswap_ulong (unsigned long _Long); */
+  unsigned long __cdecl _byteswap_ulong (unsigned long _Long);
 #if _INTEGRAL_MAX_BITS >= 64
   __MINGW_EXTENSION unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64);
 #endif
+#endif
+
   div_t __cdecl div(int _Numerator,int _Denominator);
   char *__cdecl getenv(const char *_VarName);
   _CRTIMP char *__cdecl _itoa(int _Value,char *_Dest,int _Radix);
@@ -412,6 +416,7 @@
   void __cdecl perror(const char *_ErrMsg);
 #endif
   _CRTIMP int __cdecl _putenv(const char *_EnvString);
+#if !defined(__GNUC__) && !defined(__clang)
   unsigned int __cdecl _rotl(unsigned int _Val,int _Shift);
 #if _INTEGRAL_MAX_BITS >= 64
   __MINGW_EXTENSION unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val,int _Shift);
@@ -419,6 +424,7 @@
   unsigned int __cdecl _rotr(unsigned int _Val,int _Shift);
 #if _INTEGRAL_MAX_BITS >= 64
   __MINGW_EXTENSION unsigned __int64 __cdecl _rotr64(unsigned __int64 _Val,int _Shift);
+#endif
 #endif
   _CRTIMP void __cdecl _searchenv(const char *_Filename,const char *_EnvVar,char *_ResultPath);
   _CRTIMP void __cdecl _splitpath(const char *_FullPath,char *_Drive,char *_Dir,char *_Filename,char *_Ext);

Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -6148,26 +6148,29 @@
   FastIoIsQuestionable
 } FAST_IO_POSSIBLE;
 
+#define FSRTL_COMMON_FCB_HEADER_LAYOUT \
+  CSHORT NodeTypeCode; \
+  CSHORT NodeByteSize; \
+  UCHAR Flags; \
+  UCHAR IsFastIoPossible; \
+  UCHAR Flags2; \
+  UCHAR Reserved:4; \
+  UCHAR Version:4; \
+  PERESOURCE Resource; \
+  PERESOURCE PagingIoResource; \
+  LARGE_INTEGER AllocationSize; \
+  LARGE_INTEGER FileSize; \
+  LARGE_INTEGER ValidDataLength;
+
 typedef struct _FSRTL_COMMON_FCB_HEADER {
-  CSHORT NodeTypeCode;
-  CSHORT NodeByteSize;
-  UCHAR Flags;
-  UCHAR IsFastIoPossible;
-  UCHAR Flags2;
-  UCHAR Reserved:4;
-  UCHAR Version:4;
-  PERESOURCE Resource;
-  PERESOURCE PagingIoResource;
-  LARGE_INTEGER AllocationSize;
-  LARGE_INTEGER FileSize;
-  LARGE_INTEGER ValidDataLength;
+  FSRTL_COMMON_FCB_HEADER_LAYOUT
 } FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER;
 
 #ifdef __cplusplus
 typedef struct _FSRTL_ADVANCED_FCB_HEADER:FSRTL_COMMON_FCB_HEADER {
 #else /* __cplusplus */
 typedef struct _FSRTL_ADVANCED_FCB_HEADER {
-  FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME;
+  FSRTL_COMMON_FCB_HEADER_LAYOUT
 #endif  /* __cplusplus */
   PFAST_MUTEX FastMutex;
   LIST_ENTRY FilterContexts;

Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Mon May 31 00:17:13 2010
@@ -26,7 +26,7 @@
 #ifndef KJK_PSEH2_H_
 #define KJK_PSEH2_H_
 
-#if !defined (__arm__)
+#if !defined (__arm__) && !defined(__clang__)
 
 #if defined(__GNUC__)
 struct _EXCEPTION_RECORD;
@@ -395,7 +395,7 @@
 #define _SEH2_END }
 
 #define _SEH2_GetExceptionInformation() 
-#define _SEH2_GetExceptionCode() STATUS_SUCCESS
+#define _SEH2_GetExceptionCode() 0
 #define _SEH2_AbnormalTermination() 
 
 #define _SEH2_YIELD(STMT_) STMT_

Propchange: branches/ros-amd64-bringup/reactos/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo (removed)
@@ -1,3 +1,0 @@
-/branches/header-work/lib:45691-46463
-/branches/ros-amd64-bringup/lib:36852
-/trunk/reactos/lib:39350-44067,44371-47465

Propchange: branches/ros-amd64-bringup/reactos/media/drivers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 00:17:13 2010
@@ -1,3 +1,3 @@
 /branches/header-work/media/drivers:45691-46463
 /branches/ros-amd64-bringup/media/drivers:36852
-/trunk/reactos/media/drivers:34699-47465
+/trunk/reactos/media/drivers:34699-47468

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c?rev=47469&r1=47468&r2=47469&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon May 31 00:17:13 2010
@@ -1844,39 +1844,61 @@
                                        PreviousMode,
                                        (PVOID*)&Token,
                                        NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        SepReleaseSecurityQualityOfService(CapturedSecurityQualityOfService,
+                                           PreviousMode,
+                                           FALSE);
+        return Status;
+    }
+
+    /*
+     * Fail, if the original token is an impersonation token and the caller
+     * tries to raise the impersonation level of the new token above the
+     * impersonation level of the original token.
+     */
+    if (Token->TokenType == TokenImpersonation)
+    {
+        if (QoSPresent &&
+            CapturedSecurityQualityOfService->ImpersonationLevel >Token->ImpersonationLevel)
+        {
+            ObDereferenceObject(Token);
+            SepReleaseSecurityQualityOfService(CapturedSecurityQualityOfService,
+                                               PreviousMode,
+                                               FALSE);
+            return STATUS_BAD_IMPERSONATION_LEVEL;
+        }
+    }
+
+    Status = SepDuplicateToken(Token,
+                               ObjectAttributes,
+                               EffectiveOnly,
+                               TokenType,
+                               (QoSPresent ? CapturedSecurityQualityOfService->ImpersonationLevel : SecurityAnonymous),
+                               PreviousMode,
+                               &NewToken);
+
+    ObDereferenceObject(Token);
+
     if (NT_SUCCESS(Status))
     {
-        Status = SepDuplicateToken(Token,
-                                   ObjectAttributes,
-                                   EffectiveOnly,
-                                   TokenType,
-                                   (QoSPresent ? CapturedSecurityQualityOfService->ImpersonationLevel : SecurityAnonymous),
-                                   PreviousMode,
-                                   &NewToken);
-
-        ObDereferenceObject(Token);
-
+        Status = ObInsertObject((PVOID)NewToken,
+                                NULL,
+                                DesiredAccess,
+                                0,
+                                NULL,
+                                &hToken);
         if (NT_SUCCESS(Status))
         {
-            Status = ObInsertObject((PVOID)NewToken,
-                                    NULL,
-                                    DesiredAccess,
-                                    0,
-                                    NULL,
-                                    &hToken);
-
-            if (NT_SUCCESS(Status))
+            _SEH2_TRY
             {
-                _SEH2_TRY
-                {
-                    *NewTokenHandle = hToken;
-                }
-                _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-                {
-                    Status = _SEH2_GetExceptionCode();
-                }
-                _SEH2_END;
+                *NewTokenHandle = hToken;
             }
+            _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+            {
+                Status = _SEH2_GetExceptionCode();
+            }
+            _SEH2_END;
         }
     }
 

Propchange: branches/ros-amd64-bringup/reactos/subsystems/win32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 00:17:13 2010
@@ -1,3 +1,3 @@
 /branches/header-work/subsystems/win32:45691-46463
 /branches/ros-amd64-bringup/subsystems/win32:36852
-/trunk/reactos/subsystems/win32:39350-44067,44371-47465
+/trunk/reactos/subsystems/win32:39350-44067,44371-47468




More information about the Ros-diffs mailing list