[ros-diffs] [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, ...

19 Nov 2015

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;
 }



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [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, ...