Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[akhaldi] 65954: [APPLICATIONS] Convert resource files to UTF-8. By Alvin Wong. Translators, please review! CORE-9021
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:53:01 2015 New Revision: 65954 URL: http://svn.reactos.org/svn/reactos?rev=65954&view=rev Log: [APPLICATIONS] Convert resource files to UTF-8. By Alvin Wong. Translators, please review! CORE-9021 Modified: trunk/reactos/base/applications/fontview/lang/it-IT.rc trunk/reactos/base/applications/network/wlanconf/lang/it-IT.rc trunk/reactos/base/applications/network/wlanconf/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/regedit/clb/clb.rc trunk/reactos/base/applications/regedit/clb/lang/bg-BG.rc trunk/reactos/base/applications/regedit/clb/lang/de-DE.rc trunk/reactos/base/applications/regedit/clb/lang/el-GR.rc trunk/reactos/base/applications/regedit/clb/lang/es-ES.rc trunk/reactos/base/applications/regedit/clb/lang/fr-FR.rc trunk/reactos/base/applications/regedit/clb/lang/ja-JP.rc trunk/reactos/base/applications/regedit/clb/lang/no-NO.rc trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc trunk/reactos/base/applications/regedit/clb/lang/sk-SK.rc trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc trunk/reactos/base/applications/shutdown/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/lang/Bg.rc trunk/reactos/base/applications/winhlp32/lang/Cs.rc trunk/reactos/base/applications/winhlp32/lang/Fi.rc trunk/reactos/base/applications/winhlp32/lang/Hu.rc trunk/reactos/base/applications/winhlp32/lang/No.rc trunk/reactos/base/applications/winhlp32/lang/Pl.rc trunk/reactos/base/applications/winhlp32/lang/Sk.rc trunk/reactos/base/applications/winhlp32/lang/Sv.rc trunk/reactos/base/applications/winhlp32/rsrc.rc trunk/reactos/base/applications/wordpad/lang/Hu.rc trunk/reactos/base/applications/wordpad/lang/Ko.rc trunk/reactos/base/applications/wordpad/lang/Pl.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/write/lang/Ko.rc trunk/reactos/base/applications/write/lang/No.rc trunk/reactos/base/applications/write/lang/Pl.rc trunk/reactos/base/applications/write/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/fontview/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/network/wlanconf/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/wlanconf/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/clb/clb.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/shutdown/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/winhlp32/lang/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/write/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… Modified: trunk/reactos/base/applications/write/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… Modified: trunk/reactos/base/applications/write/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs…

1 0

[akhaldi] 65953: [MSCUTILS] Convert resource files to UTF-8. By Alvin Wong (alvinhochun - gmail). Translators, please review! CORE-9021
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:45:55 2015 New Revision: 65953 URL: http://svn.reactos.org/svn/reactos?rev=65953&view=rev Log: [MSCUTILS] Convert resource files to UTF-8. By Alvin Wong (alvinhochun - gmail). Translators, please review! CORE-9021 Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_GREEK, SUBLANG_DEFAULT +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Spanish Language resource file * Traducido por: Javier Remacha 2007-12-21 * Corregido por: Ismael Ferrera Morezuelas 2014-12-31 Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* Korean translation by manatails007(www.manatails007.org) */ +/* Korean translation by manatails007(www.manatails007.org) */ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDR_MAINMENU MENU BEGIN Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Translated by xrogers * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* 2011.10.19 - Fulea Ètefan: minor changes */ +/* 2011.10.19 - Fulea Ètefan: minor changes */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */ +/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 14-02-2008 * LAST CHANGE: 29-08-2008 */ Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * PROJECT: ReactOS MSCUTILS * FILE: base\applications\mscutils\devmgmt\lang\sv-SE.rc * PURPOSE: Swedish resource file Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * PROJECT: ReactOS Device Management * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/devmgmt/lang/th-TH.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * PROJECT: ReactOS Device Management * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/devmgmt/lang/uk-UA.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -ï»¿/* Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ +/* Translated by Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -2,26 +2,26 @@ IDR_MAINMENU MENU BEGIN - POPUP "&Ôàéë" + POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "Èç&õîä", IDC_EXIT + MENUITEM "ÐÐ·&ÑÐ¾Ð´", IDC_EXIT END - POPUP "Äåéñòâèå" + POPUP "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ" BEGIN - MENUITEM "Îòïå÷àòâàíå", IDC_PRINT, GRAYED + MENUITEM "ÐÑÐ¿ÐµÑÐ°ÑÐ²Ð°Ð½Ðµ", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Ñâîéñòâà", IDC_PROP, GRAYED + MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_PROP, GRAYED END - POPUP "Èçãëåä" + POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Óñòðîéñòâàòà ñïîðåä âèä", IDC_DEVBYTYPE, CHECKED - MENUITEM "Óñòðîéñòâàòà ñïîðåä ñâúðçâàíåòî", IDC_STATIC, GRAYED - MENUITEM "Ñðåäñòâàòà ñïîðåä âèäà", IDC_STATIC, GRAYED - MENUITEM "Ñðåäñòâàòà ñïîðåä ñâúðçâàíåòî", IDC_STATIC, GRAYED + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´", IDC_DEVBYTYPE, CHECKED + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, GRAYED + MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ Ð²Ð¸Ð´Ð°", IDC_STATIC, GRAYED + MENUITEM "Ð¡ÑÐµÐ´ÑÑÐ²Ð°ÑÐ° ÑÐ¿Ð¾ÑÐµÐ´ ÑÐ²ÑÑÐ·Ð²Ð°Ð½ÐµÑÐ¾", IDC_STATIC, GRAYED END - POPUP "Ïîìîù" + POPUP "ÐÐ¾Ð¼Ð¾Ñ" BEGIN - MENUITEM "Çà", IDC_ABOUT + MENUITEM "ÐÐ°", IDC_ABOUT END END @@ -29,12 +29,12 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Ñâîéñòâà", IDC_PROP, GRAYED + MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Çà óïðàâèòåëÿ íà óñòðîéñòâàòà" +CAPTION "ÐÐ° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ°" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN @@ -51,27 +51,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "Ñâîéñòâà" - IDS_TOOLTIP_REFRESH "Îïðåñíÿâàíå" - IDS_TOOLTIP_HELP "Ïîìîù" - IDS_TOOLTIP_EXIT "Èçõîä" + IDS_TOOLTIP_PROP "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" + IDS_TOOLTIP_REFRESH "ÐÐ¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ" + IDS_TOOLTIP_HELP "ÐÐ¾Ð¼Ð¾Ñ" + IDS_TOOLTIP_EXIT "ÐÐ·ÑÐ¾Ð´" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "Óïðàâèòåë íà óñòðîéñòâàòà íà ÐåàêòÎÑ" + IDS_APPNAME "Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" IDS_HINT_BLANK " " - IDS_HINT_EXIT " Èçëèçà îò ïðèëîæåíèåòî." - IDS_HINT_REFRESH " Îïðåñíÿâà ñïèñúêà íà óñëóãèòå." - IDS_HINT_PROP " Îòâàðÿ ëèñò çà ñâîéñòâà çà òåêóùèÿ èçáîð." - IDS_HINT_HELP " Ïîêàçâà ïîìîùåí ïðîçîðåö." - IDS_HINT_ABOUT " Çà óïðàâèòåëÿ íà óñòðéñòâàòà íà ÐåàêòÎÑ." + IDS_HINT_EXIT " ÐÐ·Ð»Ð¸Ð·Ð° Ð¾Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾." + IDS_HINT_REFRESH " ÐÐ¿ÑÐµÑÐ½ÑÐ²Ð° ÑÐ¿Ð¸ÑÑÐºÐ° Ð½Ð° ÑÑÐ»ÑÐ³Ð¸ÑÐµ." + IDS_HINT_PROP " ÐÑÐ²Ð°ÑÑ Ð»Ð¸ÑÑ Ð·Ð° ÑÐ²Ð¾Ð¹ÑÑÐ²Ð° Ð·Ð° ÑÐµÐºÑÑÐ¸Ñ Ð¸Ð·Ð±Ð¾Ñ." + IDS_HINT_HELP " ÐÐ¾ÐºÐ°Ð·Ð²Ð° Ð¿Ð¾Ð¼Ð¾ÑÐµÐ½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ." + IDS_HINT_ABOUT " ÐÐ° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÑÐ¹ÑÑÐ²Ð°ÑÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡." - IDS_HINT_SYS_RESTORE " Âúçñòàíîâÿâà ïðîçîðåöà äî îáè÷àéíèÿ ìó ðàìåð." - IDS_HINT_SYS_MOVE " Ïðåìåñòâà ïðîçîðåöà." - IDS_HINT_SYS_SIZE " Ïðåîðàçìåðÿâà ïðîçîðåöà." - IDS_HINT_SYS_MINIMIZE " Ñâèâà ïðîçîðåöà â çíà÷êà." - IDS_HINT_SYS_MAXIMIZE " Ðàçãðúùà ïðîçîðåöà, äîêàòî çàïúëíè öåëèÿ åêðàí." - IDS_HINT_SYS_CLOSE " Çàòâàðÿ ïðîçîðåöà." + IDS_HINT_SYS_RESTORE " ÐÑÐ·ÑÑÐ°Ð½Ð¾Ð²ÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ° Ð´Ð¾ Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸Ñ Ð¼Ñ ÑÐ°Ð¼ÐµÑ." + IDS_HINT_SYS_MOVE " ÐÑÐµÐ¼ÐµÑÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." + IDS_HINT_SYS_SIZE " ÐÑÐµÐ¾ÑÐ°Ð·Ð¼ÐµÑÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." + IDS_HINT_SYS_MINIMIZE " Ð¡Ð²Ð¸Ð²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ° Ð² Ð·Ð½Ð°ÑÐºÐ°." + IDS_HINT_SYS_MAXIMIZE " Ð Ð°Ð·Ð³ÑÑÑÐ° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°, Ð´Ð¾ÐºÐ°ÑÐ¾ Ð·Ð°Ð¿ÑÐ»Ð½Ð¸ ÑÐµÐ»Ð¸Ñ ÐµÐºÑÐ°Ð½." + IDS_HINT_SYS_CLOSE " ÐÐ°ÑÐ²Ð°ÑÑ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -14,8 +14,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Geräte nach Typ", IDC_DEVBYTYPE, CHECKED - MENUITEM "Geräte nach Verbindung", IDC_STATIC, GRAYED + MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE, CHECKED + MENUITEM "GerÃ¤te nach Verbindung", IDC_STATIC, GRAYED MENUITEM "Resourcen nach Typ", IDC_STATIC, GRAYED MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED END @@ -34,19 +34,19 @@ END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Über Geräte-Manager" +CAPTION "Ãber GerÃ¤te-Manager" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Geräte-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 - PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 + LTEXT "GerÃ¤te-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "SchlieÃen", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie kÃ¶nnen es frei verteilen mit od. ohne Ãnderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation verÃ¶ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spÃ¤tere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE @@ -60,18 +60,18 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS Geräte-Manager" + IDS_APPNAME "ReactOS GerÃ¤te-Manager" IDS_HINT_BLANK " " IDS_HINT_EXIT " Das Programm beenden." IDS_HINT_REFRESH " Die Service-Liste aktualisieren." - IDS_HINT_PROP " Eigenschaften-Seite für die aktuelle Auswahl anzeigen." + IDS_HINT_PROP " Eigenschaften-Seite fÃ¼r die aktuelle Auswahl anzeigen." IDS_HINT_HELP " Hilfe-Fenster anzeigen." - IDS_HINT_ABOUT " Über ReactOS Geräte-Manager." + IDS_HINT_ABOUT " Ãber ReactOS GerÃ¤te-Manager." - IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale Größe wiederherstellen." + IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale GrÃ¶Ãe wiederherstellen." IDS_HINT_SYS_MOVE " Dieses Fenster verschieben." - IDS_HINT_SYS_SIZE " Größe dieses Fensters ändern." + IDS_HINT_SYS_SIZE " GrÃ¶Ãe dieses Fensters Ã¤ndern." IDS_HINT_SYS_MINIMIZE " Dieses Fenster zu einem Symbol verkleinern." - IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgröße vergrößern." - IDS_HINT_SYS_CLOSE " Dieses Fenster schließen." + IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf BildschirmgrÃ¶Ãe vergrÃ¶Ãern." + IDS_HINT_SYS_CLOSE " Dieses Fenster schlieÃen." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -2,26 +2,26 @@ IDR_MAINMENU MENU BEGIN - POPUP "&Áñ÷åßï" + POPUP "&ÎÏÏÎµÎ¯Î¿" BEGIN - MENUITEM "¸&îïäïò", IDC_EXIT + MENUITEM "Î&Î¾Î¿Î´Î¿Ï", IDC_EXIT END - POPUP "ÅíÝñãåéá" + POPUP "ÎÎ½ÎÏÎ³ÎµÎ¹Î±" BEGIN - MENUITEM "Åêôýðùóç", IDC_PRINT, GRAYED + MENUITEM "ÎÎºÏÏÏÏÏÎ·", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Éäéüôçôåò", IDC_PROP, GRAYED + MENUITEM "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", IDC_PROP, GRAYED END - POPUP "ÅìöÜíéóç" + POPUP "ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·" BEGIN - MENUITEM "ÓõóêåõÝò áíÜ ôýðï", IDC_DEVBYTYPE, CHECKED - MENUITEM "ÓõóêåõÝò áíÜ óýíäåóç", IDC_STATIC, GRAYED - MENUITEM "ÐçãÝò áíÜ ôýðï", IDC_STATIC, GRAYED - MENUITEM "ÐçãÝò áíÜ óýíäåóç", IDC_STATIC, GRAYED + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_DEVBYTYPE, CHECKED + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_STATIC, GRAYED + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED END - POPUP "ÂïÞèåéá" + POPUP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN - MENUITEM "Ó÷åôéêÜ...", IDC_ABOUT + MENUITEM "Î£ÏÎµÏÎ¹ÎºÎ¬...", IDC_ABOUT END END @@ -29,12 +29,12 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Éäéüôçôåò", IDC_PROP, GRAYED + MENUITEM "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Ó÷åôéêÜ ìå ç äéá÷åßñéóç óõóêåþí" +CAPTION "Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ Î· Î´Î¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· ÏÏÏÎºÎµÏÎ½" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN @@ -51,27 +51,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "Éäéüôçôåò" - IDS_TOOLTIP_REFRESH "ÁíáíÝùóç" - IDS_TOOLTIP_HELP "ÂïÞèåéá" - IDS_TOOLTIP_EXIT "¸îïäïò" + IDS_TOOLTIP_PROP "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ" + IDS_TOOLTIP_REFRESH "ÎÎ½Î±Î½ÎÏÏÎ·" + IDS_TOOLTIP_HELP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" + IDS_TOOLTIP_EXIT "ÎÎ¾Î¿Î´Î¿Ï" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "Äéá÷åßñéóç Óõóêåõþí ôïõ ReactOS" + IDS_APPNAME "ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ ÏÎ¿Ï ReactOS" IDS_HINT_BLANK " " - IDS_HINT_EXIT " Ôåñìáôßæåé ôï ðñüãñáììá." - IDS_HINT_REFRESH " ÁíáíÝùóç ôçò ëßóôáò äéåñãáóéþí." - IDS_HINT_PROP " ¢íïéãìá ðáñáèýñïõ éäéïôÞôùí ãéá ôç óõãêåêñéìÝíç åðéëïãÞ." - IDS_HINT_HELP " ÅìöÜíéóç ðáñáèýñïõ âïÞèåéáò." - IDS_HINT_ABOUT " Ó÷åôéêÜ ìå ôç Äéá÷åßñéóç Óõóêåõþí ôïõ ReactOS." + IDS_HINT_EXIT " Î¤ÎµÏÎ¼Î±ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ ÏÏÏÎ³ÏÎ±Î¼Î¼Î±." + IDS_HINT_REFRESH " ÎÎ½Î±Î½ÎÏÏÎ· ÏÎ·Ï Î»Î¯ÏÏÎ±Ï Î´Î¹ÎµÏÎ³Î±ÏÎ¹ÏÎ½." + IDS_HINT_PROP " ÎÎ½Î¿Î¹Î³Î¼Î± ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï Î¹Î´Î¹Î¿ÏÎ®ÏÏÎ½ Î³Î¹Î± ÏÎ· ÏÏÎ³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î· ÎµÏÎ¹Î»Î¿Î³Î®." + IDS_HINT_HELP " ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï Î²Î¿Î®Î¸ÎµÎ¹Î±Ï." + IDS_HINT_ABOUT " Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ· ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ ÏÎ¿Ï ReactOS." - IDS_HINT_SYS_RESTORE " ÅðáíáöÝñåé ôï ðáñÜèõñï áõôü óôï êáíïíéêï ôïõ ìÝãåèïò." - IDS_HINT_SYS_MOVE " Ìåôáêéíåß áõôü ôï ðáñÜèõñï." - IDS_HINT_SYS_SIZE " ÁëëÜæåé ôï ìÝãåèïò áõôïý ôïõ ðáñáèýñïõ." - IDS_HINT_SYS_MINIMIZE " Ìéêñáßíåé áõôü ôï ðáñÜèõñï óå Ýíá åéêïíßäéï." - IDS_HINT_SYS_MAXIMIZE " Ðñïóáñìüæåé ôï ìÝãåèïò ôïõ ðáñáèýñïõ áõôïý óôçí ïèüíç." - IDS_HINT_SYS_CLOSE " Êëåßíåé áõôü ôï ðáñÜèõñï." + IDS_HINT_SYS_RESTORE " ÎÏÎ±Î½Î±ÏÎÏÎµÎ¹ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ Î±ÏÏÏ ÏÏÎ¿ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ ÏÎ¿Ï Î¼ÎÎ³ÎµÎ¸Î¿Ï." + IDS_HINT_SYS_MOVE " ÎÎµÏÎ±ÎºÎ¹Î½ÎµÎ¯ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿." + IDS_HINT_SYS_SIZE " ÎÎ»Î»Î¬Î¶ÎµÎ¹ ÏÎ¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï." + IDS_HINT_SYS_MINIMIZE " ÎÎ¹ÎºÏÎ±Î¯Î½ÎµÎ¹ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ ÏÎµ ÎÎ½Î± ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿." + IDS_HINT_SYS_MAXIMIZE " Î ÏÎ¿ÏÎ±ÏÎ¼ÏÎ¶ÎµÎ¹ ÏÎ¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï ÏÎ¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï Î±ÏÏÎ¿Ï ÏÏÎ·Î½ Î¿Î¸ÏÎ½Î·." + IDS_HINT_SYS_CLOSE " ÎÎ»ÎµÎ¯Î½ÎµÎ¹ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -12,7 +12,7 @@ BEGIN MENUITEM "&Salir", IDC_EXIT END - POPUP "Acción" + POPUP "AcciÃ³n" BEGIN MENUITEM "Imprimir", IDC_PRINT, GRAYED MENUITEM SEPARATOR @@ -21,9 +21,9 @@ POPUP "Ver" BEGIN MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE, CHECKED - MENUITEM "Dispositivos por conexión", IDC_STATIC, GRAYED + MENUITEM "Dispositivos por conexiÃ³n", IDC_STATIC, GRAYED MENUITEM "Recursos por tipo", IDC_STATIC, GRAYED - MENUITEM "Recursos por conexión", IDC_STATIC, GRAYED + MENUITEM "Recursos por conexiÃ³n", IDC_STATIC, GRAYED END POPUP "Ayuda" BEGIN @@ -52,7 +52,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU." + IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los tÃ©rminos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versiÃ³n 2 de la Licencia, o (bajo tu discreciÃ³n) cualquier versiÃ³n posterior.\r\n\r\nEste programa se distribuye con el fin de ser Ãºtil, pero viene SIN NINGUNA GARANTÃA; sin tan siquiera la garantÃa implÃcita de COMERCIALIZACIÃN o la de IDONEIDAD PARA UN PROPÃSITO CONCRETO. Para mÃ¡s informaciÃ³n lee la GNU General Public License.\r\n\r\nDeberÃas de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU." END STRINGTABLE DISCARDABLE @@ -70,11 +70,11 @@ IDS_HINT_BLANK " " IDS_HINT_EXIT " Cerrar el programa." IDS_HINT_REFRESH " Actualizar la lista de servicios." - IDS_HINT_PROP " Abre la pestaña de propiedades de la selección actual." + IDS_HINT_PROP " Abre la pestaÃ±a de propiedades de la selecciÃ³n actual." IDS_HINT_HELP " Mostrar la ventana de ayuda." IDS_HINT_ABOUT " Acerca del Administrador de dispositivos de ReactOS." - IDS_HINT_SYS_RESTORE " Devuelve esta ventana al tamaño normal." + IDS_HINT_SYS_RESTORE " Devuelve esta ventana al tamaÃ±o normal." IDS_HINT_SYS_MOVE " Mueve esta ventana." IDS_HINT_SYS_SIZE " Redimensiona esta ventana." IDS_HINT_SYS_MINIMIZE " Contrae esta ventana en un icono." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -10,18 +10,18 @@ BEGIN MENUITEM "Imprimer", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Propriétés", IDC_PROP, GRAYED + MENUITEM "PropriÃ©tÃ©s", IDC_PROP, GRAYED END POPUP "Affichage" BEGIN - MENUITEM "Périphériques par type", IDC_DEVBYTYPE, CHECKED - MENUITEM "Périphériques par connexion", IDC_STATIC, GRAYED + MENUITEM "PÃ©riphÃ©riques par type", IDC_DEVBYTYPE, CHECKED + MENUITEM "PÃ©riphÃ©riques par connexion", IDC_STATIC, GRAYED MENUITEM "Ressources par type", IDC_STATIC, GRAYED MENUITEM "Ressources par connexion", IDC_STATIC, GRAYED END POPUP "Aide" BEGIN - MENUITEM "À propos", IDC_ABOUT + MENUITEM "Ã propos", IDC_ABOUT END END @@ -29,16 +29,16 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Propriétés", IDC_PROP, GRAYED + MENUITEM "PropriÃ©tÃ©s", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "À propos du Gestionnaire de Périphériques" +CAPTION "Ã propos du Gestionnaire de PÃ©riphÃ©riques" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestionnaire de Périphériques v0.1\nCopyright (C) 2006\npar Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestionnaire de PÃ©riphÃ©riques v0.1\nCopyright (C) 2006\npar Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -46,12 +46,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. \r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiÃ©e par la Free Software Foundation; dans sa version 2 (ou selon votre prÃ©fÃ©rence) toute version ultÃ©rieure.\r\n\r\nCe programme est distribuÃ© dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans mÃªme une garantie implicite de COMMERCIABILITÃ ou DE CONFORMITÃ Ã UNE UTILISATION PARTICULIÃRE. \r\n\r\nVoir la Licence Publique GÃ©nÃ©rale GNU pour plus de dÃ©tails. Vous devriez avoir reÃ§u un exemplaire de la Licence Publique GÃ©nÃ©rale GNU avec ce programme ; si ce n'est pas le cas, Ã©crivez Ã la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "Propriétés" + IDS_TOOLTIP_PROP "PropriÃ©tÃ©s" IDS_TOOLTIP_REFRESH "Actualiser" IDS_TOOLTIP_HELP "Aide" IDS_TOOLTIP_EXIT "Quitter" @@ -60,18 +60,18 @@ /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "Gestionnaire de périphériques ReactOS" + IDS_APPNAME "Gestionnaire de pÃ©riphÃ©riques ReactOS" IDS_HINT_BLANK " " IDS_HINT_EXIT " Quitte le programme." - IDS_HINT_REFRESH " Actualise la liste des périphériques." - IDS_HINT_PROP " Ouvre la feuille de propriétés pour la sélection actuelle." - IDS_HINT_HELP " Affiche la fenêtre d'aide." - IDS_HINT_ABOUT " À propos du Gestionnaire de Périphériques de ReactOS." + IDS_HINT_REFRESH " Actualise la liste des pÃ©riphÃ©riques." + IDS_HINT_PROP " Ouvre la feuille de propriÃ©tÃ©s pour la sÃ©lection actuelle." + IDS_HINT_HELP " Affiche la fenÃªtre d'aide." + IDS_HINT_ABOUT " Ã propos du Gestionnaire de PÃ©riphÃ©riques de ReactOS." - IDS_HINT_SYS_RESTORE " Restaure cette fenêtre à sa taille normale." - IDS_HINT_SYS_MOVE " Bouge cette fenêtre." - IDS_HINT_SYS_SIZE " Redimensionne cette fenêtre." - IDS_HINT_SYS_MINIMIZE " Réduit cette fenêtre à une icône." - IDS_HINT_SYS_MAXIMIZE " Étend cette fenêtre à l'écran." - IDS_HINT_SYS_CLOSE " Ferme cette fenêtre." + IDS_HINT_SYS_RESTORE " Restaure cette fenÃªtre Ã sa taille normale." + IDS_HINT_SYS_MOVE " Bouge cette fenÃªtre." + IDS_HINT_SYS_SIZE " Redimensionne cette fenÃªtre." + IDS_HINT_SYS_MINIMIZE " RÃ©duit cette fenÃªtre Ã une icÃ´ne." + IDS_HINT_SYS_MAXIMIZE " Ãtend cette fenÃªtre Ã l'Ã©cran." + IDS_HINT_SYS_CLOSE " Ferme cette fenÃªtre." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -10,7 +10,7 @@ BEGIN MENUITEM "Stampa", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Proprietà", IDC_PROP, GRAYED + MENUITEM "ProprietÃ ", IDC_PROP, GRAYED END POPUP "Visualizza" BEGIN @@ -29,7 +29,7 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Proprietà", IDC_PROP, GRAYED + MENUITEM "ProprietÃ ", IDC_PROP, GRAYED END END @@ -46,12 +46,12 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Questo programma è software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma è distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÀ o UTILIZZABILITÀ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non è cosi' scrivete a 'Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.." + IDS_LICENSE "Questo programma Ã¨ software libero; puoi distribuirlo e/o modificarlo nei termini di licenza di 'GNU General Public License' come pubblicata dalla 'Free Software Foundation'; entrambe le versioni 2 della Licenza, o (a vostra scelta) qualunque versione successiva.\r\n\r\nQuesto programma Ã¨ distribuito con l'augurio che sia utile, ma PRIVO DI OGNI GARANZIA; privo anche della garanzia implicita di COMMERCIABILITÃ o UTILIZZABILITÃ PER UNO SPECIFICO USO. Vedi la 'GNU General Public License' per ulteriori dettagli.\r\n\r\nVoi dovreste aver ricevuto una copia della 'GNU General Public License' assieme a questo programma; se non Ã¨ cosi' scrivete a 'Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.." END STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "Proprietà" + IDS_TOOLTIP_PROP "ProprietÃ " IDS_TOOLTIP_REFRESH "Aggiorna" IDS_TOOLTIP_HELP "Aiuto" IDS_TOOLTIP_EXIT "Esci" @@ -64,7 +64,7 @@ IDS_HINT_BLANK " " IDS_HINT_EXIT " Esci dal programma." IDS_HINT_REFRESH " Aggiorna la lista dei servizi." - IDS_HINT_PROP " Apri le proprietà per la selezione attuale." + IDS_HINT_PROP " Apri le proprietÃ per la selezione attuale." IDS_HINT_HELP " Visualizza la finestra di aiuto." IDS_HINT_ABOUT " Informazioni su Gestione dispositivi di ReactOS." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -2,26 +2,26 @@ IDR_MAINMENU MENU BEGIN - POPUP "t@C(&F)" + POPUP "ãã¡ã¤ã«(&F)" BEGIN - MENUITEM "I¹(&X)", IDC_EXIT + MENUITEM "çµäº(&X)", IDC_EXIT END - POPUP "ì" + POPUP "æä½" BEGIN - MENUITEM "óü", IDC_PRINT, GRAYED + MENUITEM "å°å·", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM "ããããã£", IDC_PROP, GRAYED END - POPUP "\\¦" + POPUP "è¡¨\ç¤º" BEGIN - MENUITEM "foCX (íÞÊ)", IDC_DEVBYTYPE, CHECKED - MENUITEM "foCX (Ú±Ê)", IDC_STATIC, GRAYED - MENUITEM "\\[X (íÞÊ)", IDC_STATIC, GRAYED - MENUITEM "\\[X (Ú±Ê)", IDC_STATIC, GRAYED + MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE, CHECKED + MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED + MENUITEM "ãªã½\ã¼ã¹ (ç¨®é¡å¥)", IDC_STATIC, GRAYED + MENUITEM "ãªã½\ã¼ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED END - POPUP "wv" + POPUP "ãã«ã" BEGIN - MENUITEM "o[Wîñ", IDC_ABOUT + MENUITEM "ãã¼ã¸ã§ã³æå ±", IDC_ABOUT END END @@ -29,17 +29,17 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "vpeB", IDC_PROP, GRAYED + MENUITEM "ããããã£", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "foCX }l[WÉÂ¢Ä" +CAPTION "ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦" FONT 9, "MS UI Gothic",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "foCX }l[W v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 - PUSHBUTTON "Â¶é", IDOK, 75, 162, 44, 15 + LTEXT "ããã¤ã¹ ããã¼ã¸ã£ v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "éãã", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -51,27 +51,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "vpeB" - IDS_TOOLTIP_REFRESH "XV" - IDS_TOOLTIP_HELP "wv" - IDS_TOOLTIP_EXIT "I¹" + IDS_TOOLTIP_PROP "ããããã£" + IDS_TOOLTIP_REFRESH "æ´æ°" + IDS_TOOLTIP_HELP "ãã«ã" + IDS_TOOLTIP_EXIT "çµäº" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS foCX }l[W" + IDS_APPNAME "ReactOS ããã¤ã¹ ããã¼ã¸ã£" IDS_HINT_BLANK " " - IDS_HINT_EXIT " ±ÌvOðI¹µÜ·B" - IDS_HINT_REFRESH " T[rXÌXgðXVµÜ·B" - IDS_HINT_PROP " »ÝIð³êÄ¢éV[gÌvpeBðJ«Ü·B" - IDS_HINT_HELP " wv EBhEð\\¦µÜ·B" - IDS_HINT_ABOUT " ReactOS foCX }l[WÉÂ¢Ä\\¦µÜ·B" + IDS_HINT_EXIT " ãã®ããã°ã©ã ãçµäºãã¾ãã" + IDS_HINT_REFRESH " ãµã¼ãã¹ã®ãªã¹ããæ´æ°ãã¾ãã" + IDS_HINT_PROP " ç¾å¨é¸æããã¦ããã·ã¼ãã®ããããã£ãéãã¾ãã" + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨\ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨\ç¤ºãã¾ãã" - IDS_HINT_SYS_RESTORE " ±ÌEBhEðÊíÌå«³É³µÜ·B" - IDS_HINT_SYS_MOVE " ±ÌEBhEðÚ®µÜ·B" - IDS_HINT_SYS_SIZE " ±ÌEBhEÌå«³ðÏXµÜ·B" - IDS_HINT_SYS_MINIMIZE " ±ÌEBhEðACRÉÜè½½ÝÜ·B" - IDS_HINT_SYS_MAXIMIZE " ±ÌEBhEðæÊ¢ÁÏ¢ÉJ«Ü·B" - IDS_HINT_SYS_CLOSE " ±ÌEBhEðÂ¶Ü·B" + IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" + IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" + IDS_HINT_SYS_SIZE " ãã®ã¦ã£ã³ãã¦ã®å¤§ãããå¤æ´ãã¾ãã" + IDS_HINT_SYS_MINIMIZE " ãã®ã¦ã£ã³ãã¦ãã¢ã¤ã³ã³ã«æãããã¿ã¾ãã" + IDS_HINT_SYS_MAXIMIZE " ãã®ã¦ã£ã³ãã¦ãç»é¢ãã£ã±ãã«éãã¾ãã" + IDS_HINT_SYS_CLOSE " ãã®ã¦ã£ã³ãã¦ãéãã¾ãã" END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -5,39 +5,39 @@ IDR_MAINMENU MENU BEGIN - POPUP "ÆÄÀÏ(&F)" + POPUP "íì¼(&F)" BEGIN - MENUITEM "Á¾·á(&X)", IDC_EXIT + MENUITEM "ì¢ë£(&X)", IDC_EXIT END - POPUP "¾×¼Ç" + POPUP "ì¡ì" BEGIN - MENUITEM "ÇÁ¸°Æ®", IDC_PRINT, GRAYED + MENUITEM "íë¦°í¸", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "¼Ó¼º", IDC_PROP, GRAYED + MENUITEM "ìì±", IDC_PROP, GRAYED END - POPUP "º¸±â" + POPUP "ë³´ê¸°" BEGIN MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED MENUITEM "Devices by connection", IDC_STATIC, GRAYED MENUITEM "Resources by type", IDC_STATIC, GRAYED MENUITEM "Resources by connection", IDC_STATIC, GRAYED END - POPUP "µµ¿ò¸»" + POPUP "ëìë§" BEGIN - MENUITEM "Á¤º¸", IDC_ABOUT + MENUITEM "ì ë³´", IDC_ABOUT END END IDR_POPUP MENU BEGIN - POPUP "ÆË¾÷" + POPUP "íì" BEGIN - MENUITEM "¼Ó¼º", IDC_PROP, GRAYED + MENUITEM "ìì±", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "ÀåÄ¡ °ü¸®ÀÚ¿¡ ´ëÇÏ¿©" +CAPTION "ì¥ì¹ ê´ë¦¬ìì ëíì¬" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN @@ -54,27 +54,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "¼Ó¼º" - IDS_TOOLTIP_REFRESH "»õ·Î °íÄ§" - IDS_TOOLTIP_HELP "µµ¿ò¸»" - IDS_TOOLTIP_EXIT "Á¾·á" + IDS_TOOLTIP_PROP "ìì±" + IDS_TOOLTIP_REFRESH "ìë¡ ê³ ì¹¨" + IDS_TOOLTIP_HELP "ëìë§" + IDS_TOOLTIP_EXIT "ì¢ë£" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ReactOS ÀåÄ¡ °ü¸®ÀÚ" + IDS_APPNAME "ReactOS ì¥ì¹ ê´ë¦¬ì" IDS_HINT_BLANK " " - IDS_HINT_EXIT " ÇÁ·Î±×·¥À» Á¾·áÇÕ´Ï´Ù." - IDS_HINT_REFRESH " ¼ºñ½º ¸®½ºÆ®¸¦ »õ·Î °íÄ¨´Ï´Ù." - IDS_HINT_PROP " ¼±ÅÃÇÑ Ç×¸ñÀÇ ¼Ó¼º Ã¢À» ¿±´Ï´Ù." - IDS_HINT_HELP " µµ¿ò¸»À» ¿±´Ï´Ù." - IDS_HINT_ABOUT " ReactOS ÀåÄ¡ °ü¸®ÀÚ¿¡ ´ëÇØ." + IDS_HINT_EXIT " íë¡ê·¸ë¨ì ì¢ë£í©ëë¤." + IDS_HINT_REFRESH " ìë¹ì¤ ë¦¬ì¤í¸ë¥¼ ìë¡ ê³ ì¹©ëë¤." + IDS_HINT_PROP " ì íí íëª©ì ìì± ì°½ì ì½ëë¤." + IDS_HINT_HELP " ëìë§ì ì½ëë¤." + IDS_HINT_ABOUT " ReactOS ì¥ì¹ ê´ë¦¬ìì ëí´." - IDS_HINT_SYS_RESTORE " ÀÌ Ã¢À» º¸Åë Å©±â·Î ¬Ãã´Ï´Ù." - IDS_HINT_SYS_MOVE " Ã¢À» ¿òÁ÷ÀÔ´Ï´Ù." - IDS_HINT_SYS_SIZE " Ã¢ÀÇ Å©±â¸¦ º¯°æÇÕ´Ï´Ù." - IDS_HINT_SYS_MINIMIZE " ÀÌ Ã¢À» ¾ÆÀÌÄÜÀ¸·Î ¸¸µì´Ï´Ù." - IDS_HINT_SYS_MAXIMIZE " ÀÌ Ã¢À» ÃÖ´ë Å©±â·Î ¬Ãã´Ï´Ù." - IDS_HINT_SYS_CLOSE " Ã¢À» ´Ý½À´Ï´Ù." + IDS_HINT_SYS_RESTORE " ì´ ì°½ì ë³´íµ í¬ê¸°ë¡ ë§ì¶¤ëë¤." + IDS_HINT_SYS_MOVE " ì°½ì ìì§ìëë¤." + IDS_HINT_SYS_SIZE " ì°½ì í¬ê¸°ë¥¼ ë³ê²½í©ëë¤." + IDS_HINT_SYS_MINIMIZE " ì´ ì°½ì ìì´ì½ì¼ë¡ ë§ëëë¤." + IDS_HINT_SYS_MAXIMIZE " ì´ ì°½ì ìµë í¬ê¸°ë¡ ë§ì¶¤ëë¤." + IDS_HINT_SYS_CLOSE " ì°½ì ë«ìµëë¤." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -46,7 +46,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i hÃ¥p for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÃL. Se pÃ¥ GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE @@ -68,10 +68,10 @@ IDS_HINT_HELP " Vis hjelp vinduet." IDS_HINT_ABOUT " Om ReactOS Enhetsbehandler." - IDS_HINT_SYS_RESTORE " Gjenopprett dette vinduet til vanlig størrelse." + IDS_HINT_SYS_RESTORE " Gjenopprett dette vinduet til vanlig stÃ¸rrelse." IDS_HINT_SYS_MOVE " Flytt dette vinduet." - IDS_HINT_SYS_SIZE " Endre størrelse på dette vinduet." - IDS_HINT_SYS_MINIMIZE " Gjør om dette vinduet til en ikon." - IDS_HINT_SYS_MAXIMIZE " Gjør om dette vinduet til å fylle hele skjermen." + IDS_HINT_SYS_SIZE " Endre stÃ¸rrelse pÃ¥ dette vinduet." + IDS_HINT_SYS_MINIMIZE " GjÃ¸r om dette vinduet til en ikon." + IDS_HINT_SYS_MAXIMIZE " GjÃ¸r om dette vinduet til Ã¥ fylle hele skjermen." IDS_HINT_SYS_CLOSE " Lukk dette vinduet." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -1,4 +1,4 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) +/* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 14-02-2008 * LAST CHANGE: 29-08-2008 */ @@ -7,26 +7,26 @@ IDR_MAINMENU MENU BEGIN - POPUP "&Súbor" + POPUP "&SÃºbor" BEGIN - MENUITEM "&Skonèi", IDC_EXIT + MENUITEM "&SkonÄiÅ¥", IDC_EXIT END POPUP "Akcia" BEGIN - MENUITEM "Tlaèi", IDC_PRINT, GRAYED + MENUITEM "TlaÄiÅ¥", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti", IDC_PROP, GRAYED END - POPUP "Zobrazi" + POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Zariadenia pod¾a typu", IDC_DEVBYTYPE, CHECKED - MENUITEM "Zariadenia pod¾a pripojenia", IDC_STATIC, GRAYED - MENUITEM "Prostriedky pod¾a typu", IDC_STATIC, GRAYED - MENUITEM "Prostriedky pod¾a pripojenia", IDC_STATIC, GRAYED + MENUITEM "Zariadenia podÄ¾a typu", IDC_DEVBYTYPE, CHECKED + MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_STATIC, GRAYED + MENUITEM "Prostriedky podÄ¾a typu", IDC_STATIC, GRAYED + MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_STATIC, GRAYED END - POPUP "Pomocník" + POPUP "PomocnÃk" BEGIN - MENUITEM "Èo je ...", IDC_ABOUT + MENUITEM "Äo je ...", IDC_ABOUT END END @@ -39,44 +39,44 @@ END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "Èo je Správca zariadení" +CAPTION "Äo je SprÃ¡vca zariadenÃ" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Správca zariadení v0.1\nCopyright (C) 2006\nod Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 - PUSHBUTTON "Zavrie", IDOK, 75, 162, 44, 15 + LTEXT "SprÃ¡vca zariadenÃ v0.1\nCopyright (C) 2006\nod Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 + PUSHBUTTON "ZavrieÅ¥", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Tento program je voÄ¾nÃ½ softvÃ©r; mÃ´Å¾ete ho Å¡ÃriÅ¥ a/alebo modifikovaÅ¥ podÄ¾a podmienok GNU VÅ¡eobecnej verejnej licencie (GNU General Public License) ako bola zverejnenÃ¡ nadÃ¡ciou Free Software Foundation; buÄ verzie 2 tejto licencie, alebo (podÄ¾a VÃ¡Å¡ho uvÃ¡Å¾enia) niektorej neskorÅ¡ej verzie.\r\n\r\nTento program je distribuovanÃ½ v nÃ¡deji, Å¾e bude uÅ¾itoÄnÃ½, avÅ¡ak BEZ AKEJKOÄ½VEK ZÃRUKY; rovnako bez zÃ¡ruky PREDAJNOSTI alebo VHODNOSTI PRE URÄITÃ ÃÄEL. Pre viac detailov si pozrite GNU VÅ¡eobecnÃº verejnÃº licenciu (GNU General Public License).\r\n\r\nKÃ³piu VÅ¡eobecnej verejnej licencie GNU ste mali dostaÅ¥ spolu s tÃ½mto programom; ak nie, napÃÅ¡te si o Åu na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE BEGIN IDS_TOOLTIP_PROP "Vlastnosti" - IDS_TOOLTIP_REFRESH "Obnovi" - IDS_TOOLTIP_HELP "Pomocník" - IDS_TOOLTIP_EXIT "Skonèi" + IDS_TOOLTIP_REFRESH "ObnoviÅ¥" + IDS_TOOLTIP_HELP "PomocnÃk" + IDS_TOOLTIP_EXIT "SkonÄiÅ¥" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "Správca zariadení systému ReactOS" + IDS_APPNAME "SprÃ¡vca zariadenÃ systÃ©mu ReactOS" IDS_HINT_BLANK " " - IDS_HINT_EXIT " Skonèí program." - IDS_HINT_REFRESH " Obnoví zoznam sluieb." - IDS_HINT_PROP " Otvorí okno s vlastnosami pre aktuálny výber." - IDS_HINT_HELP " Zobrazí okno pomocníka." - IDS_HINT_ABOUT " Èo je Správca zariadení systému ReactOS." + IDS_HINT_EXIT " SkonÄÃ program." + IDS_HINT_REFRESH " ObnovÃ zoznam sluÅ¾ieb." + IDS_HINT_PROP " OtvorÃ okno s vlastnosÅ¥ami pre aktuÃ¡lny vÃ½ber." + IDS_HINT_HELP " ZobrazÃ okno pomocnÃka." + IDS_HINT_ABOUT " Äo je SprÃ¡vca zariadenÃ systÃ©mu ReactOS." - IDS_HINT_SYS_RESTORE " Obnoví okno na normálnu ve¾kos." + IDS_HINT_SYS_RESTORE " ObnovÃ okno na normÃ¡lnu veÄ¾kosÅ¥." IDS_HINT_SYS_MOVE " Premiestni okno." - IDS_HINT_SYS_SIZE " Zmení ve¾kos okna." - IDS_HINT_SYS_MINIMIZE " Zbalí okno na ikonu." - IDS_HINT_SYS_MAXIMIZE " Zväèí okno tak, aby zaplnilo celú obrazovku." - IDS_HINT_SYS_CLOSE " Zatvorí okno." + IDS_HINT_SYS_SIZE " ZmenÃ veÄ¾kosÅ¥ okna." + IDS_HINT_SYS_MINIMIZE " ZbalÃ okno na ikonu." + IDS_HINT_SYS_MAXIMIZE " ZvÃ¤ÄÅ¡Ã okno tak, aby zaplnilo celÃº obrazovku." + IDS_HINT_SYS_CLOSE " ZatvorÃ okno." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -12,7 +12,7 @@ BEGIN MENUITEM "A&vsluta", IDC_EXIT END - POPUP "Åtgärd" + POPUP "ÃtgÃ¤rd" BEGIN MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR @@ -25,7 +25,7 @@ MENUITEM "Resurcer efter typ", IDC_STATIC, GRAYED MENUITEM "Resurcer efter koppling", IDC_STATIC, GRAYED END - POPUP "Hjälp" + POPUP "HjÃ¤lp" BEGIN MENUITEM "Om", IDC_ABOUT END @@ -45,21 +45,21 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 - PUSHBUTTON "Stäng", IDOK, 75, 162, 44, 15 + PUSHBUTTON "StÃ¤ng", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Detta programmet är fri programvara; du kan distribuera det och/eller ändra det under villkoren enligt GNU General Public License som är utgivet av Free Software Foundation; version 2, eller (om du så önskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne användas, men DET FINNS INGA GARANTIER; även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se på GNU General Public Licensen för mer detaljer.\r\n\r\nDu skall ha motagit en kopia av GNU General Public Licensen tillsammans med detta programmet; om du inte har fått det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Detta programmet Ã¤r fri programvara; du kan distribuera det och/eller Ã¤ndra det under villkoren enligt GNU General Public License som Ã¤r utgivet av Free Software Foundation; version 2, eller (om du sÃ¥ Ã¶nskar) alla senare versioner.\r\n\r\nDette programmet er utgivet i hopp om att det skall kunne anvÃ¤ndas, men DET FINNS INGA GARANTIER; Ã¤ven utan underfÃ¶rstÃ¥dd garanti om SÃLJBARHET eller LÃMPLIGHET FÃR ETT VISST ÃNDAMÃL. Se pÃ¥ GNU General Public Licensen fÃ¶r mer detaljer.\r\n\r\nDu skall ha motagit en kopia av GNU General Public Licensen tillsammans med detta programmet; om du inte har fÃ¥tt det, skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END STRINGTABLE DISCARDABLE BEGIN IDS_TOOLTIP_PROP "Egenskaper" IDS_TOOLTIP_REFRESH "Uppdater" - IDS_TOOLTIP_HELP "Hjälp" + IDS_TOOLTIP_HELP "HjÃ¤lp" IDS_TOOLTIP_EXIT "Avsluta" END @@ -69,15 +69,15 @@ IDS_APPNAME "ReactOS Enhetshanterare" IDS_HINT_BLANK " " IDS_HINT_EXIT " Avsluta programmet." - IDS_HINT_REFRESH " Uppdatera tjänstelistan." - IDS_HINT_PROP " Öppna egenskaper för markerat val." - IDS_HINT_HELP " Visa hjälpfönstret." + IDS_HINT_REFRESH " Uppdatera tjÃ¤nstelistan." + IDS_HINT_PROP " Ãppna egenskaper fÃ¶r markerat val." + IDS_HINT_HELP " Visa hjÃ¤lpfÃ¶nstret." IDS_HINT_ABOUT " Om ReactOS Enhetshanterare." - IDS_HINT_SYS_RESTORE " Återställ detta fönstret till normal storlek." - IDS_HINT_SYS_MOVE " Flytta detta fönstret." - IDS_HINT_SYS_SIZE " Ändra storleken på detta fönstret." - IDS_HINT_SYS_MINIMIZE " Minimera detta fönstret till en ikon." - IDS_HINT_SYS_MAXIMIZE " Maximera dette fönstret så det fyller hela skärmen." - IDS_HINT_SYS_CLOSE " Stäng detta fönstret." + IDS_HINT_SYS_RESTORE " ÃterstÃ¤ll detta fÃ¶nstret till normal storlek." + IDS_HINT_SYS_MOVE " Flytta detta fÃ¶nstret." + IDS_HINT_SYS_SIZE " Ãndra storleken pÃ¥ detta fÃ¶nstret." + IDS_HINT_SYS_MINIMIZE " Minimera detta fÃ¶nstret till en ikon." + IDS_HINT_SYS_MAXIMIZE " Maximera dette fÃ¶nstret sÃ¥ det fyller hela skÃ¤rmen." + IDS_HINT_SYS_CLOSE " StÃ¤ng detta fÃ¶nstret." END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -11,39 +11,39 @@ IDR_MAINMENU MENU BEGIN - POPUP "á&¿éÁ" + POPUP "à¹&à¸à¹à¸¡" BEGIN - MENUITEM "&ÍÍ¡", IDC_EXIT + MENUITEM "&à¸à¸à¸", IDC_EXIT END - POPUP "àÃÔèÁ·Ó" + POPUP "à¹à¸£à¸´à¹à¸¡à¸à¸³" BEGIN - MENUITEM "¾ÔÁ¾ì", IDC_PRINT, GRAYED + MENUITEM "à¸à¸´à¸¡à¸à¹", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED + MENUITEM "à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´", IDC_PROP, GRAYED END - POPUP "ÁØÁÁÍ§" + POPUP "à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "ÍØ»¡Ã³ìáºè§µÒÁ»ÃÐàÀ·", IDC_DEVBYTYPE, CHECKED - MENUITEM "ÍØ»¡Ã³ìáºè§µÒÁ¡ÒÃàª×èÍÁµèÍ", IDC_STATIC, GRAYED - MENUITEM "áËÅè§¢éÍÁÙÅµÒÁ»ÃÐàÀ·", IDC_STATIC, GRAYED - MENUITEM "áËÅè§¢éÍÁÙÅµÒÁ¡ÒÃàª×èÍÁµèÍ", IDC_STATIC, GRAYED + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_DEVBYTYPE, CHECKED + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_STATIC, GRAYED + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED END - POPUP "ªèÇÂàËÅ×Í" + POPUP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" BEGIN - MENUITEM "à¡ÕèÂÇ¡Ñº", IDC_ABOUT + MENUITEM "à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸", IDC_ABOUT END END IDR_POPUP MENU BEGIN - POPUP "Ë¹éÒµèÒ§»Ñ¨¨ØºÑ¹" + POPUP "à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸" BEGIN - MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED + MENUITEM "à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´", IDC_PROP, GRAYED END END IDD_ABOUTBOX DIALOGEX 22,16,190,182 -CAPTION "à¡ÕèÂÇ¡Ñº¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì" +CAPTION "à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸à¸£à¸à¹" FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN @@ -60,27 +60,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TOOLTIP_PROP "¤Ø³ÊÁºÑµÔ" - IDS_TOOLTIP_REFRESH "¿×é¹¿Ù" - IDS_TOOLTIP_HELP "ªèÇÂàËÅ×Í" - IDS_TOOLTIP_EXIT "ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" + IDS_TOOLTIP_PROP "à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´" + IDS_TOOLTIP_REFRESH "à¸à¸·à¹à¸à¸à¸¹" + IDS_TOOLTIP_HELP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" + IDS_TOOLTIP_EXIT "à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" END /* Hints */ STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì¢Í§ ReactOS" + IDS_APPNAME "à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸à¸ ReactOS" IDS_HINT_BLANK " " - IDS_HINT_EXIT " ÍÍ¡¨Ò¡â»Ãá¡ÃÁ" - IDS_HINT_REFRESH " ¿×é¹¿ÙÃÒÂ¡ÒÃºÃÔ¡ÒÃ" - IDS_HINT_PROP " à»Ô´¤Ø³ÊÁºÑµÔ¢Í§á¼è¹§Ò¹µÒÁ¡ÒÃàÅ×Í¡ã¹»Ñ¨¨ØºÑ¹" - IDS_HINT_HELP " áÊ´§Ë¹éÒµèÒ§ªèÇÂàËÅ×Í" - IDS_HINT_ABOUT " à¡ÕèÂÇ¡Ñº¡ÒÃ¨Ñ´¡ÒÃÍØ»¡Ã³ì¢Í§ ReactOS" + IDS_HINT_EXIT " à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" + IDS_HINT_REFRESH " à¸à¸·à¹à¸à¸à¸¹à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸£à¸´à¸à¸²à¸£" + IDS_HINT_PROP " à¹à¸à¸´à¸à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´à¸à¸à¸à¹à¸à¹à¸à¸à¸²à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸¥à¸·à¸à¸à¹à¸à¸à¸±à¸à¸à¸¸à¸à¸±à¸" + IDS_HINT_HELP " à¹à¸ªà¸à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" + IDS_HINT_ABOUT " à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸à¸ ReactOS" - IDS_HINT_SYS_RESTORE " ¤×¹ÊÀÒ¾¢Í§Ë¹éÒµèÒ§¹ÕéÊÙè¢¹Ò´»¡µÔ" - IDS_HINT_SYS_MOVE " ÂéÒÂË¹éÒµèÒ§¹Õé" - IDS_HINT_SYS_SIZE " à»ÅÕèÂ¹¢¹Ò´Ë¹éÒµèÒ§¹Õé" - IDS_HINT_SYS_MINIMIZE " ÂèÍË¹éÒµèÒ§¹ÕéãËéà»ç¹ÊÑÃÙ»" - IDS_HINT_SYS_MAXIMIZE " ¢ÂÒÂË¹éÒµèÒ§¹Õé¨¹àµçÁË¹éÒ¨Í" - IDS_HINT_SYS_CLOSE " »Ô´Ë¹éÒµèÒ§¹Õé" + IDS_HINT_SYS_RESTORE " à¸à¸·à¸à¸ªà¸ à¸²à¸à¸à¸à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹à¸ªà¸¹à¹à¸à¸à¸²à¸à¸à¸à¸à¸´" + IDS_HINT_SYS_MOVE " à¸¢à¹à¸²à¸¢à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹" + IDS_HINT_SYS_SIZE " à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¸à¸²à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹" + IDS_HINT_SYS_MINIMIZE " à¸¢à¹à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹à¹à¸«à¹à¹à¸à¹à¸à¸ªà¸±à¸à¸£à¸¹à¸" + IDS_HINT_SYS_MAXIMIZE " à¸à¸¢à¸²à¸¢à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹à¸à¸à¹à¸à¹à¸¡à¸«à¸à¹à¸²à¸à¸" + IDS_HINT_SYS_CLOSE " à¸à¸´à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹" END Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc [iso-8859-1] Sat Jan 3 09:45:55 2015 @@ -12,7 +12,8 @@ IDB_HELP BITMAP DISCARDABLE "res/help.bmp" IDB_EXIT BITMAP DISCARDABLE "res/exit.bmp" -//#include "lang/en-US.rc" +// UTF-8 +#pragma code_page(65001) #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" @@ -32,6 +33,9 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif @@ -47,22 +51,6 @@ #ifdef LANGUAGE_NB_NO #include "lang/no-NO.rc" #endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SV_SE - #include "lang/sv-SE.rc" -#endif -#ifdef LANGUAGE_TH_TH - #include "lang/th-TH.rc" -#endif - -// UTF-8 -#pragma code_page(65001) - -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif @@ -75,6 +63,15 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif +#ifdef LANGUAGE_TH_TH + #include "lang/th-TH.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif

1 0

[akhaldi] 65952: [CMDUTILS] Convert resource files to UTF-8. By Alvin Wong (alvinhochun - gmail). Translators, please review! CORE-9021
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:35:09 2015 New Revision: 65952 URL: http://svn.reactos.org/svn/reactos?rev=65952&view=rev Log: [CMDUTILS] Convert resource files to UTF-8. By Alvin Wong (alvinhochun - gmail). Translators, please review! CORE-9021 Modified: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/lang/ru-RU.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Russian language file by Andrey Korotaev (unC0Rr(a)inbox.ru) and Aleksey Bragin (aleksey(a)reactos.com) * Copyright 2005 */ Modified: trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -2,7 +2,7 @@ STRINGTABLE BEGIN - IDS_USAGE "Wywietla obecn¹ nazwê komputera.\n\nhostname" + IDS_USAGE "WyÅwietla obecnÄ nazwÄ komputera.\n\nhostname" IDS_NOSET "Opcja hostname -s nie jest wspierana." - IDS_ERROR "B³¹d Win32" + IDS_ERROR "BÅÄd Win32" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -23,26 +23,26 @@ you can test your translation of these attributes by using 'whoami /groups' */ IDS_ATTR_GROUP_MANDATORY "Verbindliche Gruppe, " - IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Standardmäßig aktiviert, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "StandardmÃ¤Ãig aktiviert, " IDS_ATTR_GROUP_ENABLED "Aktivierte Gruppe, " IDS_ATTR_GROUP_OWNER "Gruppenbesitzer, " IDS_UNKNOWN_DESCRIPTION "???" IDS_STATE_ENABLED "Aktiviert" IDS_STATE_DISABLED "Deaktiviert" - IDS_ERROR_UPN "FEHLER: Der UPN (User Principal Name) konnte nicht abgerufen werden, da\nder aktuelle Benutzer kein Domänenbenutzer ist.\n" - IDS_ERROR_FQDN "FEHLER: Der FQDN (Fully Qualified Distinguished Name) konnte nicht\nabgerufen werden, da der aktuelle Benutzer kein Domänenbenutzer ist.\n" - IDS_ERROR_VALUEXPECTED "FEHLER: Ungültige Syntax. Wert für '/fo' erwartet.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungültig.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_1TIMES "FEHLER: Ungültige Syntax. Option ""%s"" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_INVALIDSYNTAX "FEHLER: Ungültige Syntax.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_UPN "FEHLER: Der UPN (User Principal Name) konnte nicht abgerufen werden, da\nder aktuelle Benutzer kein DomÃ¤nenbenutzer ist.\n" + IDS_ERROR_FQDN "FEHLER: Der FQDN (Fully Qualified Distinguished Name) konnte nicht\nabgerufen werden, da der aktuelle Benutzer kein DomÃ¤nenbenutzer ist.\n" + IDS_ERROR_VALUEXPECTED "FEHLER: UngÃ¼ltige Syntax. Wert fÃ¼r '/fo' erwartet.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungÃ¼ltig.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_1TIMES "FEHLER: UngÃ¼ltige Syntax. Option ""%s"" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDSYNTAX "FEHLER: UngÃ¼ltige Syntax.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungÃ¼ltig - '%s'.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" IDS_HELP "BESCHREIBUNG:\n\ - Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ - Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ + Ermittelt Benutzername, Gruppen und Berechtigungen fÃ¼r den aktuellen Benutzer auf dem lokalen System.\n\ + Ohne Parameterangabe werden die aktuelle DomÃ¤ne und Benutzername angezeigt.\n\ \n\ - Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ - '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ + GÃ¼ltige Ausgabeformate fÃ¼r den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ + '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. StandardmÃ¤Ãig werden diese in einer TABLE angezeigt.\n\ \n\ SYNTAX:\n\ whoami [/upn | /fqdn | /logonid] \n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Da.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -2,19 +2,19 @@ STRINGTABLE { - STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" - STRING_INVPARM, "Ugyldigt parameter «%1»; brug «xcopy /?» for hjelp\n" + STRING_INVPARMS, "Ugyldigt antal parametere; brug Â«xcopy /?Â» for hjelp\n" + STRING_INVPARM, "Ugyldigt parameter Â«%1Â»; brug Â«xcopy /?Â» for hjelp\n" STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" STRING_SIMCOPY, "%1!d! fil(er) vil blive kopieret\n" STRING_COPY, "%1!d! fil(er) kopieret\n" - STRING_QISDIR, "Er «%1» et filnavn eller katalog\n\ - på destinationen?\n\ + STRING_QISDIR, "Er Â«%1Â» et filnavn eller katalog\n\ + pÃ¥ destinationen?\n\ (F - Fil, K - Katalog)\n" STRING_SRCPROMPT, "%1? (Ja|Nei)\n" - STRING_OVERWRITE, "Overskrive «%1»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL, "Kunne ikke kopiere «%1» til «%2»; fejlet med r/c %3!d!\n" - STRING_OPENFAIL, "Kunne ikke åbne «%1»\n" - STRING_READFAIL, "Kunne ikke læse «%1»\n" + STRING_OVERWRITE, "Overskrive Â«%1Â»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Kunne ikke kopiere Â«%1Â» til Â«%2Â»; fejlet med r/c %3!d!\n" + STRING_OPENFAIL, "Kunne ikke Ã¥bne Â«%1Â»\n" + STRING_READFAIL, "Kunne ikke lÃ¦se Â«%1Â»\n" STRING_YES_CHAR, "J" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -22,10 +22,10 @@ STRING_DIR_CHAR, "K" STRING_HELP, -"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +"XCOPY - Kopierer filer eller katalogtre til en mÃ¥lplassering\n\ \n\ Syntaks:\n\ -XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +XCOPY kilde [mÃ¥l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ hvor:\n\ @@ -33,25 +33,25 @@ [/I] Antag at destinationen er et katalog hvis destinationen ikke\n\ \tfindes og 2 eller flere filer bliver kopieret\n\ [/S] Kopier kataloger og underkataloger\n\ -[/E] Kopier kataloger og underkataloger, også tomme kataloger\n\ -[/Q] Vær stille : vis ikke filnavne under kopiering\n\ -[/F] Fil hele kilde- og målnavn under kopiering\n\ -[/L] Simulér operationen; vis kun, gør intet\n\ -[/W] Spørg før koperingen starter\n\ +[/E] Kopier kataloger og underkataloger, ogsÃ¥ tomme kataloger\n\ +[/Q] VÃ¦r stille : vis ikke filnavne under kopiering\n\ +[/F] Fil hele kilde- og mÃ¥lnavn under kopiering\n\ +[/L] SimulÃ©r operationen; vis kun, gÃ¸r intet\n\ +[/W] SpÃ¸rg fÃ¸r koperingen starter\n\ [/T] Lav tom katalogstruktur; kopier ikke filer\n\ -[/Y] Spørg ikke om filer skal overskrives\n\ -[/-Y] Spørg før om filer skal overskrives\n\ -[/P] Spørg om hver enkelt fil der skal kopieres\n\ +[/Y] SpÃ¸rg ikke om filer skal overskrives\n\ +[/-Y] SpÃ¸rg fÃ¸r om filer skal overskrives\n\ +[/P] SpÃ¸rg om hver enkelt fil der skal kopieres\n\ [/N] Kopier som korte filnavn (8.3 tegn)\n\ -[/U] Kopier kun filer som allerede findes på destinationen\n\ +[/U] Kopier kun filer som allerede findes pÃ¥ destinationen\n\ [/R] Overskriv filer som er skrivebeskyttet\n\ [/H] Kopier skjulte filer og systemfiler\n\ -[/C] Fortsæt selv om det opstår fejl under kopieringen\n\ +[/C] FortsÃ¦t selv om det opstÃ¥r fejl under kopieringen\n\ [/A] Kopier ikke filer som er markeret som arkiv\n\ [/M] Kopier kun filer som er markeret som akriv; fjerner denne markering\n\ -[/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ +[/D | /D:m-d-Ã¥] Kopier kun nye filer eller dem som er Ã¦ndret efter\n\ \t\tden opgivne dato.\n\ \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ -\t\tdestinationen er ældre end kilden\n\n" +\t\tdestinationen er Ã¦ldre end kilden\n\n" } Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/No.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -2,19 +2,19 @@ STRINGTABLE { - STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" - STRING_INVPARM, "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n" - STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" + STRING_INVPARMS, "Ugyldig antall parametere; bruk Â«xcopy /?Â» for hjelp\n" + STRING_INVPARM, "Ugyldig parameter Â«%1Â»; bruk Â«xcopy /?Â» for hjelp\n" + STRING_PAUSE, "Trykk Enter for Ã¥ begynne Ã¥ kopiere\n" STRING_SIMCOPY, "%1!d! fil(er) ville blitt kopiert\n" STRING_COPY, "%1!d! fil(er) kopiert\n" - STRING_QISDIR, "Eer «%1» et filnevn eller katalog\n\ - i målet?\n\ + STRING_QISDIR, "Eer Â«%1Â» et filnevn eller katalog\n\ + i mÃ¥let?\n\ (F - Fil, K - Katalog)\n" STRING_SRCPROMPT,"%1? (Ja|Nei)\n" - STRING_OVERWRITE,"Skrive over «%1»? (Ja|Nei|Alle)\n" - STRING_COPYFAIL, "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n" - STRING_OPENFAIL, "Klarte ikke åpne «%1»\n" - STRING_READFAIL, "Klarte ikke lese «%1»\n" + STRING_OVERWRITE,"Skrive over Â«%1Â»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Klarte ikke kopiere Â«%1Â» til Â«%2Â»; feilet med r/c %3!d!\n" + STRING_OPENFAIL, "Klarte ikke Ã¥pne Â«%1Â»\n" + STRING_READFAIL, "Klarte ikke lese Â«%1Â»\n" STRING_YES_CHAR, "J" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "A" @@ -22,36 +22,36 @@ STRING_DIR_CHAR, "K" STRING_HELP, -"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +"XCOPY - Kopierer filer eller katalogtre til en mÃ¥lplassering\n\ \n\ Syntax:\n\ -XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +XCOPY kilde [mÃ¥l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ \n\ -[/I] Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\ +[/I] Anta at mÃ¥let er en katalog hvis mÃ¥let ikke finnes og 2 eller\n\ \tflere filer blir kopiert\n\ [/S] Kopier kataloger og underkataloger\n\ [/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\ [/Q] Stille modus: ikke vis filnavn under kopiering\n\ -[/F] Fil hele kilde- og målnavn under kopiering\n\ +[/F] Fil hele kilde- og mÃ¥lnavn under kopiering\n\ [/L] Simuler operasjonen; vis bare hva som ville blitt kopiert\n\ -[/W] Spør for koperingen starter\n\ +[/W] SpÃ¸r for koperingen starter\n\ [/T] Lag tom katalogstruktur; ikke kopier filer\n\ -[/Y] Ikke spør når filer skal overskrives\n\ -[/-Y] Spør før filer skal overskrives\n\ -[/P] Spør for hver kildefil som skal kopieres\n\ +[/Y] Ikke spÃ¸r nÃ¥r filer skal overskrives\n\ +[/-Y] SpÃ¸r fÃ¸r filer skal overskrives\n\ +[/P] SpÃ¸r for hver kildefil som skal kopieres\n\ [/N] Kopier som korte filnavn (8.3 tegn)\n\ -[/U] Bare kopier filer som allerede finnes i målet\n\ +[/U] Bare kopier filer som allerede finnes i mÃ¥let\n\ [/R] Skriv over filer som er skrivebeskyttet\n\ [/H] Kopier skjulte filer og systemfiler\n\ -[/C] Fortsett selv om det oppstår feil under kopieringen\n\ +[/C] Fortsett selv om det oppstÃ¥r feil under kopieringen\n\ [/A] Ikke kopier filer som er markert som arkiv\n\ [/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\ -[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ +[/D | /D:m-d-Ã¥] Kopier nye filer eller de som er endret etter\n\ \t\tden oppgitte datoen.\n\ \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ -\t\teldre i målet enn i kilden\n\n" +\t\teldre i mÃ¥let enn i kilden\n\n" } Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/lang/Pl.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -2,19 +2,19 @@ STRINGTABLE { - STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" - STRING_INVPARM, "Nieznany parameter '%1' - uruchom xcopy /? aby wywietliæ pomoc\n" - STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" - STRING_SIMCOPY, "%1!d! plik(ów) zosta³oby skopiowanych\n" - STRING_COPY, "%1!d! plik(ów) skopiowanych\n" - STRING_QISDIR, "Czy '%1' jest nazw¹ pliku czy katalogu\n\ + STRING_INVPARMS, "NiewÅaÅciwa liczba parametrÃ³w - uruchom xcopy /? aby wyÅwietliÄ pomoc\n" + STRING_INVPARM, "Nieznany parameter '%1' - uruchom xcopy /? aby wyÅwietliÄ pomoc\n" + STRING_PAUSE, "NaciÅnij <enter> aby rozpoczÄÄ kopiowanie\n" + STRING_SIMCOPY, "%1!d! plik(Ã³w) zostaÅoby skopiowanych\n" + STRING_COPY, "%1!d! plik(Ã³w) skopiowanych\n" + STRING_QISDIR, "Czy '%1' jest nazwÄ pliku czy katalogu\n\ docelowego?\n\ (P - plik, K - katalog)\n" STRING_SRCPROMPT,"%1? (Tak|Nie)\n" - STRING_OVERWRITE,"Zast¹piæ %1? (Tak|Nie|Wszystkie)\n" - STRING_COPYFAIL, "Kopiowanie '%1' do '%2' nie powiod³o siê - kod b³êdu %3!d!\n" - STRING_OPENFAIL, "Nie uda³o siê otworzyæ '%1'\n" - STRING_READFAIL, "B³¹d podczas czytania '%1'\n" + STRING_OVERWRITE,"ZastÄpiÄ %1? (Tak|Nie|Wszystkie)\n" + STRING_COPYFAIL, "Kopiowanie '%1' do '%2' nie powiodÅo siÄ - kod bÅÄdu %3!d!\n" + STRING_OPENFAIL, "Nie udaÅo siÄ otworzyÄ '%1'\n" + STRING_READFAIL, "BÅÄd podczas czytania '%1'\n" STRING_YES_CHAR, "T" STRING_NO_CHAR, "N" STRING_ALL_CHAR, "W" @@ -22,35 +22,35 @@ STRING_DIR_CHAR, "K" STRING_HELP, -"XCOPY - kopiuje pliki lub drzewa katalogów\n\ +"XCOPY - kopiuje pliki lub drzewa katalogÃ³w\n\ \n\ -Sk³adnia:\n\ -XCOPY ród³o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +SkÅadnia:\n\ +XCOPY ÅºrÃ³dÅo [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Gdzie:\n\ \n\ -[/I] Je¿eli ""cel"" nie istnieje i kopiowane s¹ co najmniej dwa pliki,\n\ -\tzak³ada, ¿e ""cel"" powien byæ katalogiem\n\ +[/I] JeÅ¼eli ""cel"" nie istnieje i kopiowane sÄ co najmniej dwa pliki,\n\ +\tzakÅada, Å¼e ""cel"" powien byÄ katalogiem\n\ [/S] Kopiuje katalogi i podkatalogi\n\ -[/E] Kopiuje katalogi i podkatalogi, ³¹cznie z pustymi\n\ -[/Q] Nie wypisuje nazw plików podczas kopiowania (tryb cichy)\n\ -[/F] Wypisuje pe³ne cie¿ki ród³owe i docelowe podczas kopiowania\n\ -[/L] Jedynie symuluje operacjê, pokazuj¹c pliki, które by³yby kopiowane\n\ -[/W] Prosi o potwierdzenie przed rozpoczêciem kopiowania\n\ -[/T] Tworzy puste katalogi, ale nie kopiuje plików\n\ -[/Y] Zastêpuje pliki bez proby o potwierdzenie\n\ -[/-Y] Zawsze prosi o potwierdzenie przed zast¹pieniem pliku\n\ -[/P] Prosi o potwierdzenie przed skopiowaniem ka¿dego pliku\n\ -[/N] Kopiuje u¿ywaj¹c krótkich nazw plików\n\ -[/U] Kopiuje tylko pliki, które ju¿ istniej¹ w miejscu docelowym\n\ -[/R] Zastêpuje pliki tylko do odczytu\n\ -[/H] Kopiuje równie¿ pliki ukryte i systemowe\n\ -[/C] Kontynuuje nawet je¿eli podczas kopiowania wyst¹pi³y b³êdy\n\ +[/E] Kopiuje katalogi i podkatalogi, ÅÄcznie z pustymi\n\ +[/Q] Nie wypisuje nazw plikÃ³w podczas kopiowania (tryb cichy)\n\ +[/F] Wypisuje peÅne ÅcieÅ¼ki ÅºrÃ³dÅowe i docelowe podczas kopiowania\n\ +[/L] Jedynie symuluje operacjÄ, pokazujÄc pliki, ktÃ³re byÅyby kopiowane\n\ +[/W] Prosi o potwierdzenie przed rozpoczÄciem kopiowania\n\ +[/T] Tworzy puste katalogi, ale nie kopiuje plikÃ³w\n\ +[/Y] ZastÄpuje pliki bez proÅby o potwierdzenie\n\ +[/-Y] Zawsze prosi o potwierdzenie przed zastÄpieniem pliku\n\ +[/P] Prosi o potwierdzenie przed skopiowaniem kaÅ¼dego pliku\n\ +[/N] Kopiuje uÅ¼ywajÄc krÃ³tkich nazw plikÃ³w\n\ +[/U] Kopiuje tylko pliki, ktÃ³re juÅ¼ istniejÄ w miejscu docelowym\n\ +[/R] ZastÄpuje pliki tylko do odczytu\n\ +[/H] Kopiuje rÃ³wnieÅ¼ pliki ukryte i systemowe\n\ +[/C] Kontynuuje nawet jeÅ¼eli podczas kopiowania wystÄpiÅy bÅÄdy\n\ [/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ [/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ -\t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\ -\t\tnowsze ni¿ w katalogu docelowym\n\n" +\t\tJeÅ¼eli nie podano Å¼adnej daty, to kopiowane sÄ pliki, ktÃ³re sÄ\n\ +\t\tnowsze niÅ¼ w katalogu docelowym\n\n" } Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Sat Jan 3 09:35:09 2015 @@ -25,27 +25,20 @@ #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe" #include <reactos/version.rc> +/* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_DA_DK #include "lang/Da.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/De.rc" #endif #ifdef LANGUAGE_EN_US #include "lang/En.rc" #endif -#ifdef LANGUAGE_NO_NO - #include "lang/No.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/Pl.rc" -#endif #ifdef LANGUAGE_ES_ES #include "lang/Es.rc" -#endif - -/* UTF-8 */ -#pragma code_page(65001) - -#ifdef LANGUAGE_DE_DE - #include "lang/De.rc" #endif #ifdef LANGUAGE_FR_FR #include "lang/Fr.rc" @@ -64,6 +57,12 @@ #endif #ifdef LANGUAGE_NL_NL #include "lang/Nl.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/No.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/Pl.rc" #endif #ifdef LANGUAGE_PT_PT #include "lang/Pt.rc"

1 0

[akhaldi] 65951: [OSK] Don't use a PCH for one source file.
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:16:23 2015 New Revision: 65951 URL: http://svn.reactos.org/svn/reactos?rev=65951&view=rev Log: [OSK] Don't use a PCH for one source file. Modified: trunk/reactos/base/applications/osk/CMakeLists.txt Modified: trunk/reactos/base/applications/osk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/CMak… ============================================================================== --- trunk/reactos/base/applications/osk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/CMakeLists.txt [iso-8859-1] Sat Jan 3 09:16:23 2015 @@ -1,10 +1,5 @@ -list(APPEND SOURCE - main.c - osk.h) - -add_executable(osk ${SOURCE} rsrc.rc) +add_executable(osk main.c rsrc.rc) set_module_type(osk win32gui UNICODE) add_importlibs(osk comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32) -add_pch(osk osk.h SOURCE) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 65950: [CMD] Fix duplicated ID in resources. GCC build of course doesn't warn/error about this but MSVC does. CORE-9020
by akhaldi＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: akhaldi Date: Sat Jan 3 09:10:47 2015 New Revision: 65950 URL: http://svn.reactos.org/svn/reactos?rev=65950&view=rev Log: [CMD] Fix duplicated ID in resources. GCC build of course doesn't warn/error about this but MSVC does. CORE-9020 Modified: trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sat Jan 3 09:10:47 2015 @@ -206,20 +206,20 @@ #define STRING_VERSION_RUNNING_ON 705 #define STRING_VERSION_RUNVER 706 -#define STRING_VOL_HELP1 706 -#define STRING_VOL_HELP2 707 -#define STRING_VOL_HELP3 708 -#define STRING_VOL_HELP4 709 - -#define STRING_WINDOW_HELP1 710 -#define STRING_WINDOW_HELP2 711 - -#define STRING_COPY_FILE 712 -#define STRING_DELETE_WIPE 713 -#define STRING_FOR_ERROR 714 -#define STRING_SCREEN_COL 715 -#define STRING_SCREEN_ROW 716 -#define STRING_TIMER_TIME 717 +#define STRING_VOL_HELP1 707 +#define STRING_VOL_HELP2 708 +#define STRING_VOL_HELP3 709 +#define STRING_VOL_HELP4 710 + +#define STRING_WINDOW_HELP1 711 +#define STRING_WINDOW_HELP2 712 + +#define STRING_COPY_FILE 713 +#define STRING_DELETE_WIPE 714 +#define STRING_FOR_ERROR 715 +#define STRING_SCREEN_COL 716 +#define STRING_SCREEN_ROW 717 +#define STRING_TIMER_TIME 718 #define STRING_INVALID_OPERAND 720 #define STRING_EXPECTED_CLOSE_PAREN 721

1 0

[cwittich] 65949: [GDI32_WINETEST] don't skip metafile tests anymore #ROSTESTS-4
by cwittich＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: cwittich Date: Sat Jan 3 08:42:02 2015 New Revision: 65949 URL: http://svn.reactos.org/svn/reactos?rev=65949&view=rev Log: [GDI32_WINETEST] don't skip metafile tests anymore #ROSTESTS-4 Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat Jan 3 08:42:02 2015 @@ -1734,12 +1734,6 @@ broken(emh1->nBytes - diff_9x == emh2->nBytes), "expected nBytes %u, got %u\n", emh1->nBytes, emh2->nBytes); ok(emh1->nRecords == emh2->nRecords, "expected nRecords %u, got %u\n", emh1->nRecords, emh2->nRecords); - - if(!winetest_interactive) - { - skip("skipping match_emf_record(), bug ROSTESTS-4\n"); - return 0; - } offset1 = emh1->nSize; offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */

1 0

[jimtabor] 65948: [Win32ss] - Use proper structure name for packed DDE.
by jimtabor＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: jimtabor Date: Sat Jan 3 06:22:31 2015 New Revision: 65948 URL: http://svn.reactos.org/svn/reactos?rev=65948&view=rev Log: [Win32ss] - Use proper structure name for packed DDE. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -3399,11 +3399,11 @@ /* BYTE Data[DataSize] */ } KMDDEEXECUTEDATA, *PKMDDEEXECUTEDATA; -typedef struct tagKMDDELPARAM +typedef struct tagDDEPACK { UINT_PTR uiLo; UINT_PTR uiHi; -} KMDDELPARAM, *PKMDDELPARAM; +} DDEPACK, *PDDEPACK; Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -122,7 +122,7 @@ static MSGMEMORY g_MsgMemory[] = { { WM_CREATE, MMS_SIZE_SPECIAL, MMS_FLAG_READWRITE }, - { WM_DDE_ACK, sizeof(KMDDELPARAM), MMS_FLAG_READ }, + { WM_DDE_ACK, sizeof(DDEPACK), MMS_FLAG_READ }, { WM_DDE_EXECUTE, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_GETMINMAXINFO, sizeof(MINMAXINFO), MMS_FLAG_READWRITE }, { WM_GETTEXT, MMS_SIZE_WPARAMWCHAR, MMS_FLAG_WRITE }, Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sat Jan 3 06:22:31 2015 @@ -359,8 +359,8 @@ { case WM_DDE_ACK: { - PKMDDELPARAM DdeLparam; - DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(KMDDELPARAM)); + PDDEPACK DdeLparam; + DdeLparam = HeapAlloc(GetProcessHeap(), 0, sizeof(DDEPACK)); if (!DdeLparam || !UnpackDDElParam( UMMsg->message, UMMsg->lParam, &DdeLparam->uiLo, &DdeLparam->uiHi)) return FALSE; @@ -490,7 +490,7 @@ case WM_DDE_ACK: { - PKMDDELPARAM DdeLparam = (PKMDDELPARAM) KMMsg->lParam; + PDDEPACK DdeLparam = (PDDEPACK) KMMsg->lParam; UMMsg->lParam = PackDDElParam(KMMsg->message, DdeLparam->uiLo, DdeLparam->uiHi); } break;

1 0

[jimtabor] 65947: [User32] - Move dde.c to ddemisc.c to keep the same name as the wine counter part. - Use dde.c for ReactOS based functions.
by jimtabor＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: jimtabor Date: Sat Jan 3 04:39:20 2015 New Revision: 65947 URL: http://svn.reactos.org/svn/reactos?rev=65947&view=rev Log: [User32] - Move dde.c to ddemisc.c to keep the same name as the wine counter part. - Use dde.c for ReactOS based functions. Added: trunk/reactos/win32ss/user/user32/misc/ddemisc.c - copied unchanged from r65933, trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/CMakeLists.txt [iso-8859-1] Sat Jan 3 04:39:20 2015 @@ -18,6 +18,7 @@ controls/static.c misc/dde.c misc/ddeclient.c + misc/ddemisc.c misc/ddeserver.c misc/desktop.c misc/display.c Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Sat Jan 3 04:39:20 2015 @@ -1,2517 +1,6 @@ -/* - * DDEML library - * - * Copyright 1997 Alexandre Julliard - * Copyright 1997 Len White - * Copyright 1999 Keith Matthews - * Copyright 2000 Corel - * Copyright 2001 Eric Pouech - * Copyright 2003, 2004, 2005 Dmitry Timoshkov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ #include <user32.h> -#include "dde_private.h" -#include "wine/unicode.h" -#include "wine/debug.h" +#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); -/* convert between ATOM and HSZ avoiding compiler warnings */ -#define ATOM2HSZ(atom) ((HSZ) (ULONG_PTR)(atom)) -#define HSZ2ATOM(hsz) ((ATOM) (ULONG_PTR)(hsz)) - -static WDML_INSTANCE* WDML_InstanceList = NULL; -static LONG WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */ -const WCHAR WDML_szEventClass[] = {'D','D','E','M','L','E','v','e','n','t',0}; - -/* protection for instance list */ -CRITICAL_SECTION WDML_CritSect; -CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &WDML_CritSect, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": WDML_CritSect") } -}; -CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/* ================================================================ - * - * Pure DDE (non DDEML) management - * - * ================================================================ */ - - -/***************************************************************** - * PackDDElParam (USER32.@) - * - * RETURNS - * the packed lParam - */ -LPARAM WINAPI PackDDElParam(UINT msg, UINT_PTR uiLo, UINT_PTR uiHi) -{ - HGLOBAL hMem; - UINT_PTR *params; - - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!(hMem = GlobalAlloc(GMEM_DDESHARE, sizeof(UINT_PTR) * 2))) - { - ERR("GlobalAlloc failed\n"); - return 0; - } - if (!(params = GlobalLock(hMem))) - { - ERR("GlobalLock failed (%p)\n", hMem); - return 0; - } - params[0] = uiLo; - params[1] = uiHi; - GlobalUnlock(hMem); - return (LPARAM)hMem; - - case WM_DDE_EXECUTE: - return uiHi; - - default: - return MAKELONG(uiLo, uiHi); - } -} - - -/***************************************************************** - * UnpackDDElParam (USER32.@) - * - * RETURNS - * success: nonzero - * failure: zero - */ -BOOL WINAPI UnpackDDElParam(UINT msg, LPARAM lParam, - PUINT_PTR uiLo, PUINT_PTR uiHi) -{ - UINT_PTR *params; - - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!lParam || !(params = GlobalLock((HGLOBAL)lParam))) - { - if (uiLo) *uiLo = 0; - if (uiHi) *uiHi = 0; - return FALSE; - } - if (uiLo) *uiLo = params[0]; - if (uiHi) *uiHi = params[1]; - GlobalUnlock( (HGLOBAL)lParam ); - return TRUE; - - case WM_DDE_EXECUTE: - if (uiLo) *uiLo = 0; - if (uiHi) *uiHi = lParam; - return TRUE; - - default: - if (uiLo) *uiLo = LOWORD(lParam); - if (uiHi) *uiHi = HIWORD(lParam); - return TRUE; - } -} - - -/***************************************************************** - * FreeDDElParam (USER32.@) - * - * RETURNS - * success: nonzero - * failure: zero - */ -BOOL WINAPI FreeDDElParam(UINT msg, LPARAM lParam) -{ - switch (msg) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - /* first check if it's a global handle */ - if (!GlobalHandle( (LPVOID)lParam )) return TRUE; - return !GlobalFree( (HGLOBAL)lParam ); - - default: - return TRUE; - } -} - - -/***************************************************************** - * ReuseDDElParam (USER32.@) - * - * RETURNS - * the packed lParam - */ -LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut, - UINT_PTR uiLo, UINT_PTR uiHi) -{ - UINT_PTR *params; - - switch (msgIn) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - switch(msgOut) - { - case WM_DDE_ACK: - case WM_DDE_ADVISE: - case WM_DDE_DATA: - case WM_DDE_POKE: - if (!lParam) return 0; - if (!(params = GlobalLock( (HGLOBAL)lParam ))) - { - ERR("GlobalLock failed\n"); - return 0; - } - params[0] = uiLo; - params[1] = uiHi; - TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); - GlobalUnlock( (HGLOBAL)lParam ); - return lParam; - - case WM_DDE_EXECUTE: - FreeDDElParam( msgIn, lParam ); - return uiHi; - - default: - FreeDDElParam( msgIn, lParam ); - return MAKELPARAM(uiLo, uiHi); - } - - default: - return PackDDElParam( msgOut, uiLo, uiHi ); - } -} - -/***************************************************************** - * ImpersonateDdeClientWindow (USER32.@) - * - * PARAMS - * hWndClient [I] handle to DDE client window - * hWndServer [I] handle to DDE server window - */ -BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer) -{ - FIXME("(%p %p): stub\n", hWndClient, hWndServer); - return FALSE; -} - -/***************************************************************** - * DdeSetQualityOfService (USER32.@) - */ - -BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, const SECURITY_QUALITY_OF_SERVICE *pqosNew, - PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); - return TRUE; -} - -/* ================================================================ - * - * WDML Error management - * - * ================================================================ */ - -/****************************************************************************** - * DdeGetLastError [USER32.@] Gets most recent error code - * - * PARAMS - * idInst [I] Instance identifier - * - * RETURNS - * Last error code - */ -UINT WINAPI DdeGetLastError(DWORD idInst) -{ - DWORD error_code; - WDML_INSTANCE* pInstance; - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - error_code = DMLERR_INVALIDPARAMETER; - } - else - { - error_code = pInstance->lastError; - pInstance->lastError = 0; - } - - return error_code; -} - -/****************************************************************** - * WDML_SetAllLastError - * - * - */ -static void WDML_SetAllLastError(DWORD lastError) -{ - DWORD threadID; - WDML_INSTANCE* pInstance; - threadID = GetCurrentThreadId(); - pInstance = WDML_InstanceList; - while (pInstance) - { - if (pInstance->threadID == threadID) - pInstance->lastError = lastError; - pInstance = pInstance->next; - } -} - -/* ================================================================ - * - * String management - * - * ================================================================ */ - - -/****************************************************************** - * WDML_FindNode - * - * - */ -static HSZNode* WDML_FindNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - if (pInstance == NULL) return NULL; - - for (pNode = pInstance->nodeList; pNode != NULL; pNode = pNode->next) - { - if (pNode->hsz == hsz) break; - } - if (!pNode) WARN("HSZ %p not found\n", hsz); - return pNode; -} - -/****************************************************************** - * WDML_MakeAtomFromHsz - * - * Creates a global atom from an existing HSZ - * Generally used before sending an HSZ as an atom to a remote app - */ -ATOM WDML_MakeAtomFromHsz(HSZ hsz) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (GetAtomNameW(HSZ2ATOM(hsz), nameBuffer, MAX_BUFFER_LEN)) - return GlobalAddAtomW(nameBuffer); - WARN("HSZ %p not found\n", hsz); - return 0; -} - -/****************************************************************** - * WDML_MakeHszFromAtom - * - * Creates a HSZ from an existing global atom - * Generally used while receiving a global atom and transforming it - * into an HSZ - */ -HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (!atom) return NULL; - - if (GlobalGetAtomNameW(atom, nameBuffer, MAX_BUFFER_LEN)) - { - TRACE("%x => %s\n", atom, debugstr_w(nameBuffer)); - return DdeCreateStringHandleW(pInstance->instanceID, nameBuffer, CP_WINUNICODE); - } - WARN("ATOM 0x%x not found\n", atom); - return 0; -} - -/****************************************************************** - * WDML_IncHSZ - * - * - */ -BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - pNode = WDML_FindNode(pInstance, hsz); - if (!pNode) return FALSE; - - pNode->refCount++; - return TRUE; -} - -/****************************************************************************** - * WDML_DecHSZ (INTERNAL) - * - * Decrease the ref count of an HSZ. If it reaches 0, the node is removed from the list - * of HSZ nodes - * Returns -1 is the HSZ isn't found, otherwise it's the current (after --) of the ref count - */ -BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pPrev = NULL; - HSZNode* pCurrent; - - for (pCurrent = pInstance->nodeList; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) - { - /* If we found the node we were looking for and its ref count is one, - * we can remove it - */ - if (pCurrent->hsz == hsz) - { - if (--pCurrent->refCount == 0) - { - if (pCurrent == pInstance->nodeList) - { - pInstance->nodeList = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - HeapFree(GetProcessHeap(), 0, pCurrent); - DeleteAtom(HSZ2ATOM(hsz)); - } - return TRUE; - } - } - WARN("HSZ %p not found\n", hsz); - - return FALSE; -} - -/****************************************************************************** - * WDML_FreeAllHSZ (INTERNAL) - * - * Frees up all the strings still allocated in the list and - * remove all the nodes from the list of HSZ nodes. - */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) -{ - /* Free any strings created in this instance. - */ - while (pInstance->nodeList != NULL) - { - DdeFreeStringHandle(pInstance->instanceID, pInstance->nodeList->hsz); - } -} - -/****************************************************************************** - * InsertHSZNode (INTERNAL) - * - * Insert a node to the head of the list. - */ -static void WDML_InsertHSZNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - if (hsz != 0) - { - HSZNode* pNew = NULL; - /* Create a new node for this HSZ. - */ - pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); - if (pNew != NULL) - { - pNew->hsz = hsz; - pNew->next = pInstance->nodeList; - pNew->refCount = 1; - pInstance->nodeList = pNew; - } - else - { - ERR("Primary HSZ Node allocation failed - out of memory\n"); - } - } -} - -/****************************************************************** - * WDML_QueryString - * - * - */ -static int WDML_QueryString(WDML_INSTANCE* pInstance, HSZ hsz, LPVOID ptr, DWORD cchMax, - int codepage) -{ - WCHAR pString[MAX_BUFFER_LEN]; - int ret; - /* If psz is null, we have to return only the length - * of the string. - */ - if (ptr == NULL) - { - ptr = pString; - cchMax = MAX_BUFFER_LEN; - } - - /* if there is no input windows returns a NULL string */ - if (hsz == NULL) - { - CHAR *t_ptr = ptr; - *t_ptr = '\0'; - return 1; - } - - switch (codepage) - { - case CP_WINANSI: - ret = GetAtomNameA(HSZ2ATOM(hsz), ptr, cchMax); - break; - case CP_WINUNICODE: - ret = GetAtomNameW(HSZ2ATOM(hsz), ptr, cchMax); - break; - default: - ERR("Unknown code page %d\n", codepage); - ret = 0; - } - return ret; -} - -/***************************************************************** - * DdeQueryStringA [USER32.@] - */ -DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINANSI; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); - return ret; -} - -/***************************************************************** - * DdeQueryStringW [USER32.@] - */ - -DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINUNICODE; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); - return ret; -} - -/****************************************************************** - * DML_CreateString - * - * - */ -static HSZ WDML_CreateString(WDML_INSTANCE* pInstance, LPCVOID ptr, int codepage) -{ - HSZ hsz; - - switch (codepage) - { - case CP_WINANSI: - hsz = ATOM2HSZ(AddAtomA(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_a(ptr), hsz); - break; - case CP_WINUNICODE: - hsz = ATOM2HSZ(AddAtomW(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_w(ptr), hsz); - break; - default: - ERR("Unknown code page %d\n", codepage); - return 0; - } - WDML_InsertHSZNode(pInstance, hsz); - return hsz; -} - -/***************************************************************** - * DdeCreateStringHandleA [USER32.@] - * - * See DdeCreateStringHandleW. - */ -HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) -{ - HSZ hsz = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINANSI; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - - -/****************************************************************************** - * DdeCreateStringHandleW [USER32.@] Creates handle to identify string - * - * PARAMS - * idInst [I] Instance identifier - * psz [I] Pointer to string - * codepage [I] Code page identifier - * RETURNS - * Success: String handle - * Failure: 0 - */ -HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) -{ - WDML_INSTANCE* pInstance; - HSZ hsz = 0; - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINUNICODE; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - -/***************************************************************** - * DdeFreeStringHandle (USER32.@) - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_DecHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeKeepStringHandle (USER32.@) - * - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_IncHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeCmpStringHandles (USER32.@) - * - * Compares the value of two string handles. This comparison is - * not case sensitive. - * - * PARAMS - * hsz1 [I] Handle to the first string - * hsz2 [I] Handle to the second string - * - * RETURNS - * -1 The value of hsz1 is zero or less than hsz2 - * 0 The values of hsz 1 and 2 are the same or both zero. - * 1 The value of hsz2 is zero of less than hsz1 - */ -INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) -{ - WCHAR psz1[MAX_BUFFER_LEN]; - WCHAR psz2[MAX_BUFFER_LEN]; - int ret = 0; - int ret1, ret2; - - ret1 = GetAtomNameW(HSZ2ATOM(hsz1), psz1, MAX_BUFFER_LEN); - ret2 = GetAtomNameW(HSZ2ATOM(hsz2), psz2, MAX_BUFFER_LEN); - - TRACE("(%p<%s> %p<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); - - /* Make sure we found both strings. */ - if (ret1 == 0 && ret2 == 0) - { - /* If both are not found, return both "zero strings". */ - ret = 0; - } - else if (ret1 == 0) - { - /* If hsz1 is a not found, return hsz1 is "zero string". */ - ret = -1; - } - else if (ret2 == 0) - { - /* If hsz2 is a not found, return hsz2 is "zero string". */ - ret = 1; - } - else - { - /* Compare the two strings we got (case insensitive). */ - ret = lstrcmpiW(psz1, psz2); - /* Since strcmp returns any number smaller than - * 0 when the first string is found to be less than - * the second one we must make sure we are returning - * the proper values. - */ - if (ret < 0) - { - ret = -1; - } - else if (ret > 0) - { - ret = 1; - } - } - - return ret; -} - -/* ================================================================ - * - * Instance management - * - * ================================================================ */ - -/****************************************************************************** - * IncrementInstanceId - * - * generic routine to increment the max instance Id and allocate a new application instance - */ -static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) -{ - DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); - - pInstance->instanceID = id; - TRACE("New instance id %d allocated\n", id); -} - -/****************************************************************** - * WDML_EventProc - * - * - */ -static LRESULT CALLBACK WDML_EventProc(HWND hwndEvent, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - WDML_INSTANCE* pInstance; - HSZ hsz1, hsz2; - - switch (uMsg) - { - case WM_WDML_REGISTER: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - /* try calling the Callback */ - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_REGISTRATIONS)) - { - hsz1 = WDML_MakeHszFromAtom(pInstance, wParam); - hsz2 = WDML_MakeHszFromAtom(pInstance, lParam); - WDML_InvokeCallback(pInstance, XTYP_REGISTER, 0, 0, hsz1, hsz2, 0, 0, 0); - WDML_DecHSZ(pInstance, hsz1); - WDML_DecHSZ(pInstance, hsz2); - } - break; - - case WM_WDML_UNREGISTER: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_UNREGISTRATIONS)) - { - hsz1 = WDML_MakeHszFromAtom(pInstance, wParam); - hsz2 = WDML_MakeHszFromAtom(pInstance, lParam); - WDML_InvokeCallback(pInstance, XTYP_UNREGISTER, 0, 0, hsz1, hsz2, 0, 0, 0); - WDML_DecHSZ(pInstance, hsz1); - WDML_DecHSZ(pInstance, hsz2); - } - break; - - case WM_WDML_CONNECT_CONFIRM: - pInstance = WDML_GetInstanceFromWnd(hwndEvent); - if (pInstance && !(pInstance->CBFflags & CBF_SKIP_CONNECT_CONFIRMS)) - { - WDML_CONV* pConv; - /* confirm connection... - * lookup for this conv handle - */ - HWND client = (HWND)wParam; - HWND server = (HWND)lParam; - for (pConv = pInstance->convs[WDML_SERVER_SIDE]; pConv != NULL; pConv = pConv->next) - { - if (pConv->hwndClient == client && pConv->hwndServer == server) - break; - } - if (pConv) - { - pConv->wStatus |= ST_ISLOCAL; - - WDML_InvokeCallback(pInstance, XTYP_CONNECT_CONFIRM, 0, (HCONV)pConv, - pConv->hszTopic, pConv->hszService, 0, 0, - (pConv->wStatus & ST_ISSELF) ? 1 : 0); - } - } - break; - default: - return DefWindowProcW(hwndEvent, uMsg, wParam, lParam); - } - return 0; -} - -/****************************************************************** - * WDML_Initialize - * - * - */ -UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode) -{ - WDML_INSTANCE* pInstance; - WDML_INSTANCE* reference_inst; - UINT ret; - WNDCLASSEXW wndclass; - - TRACE("(%p,%p,0x%x,%d,0x%x)\n", - pidInst, pfnCallback, afCmd, ulRes, bUnicode); - - if (ulRes) - { - ERR("Reserved value not zero? What does this mean?\n"); - /* trap this and no more until we know more */ - return DMLERR_INVALIDPARAMETER; - } - - /* grab enough heap for one control struct - not really necessary for re-initialise - * but allows us to use same validation routines */ - pInstance = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_INSTANCE)); - if (pInstance == NULL) - { - /* catastrophe !! warn user & abort */ - ERR("Instance create failed - out of memory\n"); - return DMLERR_SYS_ERROR; - } - pInstance->next = NULL; - pInstance->monitor = (afCmd | APPCLASS_MONITOR); - - /* messy bit, spec implies that 'Client Only' can be set in 2 different ways, catch 1 here */ - - pInstance->clientOnly = afCmd & APPCMD_CLIENTONLY; - pInstance->instanceID = *pidInst; /* May need to add calling proc Id */ - pInstance->threadID = GetCurrentThreadId(); - pInstance->callback = *pfnCallback; - pInstance->unicode = bUnicode; - pInstance->nodeList = NULL; /* node will be added later */ - pInstance->monitorFlags = afCmd & MF_MASK; - pInstance->wStatus = 0; - pInstance->lastError = DMLERR_NO_ERROR; - pInstance->servers = NULL; - pInstance->convs[0] = NULL; - pInstance->convs[1] = NULL; - pInstance->links[0] = NULL; - pInstance->links[1] = NULL; - - /* isolate CBF flags in one go, expect this will go the way of all attempts to be clever !! */ - - pInstance->CBFflags = afCmd^((afCmd&MF_MASK)|((afCmd&APPCMD_MASK)|(afCmd&APPCLASS_MASK))); - - if (!pInstance->clientOnly) - { - /* Check for other way of setting Client-only !! */ - pInstance->clientOnly = - (pInstance->CBFflags & CBF_FAIL_ALLSVRXACTIONS) == CBF_FAIL_ALLSVRXACTIONS; - } - - ERR("instance created - checking validity\n"); - - if (*pidInst == 0) - { - /* Initialisation of new Instance Identifier */ - ERR("new instance, callback %p flags %X\n",pfnCallback,afCmd); - - EnterCriticalSection(&WDML_CritSect); - - if (WDML_InstanceList == NULL) - { - /* can't be another instance in this case, assign to the base pointer */ - WDML_InstanceList = pInstance; - - /* since first must force filter of XTYP_CONNECT and XTYP_WILDCONNECT for - * present - * ------------------------------- NOTE NOTE NOTE -------------------------- - * - * the manual is not clear if this condition - * applies to the first call to DdeInitialize from an application, or the - * first call for a given callback !!! - */ - - pInstance->CBFflags = pInstance->CBFflags|APPCMD_FILTERINITS; - ERR("First application instance detected OK\n"); - /* allocate new instance ID */ - WDML_IncrementInstanceId(pInstance); - } - else - { - /* really need to chain the new one in to the latest here, but after checking conditions - * such as trying to start a conversation from an application trying to monitor */ - reference_inst = WDML_InstanceList; - ERR("Subsequent application instance - starting checks\n"); - while (reference_inst->next != NULL) - { - /* - * This set of tests will work if application uses same instance Id - * at application level once allocated - which is what manual implies - * should happen. If someone tries to be - * clever (lazy ?) it will fail to pick up that later calls are for - * the same application - should we trust them ? - */ - if (pInstance->instanceID == reference_inst->instanceID) - { - /* Check 1 - must be same Client-only state */ - - if (pInstance->clientOnly != reference_inst->clientOnly) - { - ERR("WDML_Initialize Mustbe Client-only\n"); - ret = DMLERR_DLL_USAGE; - goto theError; - } - - /* Check 2 - cannot use 'Monitor' with any non-monitor modes */ - - if (pInstance->monitor != reference_inst->monitor) - { - ERR("WDML_Initialize cannot use monitor w/any modes\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - - /* Check 3 - must supply different callback address */ - - if (pInstance->callback == reference_inst->callback) - { - ret = DMLERR_DLL_USAGE; - goto theError; - } - } - reference_inst = reference_inst->next; - } - /* All cleared, add to chain */ - - ERR("Application Instance checks finished\n"); - WDML_IncrementInstanceId(pInstance); - reference_inst->next = pInstance; - } - LeaveCriticalSection(&WDML_CritSect); - - *pidInst = pInstance->instanceID; - - /* for deadlock issues, windows must always be created when outside the critical section */ - wndclass.cbSize = sizeof(wndclass); - wndclass.style = 0; - wndclass.lpfnWndProc = WDML_EventProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof(ULONG_PTR); - wndclass.hInstance = 0; - wndclass.hIcon = 0; - wndclass.hCursor = 0; - wndclass.hbrBackground = 0; - wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = WDML_szEventClass; - wndclass.hIconSm = 0; - - RegisterClassExW(&wndclass); - - pInstance->hwndEvent = CreateWindowW(WDML_szEventClass, NULL, - WS_POPUP, 0, 0, 0, 0, - 0, 0, 0, 0); - - SetWindowLongPtrW(pInstance->hwndEvent, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); - - ERR("New application instance processing finished OK\n"); - } - else - { - /* Reinitialisation situation --- FIX */ - ERR("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); - - EnterCriticalSection(&WDML_CritSect); - - if (WDML_InstanceList == NULL) - { - ERR("WDML_Initialize No instance list\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - /* can't reinitialise if we have initialised nothing !! */ - reference_inst = WDML_InstanceList; - /* must first check if we have been given a valid instance to re-initialise !! how do we do that ? */ - /* - * MS allows initialisation without specifying a callback, should we allow addition of the - * callback by a later call to initialise ? - if so this lot will have to change - */ - while (reference_inst->next != NULL) - { - if (*pidInst == reference_inst->instanceID && pfnCallback == reference_inst->callback) - { - /* Check 1 - cannot change client-only mode if set via APPCMD_CLIENTONLY */ - - if (reference_inst->clientOnly) - { - if ((reference_inst->CBFflags & CBF_FAIL_ALLSVRXACTIONS) != CBF_FAIL_ALLSVRXACTIONS) - { - /* i.e. Was set to Client-only and through APPCMD_CLIENTONLY */ - - if (!(afCmd & APPCMD_CLIENTONLY)) - { - ERR("WDML_Initialize AppCmd Client-only 2\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - } - } - /* Check 2 - cannot change monitor modes */ - - if (pInstance->monitor != reference_inst->monitor) - { - ERR("WDML_Initialize cannot change monitor modes 2\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - - /* Check 3 - trying to set Client-only via APPCMD when not set so previously */ - - if ((afCmd&APPCMD_CLIENTONLY) && !reference_inst->clientOnly) - { - ERR("WDML_Initialize trying to set Client-only via APPCMD\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - break; - } - reference_inst = reference_inst->next; - } - if (reference_inst->next == NULL) - { - ERR("WDML_Initialize Nothing Next\n"); - ret = DMLERR_INVALIDPARAMETER; - goto theError; - } - /* All checked - change relevant flags */ - - reference_inst->CBFflags = pInstance->CBFflags; - reference_inst->clientOnly = pInstance->clientOnly; - reference_inst->monitorFlags = pInstance->monitorFlags; - - HeapFree(GetProcessHeap(), 0, pInstance); /* finished - release heap space used as work store */ - - LeaveCriticalSection(&WDML_CritSect); - } - - return DMLERR_NO_ERROR; - theError: - ERR("WDML_Initialize error %x\n",ret); - HeapFree(GetProcessHeap(), 0, pInstance); - LeaveCriticalSection(&WDML_CritSect); - return ret; -} - -/****************************************************************************** - * DdeInitializeA (USER32.@) - * - * See DdeInitializeW. - */ -UINT WINAPI DdeInitializeA(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes) -{ - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, FALSE); -} - -/****************************************************************************** - * DdeInitializeW [USER32.@] - * Registers an application with the DDEML - * - * PARAMS - * pidInst [I] Pointer to instance identifier - * pfnCallback [I] Pointer to callback function - * afCmd [I] Set of command and filter flags - * ulRes [I] Reserved - * - * RETURNS - * Success: DMLERR_NO_ERROR - * Failure: DMLERR_DLL_USAGE, DMLERR_INVALIDPARAMETER, DMLERR_SYS_ERROR - */ -UINT WINAPI DdeInitializeW(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes) -{ - return WDML_Initialize(pidInst, pfnCallback, afCmd, ulRes, TRUE); -} - -/***************************************************************** - * DdeUninitialize [USER32.@] Frees DDEML resources - * - * PARAMS - * idInst [I] Instance identifier - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ - -BOOL WINAPI DdeUninitialize(DWORD idInst) -{ - /* Stage one - check if we have a handle for this instance - */ - WDML_INSTANCE* pInstance; - WDML_CONV* pConv; - WDML_CONV* pConvNext; - - TRACE("(%d)\n", idInst); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - /* - * Needs something here to record NOT_INITIALIZED ready for DdeGetLastError - */ - return FALSE; - } - - /* first terminate all conversations client side - * this shall close existing links... - */ - for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv != NULL; pConv = pConvNext) - { - pConvNext = pConv->next; - DdeDisconnect((HCONV)pConv); - } - if (pInstance->convs[WDML_CLIENT_SIDE]) - FIXME("still pending conversations\n"); - - /* then unregister all known service names */ - DdeNameService(idInst, 0, 0, DNS_UNREGISTER); - - /* Free the nodes that were not freed by this instance - * and remove the nodes from the list of HSZ nodes. - */ - WDML_FreeAllHSZ(pInstance); - - DestroyWindow(pInstance->hwndEvent); - - /* OK now delete the instance handle itself */ - - if (WDML_InstanceList == pInstance) - { - /* special case - the first/only entry */ - WDML_InstanceList = pInstance->next; - } - else - { - /* general case, remove entry */ - WDML_INSTANCE* inst; - - for (inst = WDML_InstanceList; inst->next != pInstance; inst = inst->next); - inst->next = pInstance->next; - } - /* release the heap entry - */ - HeapFree(GetProcessHeap(), 0, pInstance); - - return TRUE; -} - -/****************************************************************** - * WDML_NotifyThreadExit - * - * - */ -void WDML_NotifyThreadDetach(void) -{ - WDML_INSTANCE* pInstance; - WDML_INSTANCE* next; - DWORD tid = GetCurrentThreadId(); - - EnterCriticalSection(&WDML_CritSect); - for (pInstance = WDML_InstanceList; pInstance != NULL; pInstance = next) - { - next = pInstance->next; - if (pInstance->threadID == tid) - { - LeaveCriticalSection(&WDML_CritSect); - DdeUninitialize(pInstance->instanceID); - EnterCriticalSection(&WDML_CritSect); - } - } - LeaveCriticalSection(&WDML_CritSect); -} - -/****************************************************************** - * WDML_InvokeCallback - * - * - */ -HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, HCONV hConv, - HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - ULONG_PTR dwData1, ULONG_PTR dwData2) -{ - HDDEDATA ret; - - if (pInstance == NULL) - return NULL; - - TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", - pInstance->callback, uType, uFmt, - hConv, hsz1, hsz2, hdata, dwData1, dwData2); - ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); - TRACE("done => %p\n", ret); - return ret; -} - -/***************************************************************************** - * WDML_GetInstance - * - * generic routine to return a pointer to the relevant DDE_HANDLE_ENTRY - * for an instance Id, or NULL if the entry does not exist - * - */ -WDML_INSTANCE* WDML_GetInstance(DWORD instId) -{ - WDML_INSTANCE* pInstance; - - EnterCriticalSection(&WDML_CritSect); - - for (pInstance = WDML_InstanceList; pInstance != NULL; pInstance = pInstance->next) - { - if (pInstance->instanceID == instId) - { - if (GetCurrentThreadId() != pInstance->threadID) - { - FIXME("Tried to get instance from wrong thread\n"); - continue; - } - break; - } - } - - LeaveCriticalSection(&WDML_CritSect); - - if (!pInstance) - WARN("Instance entry missing for id %04x\n", instId); - return pInstance; -} - -/****************************************************************** - * WDML_GetInstanceFromWnd - * - * - */ -WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd) -{ - return (WDML_INSTANCE*)GetWindowLongPtrW(hWnd, GWL_WDML_INSTANCE); -} - -/* ================================================================ - * - * Data handle management - * - * ================================================================ */ - -/***************************************************************** - * DdeCreateDataHandle (USER32.@) - */ -HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD cbOff, - HSZ hszItem, UINT wFmt, UINT afCmd) -{ - - /* Other than check for validity we will ignore for now idInst, hszItem. - * The purpose of these arguments still need to be investigated. - */ - - WDML_INSTANCE* pInstance; - HGLOBAL hMem; - LPBYTE pByte; - DDE_DATAHANDLE_HEAD* pDdh; - WCHAR psz[MAX_BUFFER_LEN]; - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - return NULL; - } - - if (!GetAtomNameW(HSZ2ATOM(hszItem), psz, MAX_BUFFER_LEN)) - { - psz[0] = HSZ2ATOM(hszItem); - psz[1] = 0; - } - - TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", - idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); - - if (afCmd != 0 && afCmd != HDATA_APPOWNED) - return 0; - - /* we use the first 4 bytes to store the size */ - if (!(hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cb + cbOff + sizeof(DDE_DATAHANDLE_HEAD)))) - { - ERR("GlobalAlloc failed\n"); - return 0; - } - - pDdh = GlobalLock(hMem); - if (!pDdh) - { - GlobalFree(hMem); - return 0; - } - - pDdh->cfFormat = wFmt; - pDdh->bAppOwned = (afCmd == HDATA_APPOWNED); - - pByte = (LPBYTE)(pDdh + 1); - if (pSrc) - { - memcpy(pByte, pSrc + cbOff, cb); - } - GlobalUnlock(hMem); - - TRACE("=> %p\n", hMem); - return hMem; -} - -/***************************************************************** - * - * DdeAddData (USER32.@) - */ -HDDEDATA WINAPI DdeAddData(HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff) -{ - DWORD old_sz, new_sz; - LPBYTE pDst; - - TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); - - pDst = DdeAccessData(hData, &old_sz); - if (!pDst) return 0; - - new_sz = cb + cbOff; - if (new_sz > old_sz) - { - DdeUnaccessData(hData); - hData = GlobalReAlloc(hData, new_sz + sizeof(DDE_DATAHANDLE_HEAD), - GMEM_MOVEABLE | GMEM_DDESHARE); - pDst = DdeAccessData(hData, &old_sz); - } - - if (!pDst) return 0; - - memcpy(pDst + cbOff, pSrc, cb); - DdeUnaccessData(hData); - return hData; -} - -/****************************************************************************** - * DdeGetData [USER32.@] Copies data from DDE object to local buffer - * - * - * PARAMS - * hData [I] Handle to DDE object - * pDst [I] Pointer to destination buffer - * cbMax [I] Amount of data to copy - * cbOff [I] Offset to beginning of data - * - * RETURNS - * Size of memory object associated with handle - */ -DWORD WINAPI DdeGetData(HDDEDATA hData, LPBYTE pDst, DWORD cbMax, DWORD cbOff) -{ - DWORD dwSize, dwRet; - LPBYTE pByte; - - TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); - - pByte = DdeAccessData(hData, &dwSize); - - if (pByte) - { - if (!pDst) - { - dwRet = dwSize; - } - else if (cbOff + cbMax < dwSize) - { - dwRet = cbMax; - } - else if (cbOff < dwSize) - { - dwRet = dwSize - cbOff; - } - else - { - dwRet = 0; - } - if (pDst && dwRet != 0) - { - memcpy(pDst, pByte + cbOff, dwRet); - } - DdeUnaccessData(hData); - } - else - { - dwRet = 0; - } - return dwRet; -} - -/***************************************************************** - * DdeAccessData (USER32.@) - */ -LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize) -{ - HGLOBAL hMem = hData; - DDE_DATAHANDLE_HEAD* pDdh; - - TRACE("(%p,%p)\n", hData, pcbDataSize); - - pDdh = GlobalLock(hMem); - if (pDdh == NULL) - { - ERR("Failed on GlobalLock(%p)\n", hMem); - return 0; - } - - if (pcbDataSize != NULL) - { - *pcbDataSize = GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD); - } - TRACE("=> %p (%lu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); - return (LPBYTE)(pDdh + 1); -} - -/***************************************************************** - * DdeUnaccessData (USER32.@) - */ -BOOL WINAPI DdeUnaccessData(HDDEDATA hData) -{ - HGLOBAL hMem = hData; - - TRACE("(%p)\n", hData); - - GlobalUnlock(hMem); - - return TRUE; -} - -/***************************************************************** - * DdeFreeDataHandle (USER32.@) - */ -BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) -{ - TRACE("(%p)\n", hData); - - /* 1 is the handle value returned by an asynchronous operation. */ - if (hData == (HDDEDATA)1) - return TRUE; - - return GlobalFree(hData) == 0; -} - -/****************************************************************** - * WDML_IsAppOwned - * - * - */ -BOOL WDML_IsAppOwned(HDDEDATA hData) -{ - DDE_DATAHANDLE_HEAD* pDdh; - BOOL ret = FALSE; - - pDdh = GlobalLock(hData); - if (pDdh != NULL) - { - ret = pDdh->bAppOwned; - GlobalUnlock(hData); - } - return ret; -} - -/* ================================================================ - * - * Global <=> Data handle management - * - * ================================================================ */ - -/* Note: we use a DDEDATA, but layout of DDEDATA, DDEADVISE and DDEPOKE structures is similar: - * offset size - * (bytes) (bits) comment - * 0 16 bit fields for options (release, ackreq, response...) - * 2 16 clipboard format - * 4 ? data to be used - */ -HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* p) -{ - DDEDATA* pDd; - HDDEDATA ret = 0; - DWORD size; - - if (hMem) - { - pDd = GlobalLock(hMem); - size = GlobalSize(hMem) - sizeof(WINE_DDEHEAD); - if (pDd) - { - if (p) memcpy(p, pDd, sizeof(WINE_DDEHEAD)); - switch (pDd->cfFormat) - { - default: - FIXME("Unsupported format (%04x) for data %p, passing raw information\n", - pDd->cfFormat, hMem); - /* fall through */ - case 0: - case CF_TEXT: - ret = DdeCreateDataHandle(pConv->instance->instanceID, pDd->Value, size, 0, 0, pDd->cfFormat, 0); - break; - case CF_BITMAP: - if (size >= sizeof(BITMAP)) - { - BITMAP* bmp = (BITMAP*)pDd->Value; - int count = bmp->bmWidthBytes * bmp->bmHeight * bmp->bmPlanes; - if (size >= sizeof(BITMAP) + count) - { - HBITMAP hbmp; - - if ((hbmp = CreateBitmap(bmp->bmWidth, bmp->bmHeight, - bmp->bmPlanes, bmp->bmBitsPixel, - pDd->Value + sizeof(BITMAP)))) - { - ret = DdeCreateDataHandle(pConv->instance->instanceID, (LPBYTE)&hbmp, sizeof(hbmp), - 0, 0, CF_BITMAP, 0); - } - else ERR("Can't create bmp\n"); - } - else - { - ERR("Wrong count: %u / %d\n", size, count); - } - } else ERR("No bitmap header\n"); - break; - } - GlobalUnlock(hMem); - } - } - return ret; -} - -/****************************************************************** - * WDML_DataHandle2Global - * - * - */ -HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, - BOOL fDeferUpd, BOOL fAckReq) -{ - DDE_DATAHANDLE_HEAD* pDdh; - DWORD dwSize; - HGLOBAL hMem = 0; - - dwSize = GlobalSize(hDdeData) - sizeof(DDE_DATAHANDLE_HEAD); - pDdh = GlobalLock(hDdeData); - if (dwSize && pDdh) - { - WINE_DDEHEAD* wdh = NULL; - - switch (pDdh->cfFormat) - { - default: - FIXME("Unsupported format (%04x) for data %p, passing raw information\n", - pDdh->cfFormat, hDdeData); - /* fall through */ - case 0: - case CF_TEXT: - hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(WINE_DDEHEAD) + dwSize); - if (hMem && (wdh = GlobalLock(hMem))) - { - memcpy(wdh + 1, pDdh + 1, dwSize); - } - break; - case CF_BITMAP: - if (dwSize >= sizeof(HBITMAP)) - { - BITMAP bmp; - DWORD count; - HBITMAP hbmp = *(HBITMAP*)(pDdh + 1); - - if (GetObjectW(hbmp, sizeof(bmp), &bmp)) - { - count = bmp.bmWidthBytes * bmp.bmHeight; - hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, - sizeof(WINE_DDEHEAD) + sizeof(bmp) + count); - if (hMem && (wdh = GlobalLock(hMem))) - { - memcpy(wdh + 1, &bmp, sizeof(bmp)); - GetBitmapBits(hbmp, count, ((char*)(wdh + 1)) + sizeof(bmp)); - } - } - } - break; - } - if (wdh) - { - wdh->unused = 0; - wdh->fResponse = fResponse; - wdh->fRelease = fRelease; - wdh->fDeferUpd = fDeferUpd; - wdh->fAckReq = fAckReq; - wdh->cfFormat = pDdh->cfFormat; - GlobalUnlock(hMem); - } - GlobalUnlock(hDdeData); - } - - return hMem; -} - -/* ================================================================ - * - * Server management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddServer - * - * - */ -WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - static const WCHAR fmtW[] = {'%','s','(','0','x','%','*','x',')',0}; - WDML_SERVER* pServer; - WCHAR buf1[256]; - WCHAR buf2[256]; - - pServer = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_SERVER)); - if (pServer == NULL) return NULL; - - pServer->hszService = hszService; - WDML_IncHSZ(pInstance, hszService); - - DdeQueryStringW(pInstance->instanceID, hszService, buf1, 256, CP_WINUNICODE); - snprintfW(buf2, 256, fmtW, buf1, 2*sizeof(ULONG_PTR), GetCurrentProcessId()); - pServer->hszServiceSpec = DdeCreateStringHandleW(pInstance->instanceID, buf2, CP_WINUNICODE); - - pServer->atomService = WDML_MakeAtomFromHsz(pServer->hszService); - pServer->atomServiceSpec = WDML_MakeAtomFromHsz(pServer->hszServiceSpec); - - pServer->filterOn = TRUE; - - pServer->next = pInstance->servers; - pInstance->servers = pServer; - return pServer; -} - -/****************************************************************** - * WDML_RemoveServer - * - * - */ -void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - WDML_SERVER* pPrev = NULL; - WDML_SERVER* pServer = NULL; - WDML_CONV* pConv; - WDML_CONV* pConvNext; - - pServer = pInstance->servers; - - while (pServer != NULL) - { - if (DdeCmpStringHandles(pServer->hszService, hszService) == 0) - { - WDML_BroadcastDDEWindows(WDML_szEventClass, WM_WDML_UNREGISTER, - pServer->atomService, pServer->atomServiceSpec); - /* terminate all conversations for given topic */ - for (pConv = pInstance->convs[WDML_SERVER_SIDE]; pConv != NULL; pConv = pConvNext) - { - pConvNext = pConv->next; - if (DdeCmpStringHandles(pConv->hszService, hszService) == 0) - { - HWND client = pConv->hwndClient, server = pConv->hwndServer; - WDML_RemoveConv(pConv, WDML_SERVER_SIDE); - /* don't care about return code (whether client window is present or not) */ - PostMessageW(client, WM_DDE_TERMINATE, (WPARAM)server, 0); - } - } - if (pServer == pInstance->servers) - { - pInstance->servers = pServer->next; - } - else - { - pPrev->next = pServer->next; - } - - DestroyWindow(pServer->hwndServer); - WDML_DecHSZ(pInstance, pServer->hszServiceSpec); - WDML_DecHSZ(pInstance, pServer->hszService); - - GlobalDeleteAtom(pServer->atomService); - GlobalDeleteAtom(pServer->atomServiceSpec); - - HeapFree(GetProcessHeap(), 0, pServer); - break; - } - - pPrev = pServer; - pServer = pServer->next; - } -} - -/***************************************************************************** - * WDML_FindServer - * - * generic routine to return a pointer to the relevant ServiceNode - * for a given service name, or NULL if the entry does not exist - * - */ -WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) -{ - WDML_SERVER* pServer; - - for (pServer = pInstance->servers; pServer != NULL; pServer = pServer->next) - { - if (hszService == pServer->hszService) - { - return pServer; - } - } - TRACE("Service name missing\n"); - return NULL; -} - -/* ================================================================ - * - * Link (hot & warm) management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddLink - * - * - */ -void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - UINT wType, HSZ hszItem, UINT wFmt) -{ - WDML_LINK* pLink; - - pLink = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_LINK)); - if (pLink == NULL) - { - ERR("OOM\n"); - return; - } - - pLink->hConv = hConv; - pLink->transactionType = wType; - WDML_IncHSZ(pInstance, pLink->hszItem = hszItem); - pLink->uFmt = wFmt; - pLink->next = pInstance->links[side]; - pInstance->links[side] = pLink; -} - -/****************************************************************** - * WDML_RemoveLink - * - * - */ -void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, UINT uFmt) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - pCurrent->uFmt == uFmt) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - HeapFree(GetProcessHeap(), 0, pCurrent); - break; - } - - pPrev = pCurrent; - pCurrent = pCurrent->next; - } -} - -/* this function is called to remove all links related to the conv. - It should be called from both client and server when terminating - the conversation. -*/ -/****************************************************************** - * WDML_RemoveAllLinks - * - * - */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - WDML_LINK* pNext = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == (HCONV)pConv) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - pNext = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - pNext = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - - HeapFree(GetProcessHeap(), 0, pCurrent); - pCurrent = NULL; - } - - if (pCurrent) - { - pPrev = pCurrent; - pCurrent = pCurrent->next; - } - else - { - pCurrent = pNext; - } - } -} - -/****************************************************************** - * WDML_FindLink - * - * - */ -WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, BOOL use_fmt, UINT uFmt) -{ - WDML_LINK* pCurrent = NULL; - - for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) - { - /* we don't need to check for transaction type as it can be altered */ - - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - (!use_fmt || pCurrent->uFmt == uFmt)) - { - break; - } - - } - - return pCurrent; -} - -/* ================================================================ - * - * Transaction management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AllocTransaction - * - * Alloc a transaction structure for handling the message ddeMsg - */ -WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, - UINT wFmt, HSZ hszItem) -{ - WDML_XACT* pXAct; - static WORD tid = 1; /* FIXME: wrap around */ - - pXAct = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_XACT)); - if (!pXAct) - { - pInstance->lastError = DMLERR_MEMORY_ERROR; - return NULL; - } - - pXAct->xActID = tid++; - pXAct->ddeMsg = ddeMsg; - pXAct->hDdeData = 0; - pXAct->hUser = 0; - pXAct->next = NULL; - pXAct->wType = 0; - pXAct->wFmt = wFmt; - if ((pXAct->hszItem = hszItem)) WDML_IncHSZ(pInstance, pXAct->hszItem); - pXAct->atom = 0; - pXAct->hMem = 0; - pXAct->lParam = 0; - - return pXAct; -} - -/****************************************************************** - * WDML_QueueTransaction - * - * Adds a transaction to the list of transaction - */ -void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - /* advance to last in queue */ - for (pt = &pConv->transactions; *pt != NULL; pt = &(*pt)->next); - *pt = pXAct; -} - -/****************************************************************** - * WDML_UnQueueTransaction - * - * - */ -BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - for (pt = &pConv->transactions; *pt; pt = &(*pt)->next) - { - if (*pt == pXAct) - { - *pt = pXAct->next; - return TRUE; - } - } - return FALSE; -} - -/****************************************************************** - * WDML_FreeTransaction - * - * - */ -void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) -{ - /* free pmt(s) in pXAct too. check against one for not deleting TRUE return values */ - if (doFreePmt && (ULONG_PTR)pXAct->hMem > 1) - { - GlobalFree(pXAct->hMem); - } - if (pXAct->hszItem) WDML_DecHSZ(pInstance, pXAct->hszItem); - - HeapFree(GetProcessHeap(), 0, pXAct); -} - -/****************************************************************** - * WDML_FindTransaction - * - * - */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) -{ - WDML_XACT* pXAct; - - tid = HIWORD(tid); - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { - if (pXAct->xActID == tid) - break; - } - return pXAct; -} - -/* ================================================================ - * - * Conversation management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddConv - * - * - */ -WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer) -{ - WDML_CONV* pConv; - - /* no conversation yet, add it */ - pConv = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_CONV)); - if (!pConv) return NULL; - - pConv->instance = pInstance; - WDML_IncHSZ(pInstance, pConv->hszService = hszService); - WDML_IncHSZ(pInstance, pConv->hszTopic = hszTopic); - pConv->magic = WDML_CONV_MAGIC; - pConv->hwndServer = hwndServer; - pConv->hwndClient = hwndClient; - pConv->transactions = NULL; - pConv->hUser = 0; - pConv->wStatus = (side == WDML_CLIENT_SIDE) ? ST_CLIENT : 0L; - pConv->wStatus |= pInstance->wStatus; - /* check if both side of the conversation are of the same instance */ - if (GetWindowThreadProcessId(hwndClient, NULL) == GetWindowThreadProcessId(hwndServer, NULL) && - WDML_GetInstanceFromWnd(hwndClient) == WDML_GetInstanceFromWnd(hwndServer)) - { - pConv->wStatus |= ST_ISSELF; - } - pConv->wConvst = XST_NULL; - - pConv->next = pInstance->convs[side]; - pInstance->convs[side] = pConv; - - TRACE("pConv->wStatus %04x pInstance(%p)\n", pConv->wStatus, pInstance); - - return pConv; -} - -/****************************************************************** - * WDML_FindConv - * - * - */ -WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic) -{ - WDML_CONV* pCurrent = NULL; - - for (pCurrent = pInstance->convs[side]; pCurrent != NULL; pCurrent = pCurrent->next) - { - if (DdeCmpStringHandles(pCurrent->hszService, hszService) == 0 && - DdeCmpStringHandles(pCurrent->hszTopic, hszTopic) == 0) - { - return pCurrent; - } - - } - return NULL; -} - -/****************************************************************** - * WDML_RemoveConv - * - * - */ -void WDML_RemoveConv(WDML_CONV* pRef, WDML_SIDE side) -{ - WDML_CONV* pPrev = NULL; - WDML_CONV* pCurrent; - WDML_XACT* pXAct; - WDML_XACT* pXActNext; - HWND hWnd; - - if (!pRef) - return; - - /* remove any pending transaction */ - for (pXAct = pRef->transactions; pXAct != NULL; pXAct = pXActNext) - { - pXActNext = pXAct->next; - WDML_FreeTransaction(pRef->instance, pXAct, TRUE); - } - - WDML_RemoveAllLinks(pRef->instance, pRef, side); - - /* FIXME: should we keep the window around ? it seems so (at least on client side - * to let QueryConvInfo work after conv termination, but also to implement - * DdeReconnect... - */ - /* destroy conversation window, but first remove pConv from hWnd. - * this would help the wndProc do appropriate handling upon a WM_DESTROY message - */ - hWnd = (side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer; - SetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION, 0); - - DestroyWindow((side == WDML_CLIENT_SIDE) ? pRef->hwndClient : pRef->hwndServer); - - WDML_DecHSZ(pRef->instance, pRef->hszService); - WDML_DecHSZ(pRef->instance, pRef->hszTopic); - - for (pCurrent = pRef->instance->convs[side]; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) - { - if (pCurrent == pRef) - { - if (pCurrent == pRef->instance->convs[side]) - { - pRef->instance->convs[side] = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - pCurrent->magic = 0; - HeapFree(GetProcessHeap(), 0, pCurrent); - break; - } - } -} - -/****************************************************************** - * WDML_EnableCallback - */ -static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) -{ - if (wCmd == EC_DISABLE) - { - pConv->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: conv %p status flags %04x\n", pConv, pConv->wStatus); - return TRUE; - } - - if (wCmd == EC_QUERYWAITING) - return pConv->transactions != NULL; - - if (wCmd != EC_ENABLEALL && wCmd != EC_ENABLEONE) - { - FIXME("Unknown command code %04x\n", wCmd); - return FALSE; - } - - if (wCmd == EC_ENABLEALL) - { - pConv->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: conv %p status flags %04x\n", pConv, pConv->wStatus); - } - - while (pConv->transactions) - { - WDML_XACT *pXAct = pConv->transactions; - - if (pConv->wStatus & ST_CLIENT) - { - /* transaction should be in the queue until handled */ - WDML_ClientHandle(pConv, pXAct, 0, NULL); - WDML_UnQueueTransaction(pConv, pXAct); - } - else - { - /* transaction should be removed from the queue before handling */ - WDML_UnQueueTransaction(pConv, pXAct); - WDML_ServerHandle(pConv, pXAct); - } - - WDML_FreeTransaction(pConv->instance, pXAct, TRUE); - - if (wCmd == EC_ENABLEONE) break; - } - return TRUE; -} - -/***************************************************************** - * DdeEnableCallback (USER32.@) - */ -BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) -{ - BOOL ret = FALSE; - WDML_CONV *pConv; - - TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); - - if (hConv) - { - pConv = WDML_GetConv(hConv, TRUE); - - if (pConv && pConv->instance->instanceID == idInst) - ret = WDML_EnableCallback(pConv, wCmd); - } - else - { - WDML_INSTANCE *pInstance = WDML_GetInstance(idInst); - - if (!pInstance) - return FALSE; - - TRACE("adding flags %04x to instance %p\n", wCmd, pInstance); - pInstance->wStatus |= wCmd; - - if (wCmd == EC_DISABLE) - { - pInstance->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: inst %p status flags %04x\n", pInstance, pInstance->wStatus); - } - else if (wCmd == EC_ENABLEALL) - { - pInstance->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: inst %p status flags %04x\n", pInstance, pInstance->wStatus); - } - - ret = TRUE; - - for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv != NULL; pConv = pConv->next) - { - ret = WDML_EnableCallback(pConv, wCmd); - if (ret && wCmd == EC_QUERYWAITING) break; - } - } - - return ret; -} - -/****************************************************************** - * WDML_GetConv - * - * - */ -WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected) -{ - WDML_CONV* pConv = (WDML_CONV*)hConv; - - /* FIXME: should do better checking */ - if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL; - - if (!pConv->instance) - { - WARN("wrong thread ID, no instance\n"); - return NULL; - } - - if (pConv->instance->threadID != GetCurrentThreadId()) - { - WARN("wrong thread ID\n"); - pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */ - return NULL; - } - - if (checkConnected && !(pConv->wStatus & ST_CONNECTED)) - { - WARN("found conv but ain't connected\n"); - pConv->instance->lastError = DMLERR_NO_CONV_ESTABLISHED; - return NULL; - } - - return pConv; -} - -/****************************************************************** - * WDML_GetConvFromWnd - * - * - */ -WDML_CONV* WDML_GetConvFromWnd(HWND hWnd) -{ - return (WDML_CONV*)GetWindowLongPtrW(hWnd, GWL_WDML_CONVERSATION); -} - -/****************************************************************** - * WDML_PostAck - * - * - */ -BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg) -{ - DDEACK ddeAck; - HWND from, to; - - if (side == WDML_SERVER_SIDE) - { - from = pConv->hwndServer; - to = pConv->hwndClient; - } - else - { - to = pConv->hwndServer; - from = pConv->hwndClient; - } - - ddeAck.bAppReturnCode = appRetCode; - ddeAck.reserved = 0; - ddeAck.fBusy = fBusy; - ddeAck.fAck = fAck; - - TRACE("Posting a %s ack\n", ddeAck.fAck ? "positive" : "negative"); - - lParam = (lParam) ? ReuseDDElParam(lParam, oldMsg, WM_DDE_ACK, *(WORD*)&ddeAck, pmt) : - PackDDElParam(WM_DDE_ACK, *(WORD*)&ddeAck, pmt); - if (!PostMessageW(to, WM_DDE_ACK, (WPARAM)from, lParam)) - { - pConv->wStatus &= ~ST_CONNECTED; - pConv->instance->lastError = DMLERR_POSTMSG_FAILED; - FreeDDElParam(WM_DDE_ACK, lParam); - return FALSE; - } - return TRUE; -} - -/***************************************************************** - * DdeSetUserHandle (USER32.@) - */ -BOOL WINAPI DdeSetUserHandle(HCONV hConv, DWORD id, DWORD hUser) -{ - WDML_CONV* pConv; - - pConv = WDML_GetConv(hConv, FALSE); - if (pConv == NULL) - return FALSE; - - if (id == QID_SYNC) - { - pConv->hUser = hUser; - } - else - { - WDML_XACT* pXAct; - - pXAct = WDML_FindTransaction(pConv, id); - if (pXAct) - { - pXAct->hUser = hUser; - } - else - { - pConv->instance->lastError = DMLERR_UNFOUND_QUEUE_ID; - return FALSE; - } - } - return TRUE; -} - -/****************************************************************** - * WDML_GetLocalConvInfo - * - * - */ -static BOOL WDML_GetLocalConvInfo(WDML_CONV* pConv, CONVINFO* ci, DWORD id) -{ - BOOL ret = TRUE; - WDML_LINK* pLink; - WDML_SIDE side; - - ci->hConvPartner = (pConv->wStatus & ST_ISLOCAL) ? (HCONV)((ULONG_PTR)pConv | 1) : 0; - ci->hszSvcPartner = pConv->hszService; - ci->hszServiceReq = pConv->hszService; /* FIXME: they shouldn't be the same, should they ? */ - ci->hszTopic = pConv->hszTopic; - ci->wStatus = pConv->wStatus; - - side = (pConv->wStatus & ST_CLIENT) ? WDML_CLIENT_SIDE : WDML_SERVER_SIDE; - - for (pLink = pConv->instance->links[side]; pLink != NULL; pLink = pLink->next) - { - if (pLink->hConv == (HCONV)pConv) - { - ci->wStatus |= ST_ADVISE; - break; - } - } - - /* FIXME: non handled status flags: - ST_BLOCKED - ST_BLOCKNEXT - ST_INLIST - */ - - ci->wConvst = pConv->wConvst; /* FIXME */ - - ci->wLastError = 0; /* FIXME: note it's not the instance last error */ - ci->hConvList = 0; - ci->ConvCtxt = pConv->convContext; - if (ci->wStatus & ST_CLIENT) - { - ci->hwnd = pConv->hwndClient; - ci->hwndPartner = pConv->hwndServer; - } - else - { - ci->hwnd = pConv->hwndServer; - ci->hwndPartner = pConv->hwndClient; - } - if (id == QID_SYNC) - { - ci->hUser = pConv->hUser; - ci->hszItem = 0; - ci->wFmt = 0; - ci->wType = 0; - } - else - { - WDML_XACT* pXAct; - - pXAct = WDML_FindTransaction(pConv, id); - if (pXAct) - { - ci->hUser = pXAct->hUser; - ci->hszItem = pXAct->hszItem; - ci->wFmt = pXAct->wFmt; - ci->wType = pXAct->wType; - } - else - { - ret = 0; - pConv->instance->lastError = DMLERR_UNFOUND_QUEUE_ID; - } - } - return ret; -} - -/****************************************************************** - * DdeQueryConvInfo (USER32.@) - * - * FIXME: Set last DDE error on failure. - */ -UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) -{ - UINT ret = lpConvInfo->cb; - CONVINFO ci; - WDML_CONV* pConv; - - TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); - - if (!hConv) - { - FIXME("hConv is NULL\n"); - return 0; - } - - pConv = WDML_GetConv(hConv, FALSE); - if (pConv != NULL) - { - if (!WDML_GetLocalConvInfo(pConv, &ci, id)) - ret = 0; - } - else - { - if ((ULONG_PTR)hConv & 1) - { - pConv = WDML_GetConv((HCONV)((ULONG_PTR)hConv & ~1), FALSE); - if (pConv != NULL) - FIXME("Request on remote conversation information is not implemented yet\n"); - } - ret = 0; - } - - if (ret != 0) - memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); - return ret; -} - -/* ================================================================ - * - * Information broadcast across DDEML implementations - * - * ================================================================ */ - -struct tagWDML_BroadcastPmt -{ - LPCWSTR clsName; - UINT uMsg; - WPARAM wParam; - LPARAM lParam; -}; - -/****************************************************************** - * WDML_BroadcastEnumProc - * - * - */ -static BOOL CALLBACK WDML_BroadcastEnumProc(HWND hWnd, LPARAM lParam) -{ - struct tagWDML_BroadcastPmt* s = (struct tagWDML_BroadcastPmt*)lParam; - WCHAR buffer[128]; - - if (GetClassNameW(hWnd, buffer, 128) > 0 && - lstrcmpiW(buffer, s->clsName) == 0) - { - PostMessageW(hWnd, s->uMsg, s->wParam, s->lParam); - } - return TRUE; -} - -/****************************************************************** - * WDML_BroadcastDDEWindows - * - * - */ -void WDML_BroadcastDDEWindows(LPCWSTR clsName, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - struct tagWDML_BroadcastPmt s; - - s.clsName = clsName; - s.uMsg = uMsg; - s.wParam = wParam; - s.lParam = lParam; - EnumWindows(WDML_BroadcastEnumProc, (LPARAM)&s); -}

1 0

[aandrejevic] 65946: [FAST486] Fix a bug in UnsignedDivMod128.
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: aandrejevic Date: Sat Jan 3 03:52:50 2015 New Revision: 65946 URL: http://svn.reactos.org/svn/reactos?rev=65946&view=rev Log: [FAST486] Fix a bug in UnsignedDivMod128. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 3 03:52:50 2015 @@ -84,12 +84,14 @@ /* Initialize the quotient */ *QuotientLow = *QuotientHigh = 0ULL; + /* Exit early if the dividend is lower than the divisor */ + if ((DividendHigh == 0ULL) && (DividendLow < Divisor)) return ValueLow; + /* Normalize the current divisor */ Bits = CountLeadingZeros64(CurrentHigh); CurrentHigh <<= Bits; - /* Loop while the value is higher than or equal to the original divisor */ - while ((ValueHigh > 0ULL) || (ValueLow >= Divisor)) + while (TRUE) { /* Shift the quotient left by one bit */ *QuotientHigh <<= 1; @@ -109,6 +111,9 @@ /* Set the lowest bit of the quotient */ *QuotientLow |= 1; + + /* Stop if the value is lower than the original divisor */ + if ((ValueHigh == 0ULL) && (ValueLow < Divisor)) break; } /* Shift the current divisor right by one bit */

1 0

[aandrejevic] 65945: [FAST486] Halfplement floating point division. Halfplement opcode 0xD9.
by aandrejevic＠svn.reactos.org 03 Jan '15

03 Jan '15

Author: aandrejevic Date: Sat Jan 3 03:26:31 2015 New Revision: 65945 URL: http://svn.reactos.org/svn/reactos?rev=65945&view=rev Log: [FAST486] Halfplement floating point division. Halfplement opcode 0xD9. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -1528,12 +1528,17 @@ } else { - /* Make it denormalized */ - Data->Mantissa <<= Data->Exponent - 1; - Data->Exponent = 1; - - /* Underflow */ - State->FpuStatus.Ue = TRUE; + if (State->FpuControl.Um) + { + /* Make it denormalized */ + Data->Mantissa <<= Data->Exponent - 1; + Data->Exponent = 1; + } + else + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + } } } @@ -1560,7 +1565,7 @@ FPU_ST(0) = *Data; FPU_SET_TAG(0, Fast486GetValueTag(Data)); } - else State->FpuStatus.Ie = TRUE; + else State->FpuStatus.Sf = TRUE; } FORCEINLINE @@ -1573,7 +1578,7 @@ FPU_SET_TAG(0, FPU_TAG_EMPTY); State->FpuStatus.Top++; } - else State->FpuStatus.Ie = TRUE; + else State->FpuStatus.Sf = TRUE; } #endif Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -66,6 +66,77 @@ return LowProduct; } +static ULONGLONG +UnsignedDivMod128(ULONGLONG DividendLow, + ULONGLONG DividendHigh, + ULONGLONG Divisor, + PULONGLONG QuotientLow, + PULONGLONG QuotientHigh) +{ + ULONGLONG ValueLow = DividendLow; + ULONGLONG ValueHigh = DividendHigh; + ULONGLONG CurrentLow = 0ULL; + ULONGLONG CurrentHigh = Divisor; + ULONG Bits; + + ASSERT(Divisor != 0ULL); + + /* Initialize the quotient */ + *QuotientLow = *QuotientHigh = 0ULL; + + /* Normalize the current divisor */ + Bits = CountLeadingZeros64(CurrentHigh); + CurrentHigh <<= Bits; + + /* Loop while the value is higher than or equal to the original divisor */ + while ((ValueHigh > 0ULL) || (ValueLow >= Divisor)) + { + /* Shift the quotient left by one bit */ + *QuotientHigh <<= 1; + *QuotientHigh |= *QuotientLow >> 63; + *QuotientLow <<= 1; + + /* Check if the value is higher than or equal to the current divisor */ + if ((ValueHigh > CurrentHigh) + || ((ValueHigh == CurrentHigh) && (ValueLow >= CurrentLow))) + { + BOOLEAN Carry = ValueLow < CurrentLow; + + /* Subtract the current divisor from the value */ + ValueHigh -= CurrentHigh; + ValueLow -= CurrentLow; + if (Carry) ValueHigh--; + + /* Set the lowest bit of the quotient */ + *QuotientLow |= 1; + } + + /* Shift the current divisor right by one bit */ + CurrentLow >>= 1; + CurrentLow |= (CurrentHigh & 1) << 63; + CurrentHigh >>= 1; + } + + /* + * Calculate the number of significant bits the current + * divisor has more than the original divisor + */ + Bits = CountLeadingZeros64(Divisor) + 64; + Bits -= (CurrentHigh > 0ULL) ? CountLeadingZeros64(CurrentHigh) : 64; + Bits -= (CurrentLow > 0ULL) ? CountLeadingZeros64(CurrentLow) : 64; + + if (Bits) + { + /* Shift the quotient left by that amount */ + *QuotientHigh <<= Bits; + *QuotientHigh |= *QuotientLow >> (64 - Bits); + *QuotientLow <<= Bits; + } + + /* Return the remainder */ + return ValueLow; +} + static inline VOID FASTCALL Fast486FpuFromInteger(PFAST486_STATE State, LONGLONG Value, @@ -557,8 +628,31 @@ PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; - - if (FPU_IS_ZERO(SecondOperand)) + ULONGLONG QuotientLow, QuotientHigh, Remainder; + LONG Exponent; + + if (FPU_IS_INDEFINITE(FirstOperand) + || FPU_IS_INDEFINITE(SecondOperand) + || (FPU_IS_INFINITY(FirstOperand) && FPU_IS_INFINITY(SecondOperand)) + || (FPU_IS_ZERO(FirstOperand) && FPU_IS_ZERO(SecondOperand))) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + Result->Sign = TRUE; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_INDEFINITE_MANTISSA; + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + + if (FPU_IS_ZERO(SecondOperand) || FPU_IS_INFINITY(FirstOperand)) { if (State->FpuControl.Zm) { @@ -571,16 +665,75 @@ { /* Raise the division by zero exception */ State->FpuStatus.Ze = TRUE; + } + + return; + } + + /* Calculate the sign of the result */ + TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; + + if (FPU_IS_ZERO(FirstOperand) || FPU_IS_INFINITY(SecondOperand)) + { + /* Return zero */ + Result->Sign = TempResult.Sign; + Result->Mantissa = 0ULL; + Result->Exponent = 0; + return; + } + + /* Calculate the exponent of the result */ + Exponent = (LONG)FirstOperand->Exponent - (LONG)SecondOperand->Exponent - 64; + + /* Divide the two mantissas */ + Remainder = UnsignedDivMod128(0ULL, + /* Notice the 64 above - this is the high part */ + FirstOperand->Mantissa, + SecondOperand->Mantissa, + &QuotientLow, + &QuotientHigh); + UNREFERENCED_PARAMETER(Remainder); // TODO: Rounding + + TempResult.Mantissa = QuotientLow; + + if (QuotientHigh > 0ULL) + { + ULONG BitsToShift = 64 - CountLeadingZeros64(QuotientHigh); + + if (!State->FpuControl.Pm) + { + /* Raise the precision expection */ + State->FpuStatus.Pe = TRUE; return; } - } - - TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; - TempResult.Sign = FirstOperand->Sign ^ SecondOperand->Sign; - - // TODO: NOT IMPLEMENTED - UNREFERENCED_PARAMETER(TempResult); - UNIMPLEMENTED; + + TempResult.Mantissa >>= BitsToShift; + TempResult.Mantissa |= QuotientHigh << (64 - BitsToShift); + Exponent += BitsToShift; + + // TODO: Rounding + } + + if (Exponent < -FPU_REAL10_BIAS) + { + TempResult.Mantissa >>= -(Exponent + FPU_REAL10_BIAS); + Exponent = -FPU_REAL10_BIAS; + + if ((TempResult.Mantissa == 0ULL) && !State->FpuControl.Um) + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + return; + } + + // TODO: Rounding + } + + TempResult.Exponent = (USHORT)(Exponent + FPU_REAL10_BIAS); + + /* Normalize the result */ + Fast486FpuNormalize(State, &TempResult); + *Result = TempResult; } static inline VOID FASTCALL @@ -853,10 +1006,86 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; -#else - /* Do nothing */ + + if (ModRegRm.Memory) + { + switch (ModRegRm.Register) + { + /* FLD */ + case 0: + { + ULONG Value; + FAST486_FPU_DATA_REG MemoryData; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromSingleReal(State, Value, &MemoryData); + Fast486FpuPush(State, &MemoryData); + + break; + } + + /* FST */ + case 2: + /* FSTP */ + case 3: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FLDENV */ + case 4: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FLDCW */ + case 5: + { + Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, &State->FpuControl.Value); + break; + } + + /* FSTENV */ + case 6: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSTCW */ + case 7: + { + Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuControl.Value); + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + } + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + } + #endif } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Sat Jan 3 03:26:31 2015 @@ -59,6 +59,7 @@ #define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && ((x)->Mantissa == FPU_MANTISSA_HIGH_BIT)) #define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) #define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) +#define FPU_IS_INDEFINITE(x) (FPU_IS_NAN(x) && !FPU_IS_INFINITY(x)) enum {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015