[hbelusca] 69937: [USER32] - Fix MB_GetString: the input parameter is the ID of the button string to be retrieved, ranging from 0 to 10 inclusive (this corresponds to the IDOK ... IDCONTINUE range, ...

Author: hbelusca
Date: Thu Nov 19 13:42:55 2015
New Revision: 69937

URL: http://svn.reactos.org/svn/reactos?rev=69937&view=rev
Log:
[USER32]
- Fix MB_GetString: the input parameter is the ID of the button string to be retrieved,
ranging from 0 to 10 inclusive (this corresponds to the IDOK ... IDCONTINUE range, minus
one).
- Add the missing "Close" button string.

Modified:
    trunk/reactos/win32ss/user/user32/include/resource.h
    trunk/reactos/win32ss/user/user32/lang/bg-BG.rc
    trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc
    trunk/reactos/win32ss/user/user32/lang/da-DK.rc
    trunk/reactos/win32ss/user/user32/lang/de-DE.rc
    trunk/reactos/win32ss/user/user32/lang/el-GR.rc
    trunk/reactos/win32ss/user/user32/lang/en-US.rc
    trunk/reactos/win32ss/user/user32/lang/es-ES.rc
    trunk/reactos/win32ss/user/user32/lang/fr-FR.rc
    trunk/reactos/win32ss/user/user32/lang/he-IL.rc
    trunk/reactos/win32ss/user/user32/lang/hu-HU.rc
    trunk/reactos/win32ss/user/user32/lang/id-ID.rc
    trunk/reactos/win32ss/user/user32/lang/it-IT.rc
    trunk/reactos/win32ss/user/user32/lang/ja-JP.rc
    trunk/reactos/win32ss/user/user32/lang/lt-LT.rc
    trunk/reactos/win32ss/user/user32/lang/nl-NL.rc
    trunk/reactos/win32ss/user/user32/lang/no-NO.rc
    trunk/reactos/win32ss/user/user32/lang/pl-PL.rc
    trunk/reactos/win32ss/user/user32/lang/pt-BR.rc
    trunk/reactos/win32ss/user/user32/lang/ro-RO.rc
    trunk/reactos/win32ss/user/user32/lang/ru-RU.rc
    trunk/reactos/win32ss/user/user32/lang/sk-SK.rc
    trunk/reactos/win32ss/user/user32/lang/sv-SE.rc
    trunk/reactos/win32ss/user/user32/lang/tr-TR.rc
    trunk/reactos/win32ss/user/user32/lang/uk-UA.rc
    trunk/reactos/win32ss/user/user32/lang/zh-CN.rc
    trunk/reactos/win32ss/user/user32/windows/messagebox.c

Modified: trunk/reactos/win32ss/user/user32/include/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/resource.h	[iso-8859-1] Thu Nov 19 13:42:55
2015
@@ -8,6 +8,13 @@
 #pragma once
 
 #define IDS_ERROR    (2)
+
+/*
+ * Button names IDs.
+ *
+ * The low value must be equal to the corresponding
+ * IDOK ... IDCONTINUE values, minus one.
+ */
 #define IDS_OK       (800)
 #define IDS_CANCEL   (801)
 #define IDS_ABORT    (802)
@@ -15,6 +22,7 @@
 #define IDS_IGNORE   (804)
 #define IDS_YES      (805)
 #define IDS_NO       (806)
+#define IDS_CLOSE    (807)
 #define IDS_HELP     (808)
 #define IDS_TRYAGAIN (809)
 #define IDS_CONTINUE (810)

Modified: trunk/reactos/win32ss/user/user32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/b…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/bg-BG.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "Прене&брегване"
     IDS_YES "&Да"
     IDS_NO "&Не"
+    IDS_CLOSE "&Затваряне"
     IDS_HELP "Помощ"
     IDS_TRYAGAIN "&Нов опит"
     IDS_CONTINUE "Про&дължаване"

Modified: trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/c…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/cs-CZ.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -70,6 +70,7 @@
     IDS_IGNORE "&Ignorovat"
     IDS_YES "&Ano"
     IDS_NO "&Ne"
+    IDS_CLOSE "&Zavřít"
     IDS_HELP "Nápověda"
     IDS_TRYAGAIN "Z&kusit znovu"
     IDS_CONTINUE "P&okračovat"

Modified: trunk/reactos/win32ss/user/user32/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/da-DK.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/da-DK.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Ignorer"
     IDS_YES "&Ja"
     IDS_NO "&Nej"
+    IDS_CLOSE "&Luk"
     IDS_HELP "Hjælp"
     IDS_TRYAGAIN "&Forsøg Igen"
     IDS_CONTINUE "&Forsæt"

Modified: trunk/reactos/win32ss/user/user32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/de-DE.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Ignorieren"
     IDS_YES "&Ja"
     IDS_NO "&Nein"
+    IDS_CLOSE "S&chließen"
     IDS_HELP "Hilfe"
     IDS_TRYAGAIN "&Wiederholen"
     IDS_CONTINUE "&Weiter"

Modified: trunk/reactos/win32ss/user/user32/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/el-GR.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "Παρά&βλεψη"
     IDS_YES "&Ναι"
     IDS_NO "Ο&χι"
+    IDS_CLOSE "&Κλείσημο"
     IDS_HELP "Βοήθεια"
     IDS_TRYAGAIN "&Επανάληψη"
     IDS_CONTINUE "&Συνέχεια"

Modified: trunk/reactos/win32ss/user/user32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/en-US.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Ignore"
     IDS_YES "&Yes"
     IDS_NO "&No"
+    IDS_CLOSE "&Close"
     IDS_HELP "Help"
     IDS_TRYAGAIN "&Try Again"
     IDS_CONTINUE "&Continue"

Modified: trunk/reactos/win32ss/user/user32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/e…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/es-ES.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Ignorar"
     IDS_YES "&Si"
     IDS_NO "&No"
+    IDS_CLOSE "&Cerrar"
     IDS_HELP "Ayuda"
     IDS_TRYAGAIN "In&tentar Otra vez"
     IDS_CONTINUE "&Continuar"

Modified: trunk/reactos/win32ss/user/user32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/f…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/fr-FR.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Ignorer"
     IDS_YES "&Oui"
     IDS_NO "&Non"
+    IDS_CLOSE "&Fermer"
     IDS_HELP "Aide"
     IDS_TRYAGAIN "R&ecommencer"
     IDS_CONTINUE "&Continuer"

Modified: trunk/reactos/win32ss/user/user32/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/he-IL.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "ה&תעלם"
     IDS_YES "&כן"
     IDS_NO "&לא"
+    IDS_CLOSE "&סגור"
     IDS_HELP "עזרה"
     IDS_TRYAGAIN "&× ×¡×” שוב"
     IDS_CONTINUE "&המשך"

Modified: trunk/reactos/win32ss/user/user32/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/h…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/hu-HU.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Tovább"
     IDS_YES "&Igen"
     IDS_NO "&Nem"
+    IDS_CLOSE "&Bezár"
     IDS_HELP "Súgó"
     IDS_TRYAGAIN "&Újra"
     IDS_CONTINUE "&Folytat"

Modified: trunk/reactos/win32ss/user/user32/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/id-ID.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/id-ID.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "Aba&ikan"
     IDS_YES "&Ya"
     IDS_NO "&Tidak"
+    IDS_CLOSE "T&utup"
     IDS_HELP "Bantuan"
     IDS_TRYAGAIN "&Coba Lagi"
     IDS_CONTINUE "&Lanjutkan"

Modified: trunk/reactos/win32ss/user/user32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/i…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/it-IT.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Ignora"
     IDS_YES "&Si"
     IDS_NO "&No"
+    IDS_CLOSE "&Chiudi"
     IDS_HELP "Aiuto"
     IDS_TRYAGAIN "&Prova ancora"
     IDS_CONTINUE "&Continua"

Modified: trunk/reactos/win32ss/user/user32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/j…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/ja-JP.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "無視(&I)"
     IDS_YES "はい(&Y)"
     IDS_NO "いいえ(&N)"
+    IDS_CLOSE "閉じる(&C)"
     IDS_HELP "ヘルプ"
     IDS_TRYAGAIN "再試行する(&T)"
     IDS_CONTINUE "続ける(&C)"

Modified: trunk/reactos/win32ss/user/user32/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/l…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/lt-LT.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Praleisti"
     IDS_YES "&Taip"
     IDS_NO "&Ne"
+    IDS_CLOSE "&Uþverti"
     IDS_HELP "Pagalba"
     IDS_TRYAGAIN "&Bandyti vël"
     IDS_CONTINUE "Tæ&sti"

Modified: trunk/reactos/win32ss/user/user32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/nl-NL.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Negeren"
     IDS_YES "&Ja"
     IDS_NO "&Nee"
+    IDS_CLOSE "&Afsluiten"
     IDS_HELP "Help"
     IDS_TRYAGAIN "&Probeer opnieuw"
     IDS_CONTINUE "&Verder"

Modified: trunk/reactos/win32ss/user/user32/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/n…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/no-NO.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Ignorer"
     IDS_YES "&Ja"
     IDS_NO "&Nei"
+    IDS_CLOSE "&Lukk"
     IDS_HELP "Hjelp"
     IDS_TRYAGAIN "&Prøv på nytt"
     IDS_CONTINUE "&Fortsett"

Modified: trunk/reactos/win32ss/user/user32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/pl-PL.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -70,6 +70,7 @@
     IDS_IGNORE "&Ignoruj"
     IDS_YES "&Tak"
     IDS_NO "&Nie"
+    IDS_CLOSE "Zam&knij"
     IDS_HELP "Pomoc"
     IDS_TRYAGAIN "&Ponów próbę"
     IDS_CONTINUE "&Kontynuuj"

Modified: trunk/reactos/win32ss/user/user32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/p…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/pt-BR.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Ignorar"
     IDS_YES "&Sim"
     IDS_NO "&Não"
+    IDS_CLOSE "&Fechar"
     IDS_HELP "Ajuda"
     IDS_TRYAGAIN "&Tentar Novamente"
     IDS_CONTINUE "&Continuar"

Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/ro-RO.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -70,7 +70,8 @@
     IDS_IGNORE "Ign&oră"
     IDS_YES "D&a"
     IDS_NO "N&u"
-    IDS_HELP "&Manual…"
+    IDS_CLOSE "Î&nchide"
+    IDS_HELP "Manual"
     IDS_TRYAGAIN "&Reîncearcă"
     IDS_CONTINUE "&Continuă"
 END

Modified: trunk/reactos/win32ss/user/user32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/ru-RU.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "&Пропустить"
     IDS_YES "&Да"
     IDS_NO "&Нет"
+    IDS_CLOSE "&Закрыть"
     IDS_HELP "Справка"
     IDS_TRYAGAIN "&Повторить"
     IDS_CONTINUE "&Продолжить"

Modified: trunk/reactos/win32ss/user/user32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/sk-SK.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Ignorovať"
     IDS_YES "Án&o"
     IDS_NO "&Nie"
+    IDS_CLOSE "&Zavrieť"
     IDS_HELP "Pomoc"
     IDS_TRYAGAIN "&Skúsiť znova"
     IDS_CONTINUE "&Pokračovať"

Modified: trunk/reactos/win32ss/user/user32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/s…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/sv-SE.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Ignorera"
     IDS_YES "&Ja"
     IDS_NO "&Nej"
+    IDS_CLOSE "&Stäng"
     IDS_HELP "Hjälp"
     IDS_TRYAGAIN "&Försök igen"
     IDS_CONTINUE "F&ortsätt"

Modified: trunk/reactos/win32ss/user/user32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/t…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/tr-TR.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -67,6 +67,7 @@
     IDS_IGNORE "&Yoksay"
     IDS_YES "&Evet"
     IDS_NO "&Hayır"
+    IDS_CLOSE "&Kapat"
     IDS_HELP "Yardım"
     IDS_TRYAGAIN "&Yeniden Dene"
     IDS_CONTINUE "&Devam"

Modified: trunk/reactos/win32ss/user/user32/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/u…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/uk-UA.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -65,6 +65,7 @@
     IDS_IGNORE "Пр&опустити"
     IDS_YES "&Так"
     IDS_NO "Н&і"
+    IDS_CLOSE "&Закрити"
     IDS_HELP "Довідка"
     IDS_TRYAGAIN "По&вторити"
     IDS_CONTINUE "&Продовжити"

Modified: trunk/reactos/win32ss/user/user32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/z…
==============================================================================
--- trunk/reactos/win32ss/user/user32/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/lang/zh-CN.rc	[iso-8859-1] Thu Nov 19 13:42:55 2015
@@ -20,7 +20,7 @@
     BEGIN
         MENUITEM "撤销(&U)", EM_UNDO
         MENUITEM SEPARATOR
-        MENUITEM "剪切(&t)", WM_CUT
+        MENUITEM "剪切(&T)", WM_CUT
         MENUITEM "复制(&C)", WM_COPY
         MENUITEM "粘贴(&P)", WM_PASTE
         MENUITEM "åˆ é™¤(&D)", WM_CLEAR
@@ -34,8 +34,8 @@
     MENUITEM "还原(&R)", SC_RESTORE
     MENUITEM "移动(&M)", SC_MOVE
     MENUITEM "大小(&S)", SC_SIZE
-    MENUITEM "最小化(&n)", SC_MINIMIZE
-    MENUITEM "最大化(&x)", SC_MAXIMIZE
+    MENUITEM "最小化(&N)", SC_MINIMIZE
+    MENUITEM "最大化(&X)", SC_MAXIMIZE
     MENUITEM SEPARATOR
     MENUITEM "关闭(&C)\tAlt+F4", SC_CLOSE
 END
@@ -45,8 +45,8 @@
     MENUITEM "还原(&R)", SC_RESTORE
     MENUITEM "移动(&M)", SC_MOVE
     MENUITEM "大小(&S)", SC_SIZE
-    MENUITEM "最小化(&n)", SC_MINIMIZE
-    MENUITEM "最大化(&x)", SC_MAXIMIZE
+    MENUITEM "最小化(&N)", SC_MINIMIZE
+    MENUITEM "最大化(&X)", SC_MAXIMIZE
     MENUITEM SEPARATOR
     MENUITEM "关闭(&C)\tCtrl+F4", SC_CLOSE
     MENUITEM SEPARATOR
@@ -65,6 +65,7 @@
     IDS_IGNORE "忽略(&I)"
     IDS_YES "是(&Y)"
     IDS_NO "否(&N)"
+    IDS_CLOSE "关闭(&C)"
     IDS_HELP "帮助"
     IDS_TRYAGAIN "重试(&T)"
     IDS_CONTINUE "继续(&C)"

Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/messagebox.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/messagebox.c	[iso-8859-1] Thu Nov 19
13:42:55 2015
@@ -1055,10 +1055,14 @@
 {
     LPCWSTR btnStr = NULL;
 
-    /* The allowable IDs are between IDOK (0) and IDCONTINUE (11) inclusive */
-    if (wBtn >= IDCONTINUE)
+    /*
+     * The allowable IDs are between "IDOK - 1" (0) and "IDCONTINUE -
1" (10) inclusive.
+     * See psdk/winuser.h and user32/include/resource.h .
+     */
+    if (wBtn > IDCONTINUE - 1)
         return NULL;
 
+    wBtn += 800; // See user32/include/resource.h
     LoadStringW(User32Instance, wBtn, (LPWSTR)&btnStr, 0);
     return btnStr;
 }