Ros-diffs May 2017

ros-diffs@reactos.org

17 participants
288 discussions

[tfaber] 74484: [MMSYS] - Make browse dialog title and filter localizable. Based on a patch by Katayama Hirofumi MZ. CORE-12903

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 6 09:27:32 2017 New Revision: 74484 URL: http://svn.reactos.org/svn/reactos?rev=74484&view=rev Log: [MMSYS] - Make browse dialog title and filter localizable. Based on a patch by Katayama Hirofumi MZ. CORE-12903 Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "ÐÑÐ¿ÑÐ¾Ñ" 5850 "ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" 5851 "ÐÑÑÐºÐ¾Ð² Ð¸Ð·Ð±Ð¾ÑÐ½Ð¸Ðº" - 5852 "ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ Ð¾Ñ Ð ÐµÐ°ÐºÑÐÐ¡" - 5853 "ÐÐ»Ð¸Ð·Ð°Ð½Ðµ Ð² Ð ÐµÐ°ÐºÑÐÐ¡" + IDS_REACTOS_LOGOFF "ÐÐ·Ð»Ð¸Ð·Ð°Ð½Ðµ Ð¾Ñ Ð ÐµÐ°ÐºÑÐÐ¡" + IDS_REACTOS_LOGON "ÐÐ»Ð¸Ð·Ð°Ð½Ðµ Ð² Ð ÐµÐ°ÐºÑÐÐ¡" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -266,7 +266,9 @@ 5849 "OtÃ¡zka" 5850 "SpuÅ¡tÄnÃ systÃ©mu ReactOS" 5851 "OtevÅenÃ nabÃdky Start" - 5852 "OdhlÃ¡Å¡enÃ od systÃ©mu ReactOS" - 5853 "PÅihlÃ¡Å¡enÃ k systÃ©mu ReactOS" + IDS_REACTOS_LOGOFF "OdhlÃ¡Å¡enÃ od systÃ©mu ReactOS" + IDS_REACTOS_LOGON "PÅihlÃ¡Å¡enÃ k systÃ©mu ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Frage" 5850 "ReactOS starten" 5851 "StartmenÃ¼" - 5852 "ReactOS-Abmeldung" - 5853 "ReactOS-Anmeldung" + IDS_REACTOS_LOGOFF "ReactOS-Abmeldung" + IDS_REACTOS_LOGON "ReactOS-Anmeldung" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "Start ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" + IDS_REACTOS_LOGOFF "ReactOS Logoff" + IDS_REACTOS_LOGON "ReactOS Logon" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "Start ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" + IDS_REACTOS_LOGOFF "ReactOS Logoff" + IDS_REACTOS_LOGON "ReactOS Logon" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Pregunta" 5850 "Iniciar ReactOS" 5851 "MenÃº Inicio" - 5852 "Cierre de sesiÃ³n de ReactOS" - 5853 "Inicio de sesiÃ³n en ReactOS" + IDS_REACTOS_LOGOFF "Cierre de sesiÃ³n de ReactOS" + IDS_REACTOS_LOGON "Inicio de sesiÃ³n en ReactOS" 5854 "Explorador de ReactOS" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "DÃ©marrer ReactOS" 5851 "Menu dÃ©marrer" - 5852 "DÃ©connexion ReactOS" - 5853 "Connexion ReactOS" + IDS_REACTOS_LOGOFF "DÃ©connexion ReactOS" + IDS_REACTOS_LOGON "Connexion ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/he-IL.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -263,7 +263,9 @@ 5849 "×©×××" 5850 "××ª×××ª ReactOS" 5851 "×ª×¤×¨×× ××ª××" - 5852 "ReactOS × ××ª××§" - 5853 "ReactOS ××ª×××¨××ª" + IDS_REACTOS_LOGOFF "ReactOS × ××ª××§" + IDS_REACTOS_LOGON "ReactOS ××ª×××¨××ª" 5854 "ReactOS ×¡×××¨" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "Start ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" + IDS_REACTOS_LOGOFF "ReactOS Logoff" + IDS_REACTOS_LOGON "ReactOS Logon" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Domanda" 5850 "Avvio ReactOS" 5851 "Menu avvio" - 5852 "Fine sessione di ReactOS" - 5853 "Inizio sessione di ReactOS" + IDS_REACTOS_LOGOFF "Fine sessione di ReactOS" + IDS_REACTOS_LOGON "Inizio sessione di ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ja-JP.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "è³ªå" 5850 "ReactOSã®éå§" 5851 "ã¡ãã¥ã¼ã®éå§" - 5852 "ReactOSãã°ãªã" - 5853 "ReactOSãã°ãªã³" + IDS_REACTOS_LOGOFF "ReactOSãã°ãªã" + IDS_REACTOS_LOGON "ReactOSãã°ãªã³" 5854 "ReactOSã¨ã¯ã¹ããã¼ã©ã¼" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "Start ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" + IDS_REACTOS_LOGOFF "ReactOS Logoff" + IDS_REACTOS_LOGON "ReactOS Logon" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "SpÃ¸rsmÃ¥l" 5850 "Start ReactOS" 5851 "Start Meny" - 5852 "ReactOS Logg av" - 5853 "ReactOS Logg pÃ¥" + IDS_REACTOS_LOGOFF "ReactOS Logg av" + IDS_REACTOS_LOGON "ReactOS Logg pÃ¥" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -274,7 +274,9 @@ 5849 "Znak zapytania" 5850 "Uruchomienie ReactOS" 5851 "Menu Start" - 5852 "Wylogowanie z ReactOS" - 5853 "Logowanie do ReactOS" + IDS_REACTOS_LOGOFF "Wylogowanie z ReactOS" + IDS_REACTOS_LOGON "Logowanie do ReactOS" 5854 "Eksplorator ReactOS" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "Question" 5850 "Start ReactOS" 5851 "Start Menu" - 5852 "ReactOS Logoff" - 5853 "ReactOS Logon" + IDS_REACTOS_LOGOFF "ReactOS Logoff" + IDS_REACTOS_LOGON "ReactOS Logon" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -266,7 +266,9 @@ 5849 "Ãntrebare" 5850 "Pornire ReactOS" 5851 "Meniul Pornire" - 5852 "IeÈire din ReactOS" - 5853 "Intrare Ã®n ReactOS" + IDS_REACTOS_LOGOFF "IeÈire din ReactOS" + IDS_REACTOS_LOGON "Intrare Ã®n ReactOS" 5854 "Explorator ReactOS" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -261,7 +261,9 @@ 5849 "ÐÐ¾Ð¿ÑÐ¾Ñ" 5850 "ÐÐ°Ð¿ÑÑÐº ReactOS" 5851 "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" - 5852 "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" - 5853 "ÐÑÐ¾Ð´ Ð² ReactOS" + IDS_REACTOS_LOGOFF "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" + IDS_REACTOS_LOGON "ÐÑÐ¾Ð´ Ð² ReactOS" 5854 "ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº ReactOS" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -266,7 +266,9 @@ 5849 "OtÃ¡zka" 5850 "Spustenie systÃ©mu ReactOS" 5851 "Ponuka Å tart" - 5852 "OdhlÃ¡senie zo systÃ©mu ReactOS" - 5853 "PrihlÃ¡senie do systÃ©mu ReactOS" + IDS_REACTOS_LOGOFF "OdhlÃ¡senie zo systÃ©mu ReactOS" + IDS_REACTOS_LOGON "PrihlÃ¡senie do systÃ©mu ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sq-AL.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -265,7 +265,9 @@ 5849 "Pyetje" 5850 "Fillo ReactOS" 5851 "Fillo Menune" - 5852 "Dil ReactOS" - 5853 "Hyr ReactOS" + IDS_REACTOS_LOGOFF "Dil ReactOS" + IDS_REACTOS_LOGON "Hyr ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -263,7 +263,9 @@ 5849 "Soru" 5850 "ReactOS'u BaÅlat" 5851 "BaÅlat SeÃ§kesi" - 5852 "Oturumu Kapat" - 5853 "Oturum AÃ§" + IDS_REACTOS_LOGOFF "Oturumu Kapat" + IDS_REACTOS_LOGON "Oturum AÃ§" 5854 "ReactOS Gezgini" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -269,7 +269,9 @@ 5849 "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð½Ñ" 5850 "ÐÐ°Ð¿ÑÑÐº ReactOS" 5851 "ÐÐ¾Ð»Ð¾Ð²Ð½Ðµ Ð¼ÐµÐ½Ñ" - 5852 "ÐÐ¸ÑÑÐ´ ÑÐ· ReactOS" - 5853 "ÐÑÑÐ´ Ð´Ð¾ ReactOS" + IDS_REACTOS_LOGOFF "ÐÐ¸ÑÑÐ´ ÑÐ· ReactOS" + IDS_REACTOS_LOGON "ÐÑÑÐ´ Ð´Ð¾ ReactOS" 5854 "ReactOS Explorer" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -268,7 +268,9 @@ 5849 "é®é¢" 5850 "å¯å¨ ReactOS" 5851 "ãå¼å§ãèå" - 5852 "ReactOS æ³¨é" - 5853 "ReactOS ç»å½" + IDS_REACTOS_LOGOFF "ReactOS æ³¨é" + IDS_REACTOS_LOGON "ReactOS ç»å½" 5854 "ReactOS æµè§å¨" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-TW.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-TW.rc [iso-8859-1] Sat May 6 09:27:32 2017 @@ -267,7 +267,9 @@ 5849 "åé¡" 5850 "åå ReactOS" 5851 "ãéå§ãé¸å®" - 5852 "ReactOS ç»åº" - 5853 "ReactOS ç»å¥" + IDS_REACTOS_LOGOFF "ReactOS ç»åº" + IDS_REACTOS_LOGON "ReactOS ç»å¥" 5854 "ReactOS çè¦½å¨" -END + IDS_BROWSE_FOR_SOUND "Search for new sounds" + IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|" +END Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Sat May 6 09:27:32 2017 @@ -69,6 +69,8 @@ #define IDS_REACTOS_LOGOFF 5852 #define IDS_REACTOS_LOGON 5853 #define IDS_REACTOS_DEFAULT_SCHEME 5856 +#define IDS_BROWSE_FOR_SOUND 6144 +#define IDS_WAVE_FILES_FILTER 6166 /* Strings */ #define IDS_CPLNAME 1000 Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat May 6 09:27:32 2017 @@ -56,6 +56,23 @@ TCHAR szDefault[MAX_PATH]; +/* A filter string is a list separated by NULL and ends with double NULLs. */ +LPWSTR MakeFilter(LPWSTR psz) +{ + WCHAR *pch; + + ASSERT(psz[0] != UNICODE_NULL && + psz[wcslen(psz) - 1] == L'|'); + for (pch = psz; *pch != UNICODE_NULL; pch++) + { + /* replace vertical bar with NULL */ + if (*pch == L'|') + { + *pch = UNICODE_NULL; + } + } + return psz; +} PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) { @@ -337,7 +354,7 @@ /* Associate the value with the item in the combobox */ SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pScheme); - /* Optionally, select the profile */ + /* Optionally, select the profile */ if (SetDefault) SendDlgItemMessage(hwndDlg, IDC_SOUND_SCHEME, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); @@ -922,6 +939,7 @@ { OPENFILENAMEW ofn; WCHAR filename[MAX_PATH]; + WCHAR szFilter[256], szTitle[256]; LPWSTR pFileName; LRESULT lResult; @@ -964,11 +982,12 @@ ofn.hwndOwner = hwndDlg; ofn.lpstrFile = filename; ofn.lpstrFile[0] = L'\0'; - ofn.nMaxFile = MAX_PATH; - ofn.lpstrFilter = L"Wave Files (*.wav)\0*.wav\0"; //FIXME non-nls + ofn.nMaxFile = _countof(filename); + LoadStringW(hApplet, IDS_WAVE_FILES_FILTER, szFilter, _countof(szFilter)); + ofn.lpstrFilter = MakeFilter(szFilter); ofn.nFilterIndex = 0; - ofn.lpstrFileTitle = L"Search for new sounds"; //FIXME non-nls - ofn.nMaxFileTitle = wcslen(ofn.lpstrFileTitle); + LoadStringW(hApplet, IDS_BROWSE_FOR_SOUND, szTitle, _countof(szTitle)); + ofn.lpstrTitle = szTitle; ofn.lpstrInitialDir = NULL; ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;

7 years, 7 months

[tfaber] 74483: [MMSYS] - Pass byte counts to RegQueryValueEx instead of character counts. Based on a patch by Katayama Hirofumi MZ. CORE-12903

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 6 08:43:56 2017 New Revision: 74483 URL: http://svn.reactos.org/svn/reactos?rev=74483&view=rev Log: [MMSYS] - Pass byte counts to RegQueryValueEx instead of character counts. Based on a patch by Katayama Hirofumi MZ. CORE-12903 Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat May 6 08:43:56 2017 @@ -178,8 +178,7 @@ LoadEventLabel(HKEY hKey, TCHAR * szSubKey) { HKEY hSubKey; - DWORD dwData; - DWORD dwDesc; + DWORD cbValue; TCHAR szDesc[MAX_PATH]; TCHAR szData[MAX_PATH]; PLABEL_MAP pMap; @@ -193,25 +192,25 @@ return FALSE; } - dwDesc = sizeof(szDesc) / sizeof(TCHAR); + cbValue = sizeof(szDesc); if (RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)szDesc, - &dwDesc) != ERROR_SUCCESS) + &cbValue) != ERROR_SUCCESS) { RegCloseKey(hSubKey); return FALSE; } - dwData = sizeof(szDesc) / sizeof(TCHAR); + cbValue = sizeof(szData); if (RegQueryValueEx(hSubKey, _T("DispFileName"), NULL, NULL, (LPBYTE)szData, - &dwData) != ERROR_SUCCESS) + &cbValue) != ERROR_SUCCESS) { RegCloseKey(hSubKey); return FALSE; @@ -293,7 +292,7 @@ { HKEY hSubKey; TCHAR szValue[MAX_PATH]; - DWORD dwValue, dwResult; + DWORD cbValue, dwResult; LRESULT lResult; PSOUND_SCHEME_CONTEXT pScheme; @@ -306,13 +305,13 @@ return FALSE; } - dwValue = sizeof(szValue) / sizeof(TCHAR); + cbValue = sizeof(szValue); dwResult = RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)szValue, - &dwValue); + &cbValue); RegCloseKey(hSubKey); if (dwResult != ERROR_SUCCESS) @@ -351,15 +350,16 @@ { HKEY hSubKey; DWORD dwName, dwCurKey, dwResult, dwNumSchemes; + DWORD cbDefault; TCHAR szName[MAX_PATH]; - dwName = sizeof(szDefault) / sizeof(TCHAR); + cbDefault = sizeof(szDefault); if (RegQueryValueEx(hKey, NULL, NULL, NULL, (LPBYTE)szDefault, - &dwName) != ERROR_SUCCESS) + &cbDefault) != ERROR_SUCCESS) { return FALSE; } @@ -440,7 +440,7 @@ HKEY hSubKey; TCHAR szValue[MAX_PATH]; TCHAR szBuffer[MAX_PATH]; - DWORD dwValue; + DWORD cbValue, cchLength; PSOUND_SCHEME_CONTEXT pScheme; PLABEL_CONTEXT pLabelContext; BOOL bCurrentProfile, bActiveProfile; @@ -459,13 +459,13 @@ return FALSE; } - dwValue = sizeof(szValue) / sizeof(TCHAR); + cbValue = sizeof(szValue); if (RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)szValue, - &dwValue) != ERROR_SUCCESS) + &cbValue) != ERROR_SUCCESS) { return FALSE; } @@ -482,8 +482,8 @@ } pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName); - dwValue = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer)); - if (dwValue == 0 || dwValue > _countof(szBuffer)) + cchLength = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer)); + if (cchLength == 0 || cchLength > _countof(szBuffer)) { /* fixme */ return FALSE; @@ -562,7 +562,7 @@ { HKEY hSubKey; TCHAR szDefault[MAX_PATH]; - DWORD dwDefault; + DWORD cbValue; DWORD dwCurKey; DWORD dwResult; DWORD dwNumEntry; @@ -587,26 +587,26 @@ return 0; } - dwDefault = sizeof(szDefault) / sizeof(TCHAR); + cbValue = sizeof(szDefault); if (RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)szDefault, - &dwDefault) != ERROR_SUCCESS) + &cbValue) != ERROR_SUCCESS) { RegCloseKey(hSubKey); HeapFree(GetProcessHeap(), 0, AppMap); return 0; } - dwDefault = sizeof(szIcon) / sizeof(TCHAR); + cbValue = sizeof(szIcon); if (RegQueryValueEx(hSubKey, _T("DispFileName"), NULL, NULL, (LPBYTE)szIcon, - &dwDefault) != ERROR_SUCCESS) + &cbValue) != ERROR_SUCCESS) { szIcon[0] = _T('\0'); }

7 years, 7 months

[tfaber] 74482: [MMSYS] Patch by Katayama Hirofumi MZ: - Use _countof where appropriate - Prefer sizeof(variable) to sizeof(TYPE) CORE-12903

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat May 6 08:22:50 2017 New Revision: 74482 URL: http://svn.reactos.org/svn/reactos?rev=74482&view=rev Log: [MMSYS] Patch by Katayama Hirofumi MZ: - Use _countof where appropriate - Prefer sizeof(variable) to sizeof(TYPE) CORE-12903 Modified: trunk/reactos/dll/cpl/mmsys/audio.c trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Sat May 6 08:22:50 2017 @@ -22,7 +22,7 @@ HWND hCB; LRESULT Res; - LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, sizeof(szNoDevices) / sizeof(TCHAR)); + LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); // Init sound playback devices list hCB = GetDlgItem(hwnd, IDC_DEVICE_PLAY_LIST); Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sat May 6 08:22:50 2017 @@ -703,10 +703,7 @@ UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(uMsg); - LoadString(hApplet, - IDS_CPLNAME, - Caption, - sizeof(Caption) / sizeof(TCHAR)); + LoadString(hApplet, IDS_CPLNAME, Caption, _countof(Caption)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat May 6 08:22:50 2017 @@ -262,7 +262,7 @@ dwCount = 0; do { - dwName = sizeof(szName) / sizeof(szName[0]); + dwName = _countof(szName); dwResult = RegEnumKeyEx(hSubKey, dwCurKey, szName, @@ -379,7 +379,7 @@ dwCurKey = 0; do { - dwName = sizeof(szName) / sizeof(szName[0]); + dwName = _countof(szName); dwResult = RegEnumKeyEx(hSubKey, dwCurKey, szName, @@ -482,8 +482,8 @@ } pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName); - dwValue = ExpandEnvironmentStrings(szValue, szBuffer, sizeof(szBuffer) / sizeof(TCHAR)); - if (dwValue == 0 || dwValue > (sizeof(szBuffer) / sizeof(TCHAR))) + dwValue = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer)); + if (dwValue == 0 || dwValue > _countof(szBuffer)) { /* fixme */ return FALSE; @@ -530,7 +530,7 @@ dwCurKey = 0; do { - dwProfile = sizeof(szProfile) / sizeof(TCHAR); + dwProfile = _countof(szProfile); dwResult = RegEnumKeyEx(hSubKey, dwCurKey, szProfile, @@ -624,7 +624,7 @@ dwNumEntry = 0; do { - dwName = sizeof(szName) / sizeof(TCHAR); + dwName = _countof(szName); dwResult = RegEnumKeyEx(hSubKey, dwCurKey, szName, @@ -673,7 +673,7 @@ dwResult = RegEnumKey(hSubKey, dwCurKey, szName, - sizeof(szName) / sizeof(TCHAR)); + _countof(szName)); if (dwResult == ERROR_SUCCESS) { @@ -731,9 +731,9 @@ UINT length; /* Add no sound listview item */ - if (LoadString(hApplet, IDS_NO_SOUND, szPath, MAX_PATH)) - { - szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + if (LoadString(hApplet, IDS_NO_SOUND, szPath, _countof(szPath))) + { + szPath[_countof(szPath)-1] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szPath); } @@ -815,7 +815,7 @@ /* add column for app */ GetClientRect(hList, &rect); - ZeroMemory(&dummy, sizeof(LV_COLUMN)); + ZeroMemory(&dummy, sizeof(dummy)); dummy.mask = LVCF_WIDTH; dummy.iSubItem = 0; dummy.cx = rect.right - rect.left - GetSystemMetrics(SM_CXVSCROLL); @@ -828,7 +828,7 @@ PLABEL_MAP pLabelMap = pAppMap->LabelMap; while (pLabelMap) { - ZeroMemory(&listItem, sizeof(LV_ITEM)); + ZeroMemory(&listItem, sizeof(listItem)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; listItem.pszText = pLabelMap->szDesc; listItem.lParam = (LPARAM)FindLabelContext(pScheme, pAppMap->szName, pLabelMap->szName); @@ -959,8 +959,8 @@ { case IDC_BROWSE_SOUND: { - ZeroMemory(&ofn, sizeof(OPENFILENAMEW)); - ofn.lStructSize = sizeof(OPENFILENAMEW); + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hwndDlg; ofn.lpstrFile = filename; ofn.lpstrFile[0] = L'\0'; @@ -974,7 +974,7 @@ if (GetOpenFileNameW(&ofn) == TRUE) { - // FIXME search if list already contains that sound + // FIXME search if list already contains that sound // extract file name pFileName = wcsrchr(filename, L'\\'); @@ -1040,7 +1040,7 @@ { break; } - ZeroMemory(&item, sizeof(LVITEM)); + ZeroMemory(&item, sizeof(item)); item.mask = LVIF_PARAM; item.iItem = SelCount; if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) @@ -1104,7 +1104,7 @@ { return FALSE; } - ZeroMemory(&item, sizeof(LVITEM)); + ZeroMemory(&item, sizeof(item)); item.mask = LVIF_PARAM; item.iItem = nm->iItem;

7 years, 7 months

[tfaber] 74481: [COMCTL32] - Fix heap memory leak in BUTTON_DrawTextCallback CORE-13190

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri May 5 19:23:04 2017 New Revision: 74481 URL: http://svn.reactos.org/svn/reactos?rev=74481&view=rev Log: [COMCTL32] - Fix heap memory leak in BUTTON_DrawTextCallback CORE-13190 Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Fri May 5 19:23:04 2017 @@ -1269,6 +1269,7 @@ } DrawTextW(hdc, text, -1, &rc, (UINT)wp); + HeapFree(GetProcessHeap(), 0, text); return TRUE; #endif }

7 years, 7 months

[gadamopoulos] 74480: [COMCTL32] Toolbar: Use DrawThemeText when themes are enabled. CORE-12789

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri May 5 10:55:12 2017 New Revision: 74480 URL: http://svn.reactos.org/svn/reactos?rev=74480&view=rev Log: [COMCTL32] Toolbar: Use DrawThemeText when themes are enabled. CORE-12789 Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Fri May 5 10:55:12 2017 @@ -617,6 +617,9 @@ COLORREF clrOldBk = 0; int oldBkMode = 0; UINT state = tbcd->nmcd.uItemState; +#ifdef __REACTOS__ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); +#endif /* draw text */ if (lpText && infoPtr->nMaxTextRows > 0) { @@ -646,6 +649,25 @@ clrOld = SetTextColor (hdc, tbcd->clrText); } +#ifdef __REACTOS__ + if (theme) + { + int partId = TP_BUTTON; + int stateId = TS_NORMAL; + + if (state & CDIS_DISABLED) + stateId = TS_DISABLED; + else if (state & CDIS_SELECTED) + stateId = TS_PRESSED; + else if (state & CDIS_CHECKED) + stateId = (state & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; + else if (state & CDIS_HOT) + stateId = TS_HOT; + + DrawThemeText(theme, hdc, partId, stateId, lpText, -1, infoPtr->dwDTFlags, 0, rcText); + } + else +#endif DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags); SetTextColor (hdc, clrOld); if ((state & CDIS_MARKED) && !(dwItemCDFlag & TBCDRF_NOMARK))

7 years, 7 months

[gadamopoulos] 74479: [SHELL32] -CMenuDeskBar: Handle WM_NCPAINT and paint the border with the correct color when it has the flat style.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri May 5 09:01:15 2017 New Revision: 74479 URL: http://svn.reactos.org/svn/reactos?rev=74479&view=rev Log: [SHELL32] -CMenuDeskBar: Handle WM_NCPAINT and paint the border with the correct color when it has the flat style. Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp [iso-8859-1] Fri May 5 09:01:15 2017 @@ -817,6 +817,28 @@ return 0; } +LRESULT CMenuDeskBar::_OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + /* If it is a flat style menu we need to handle WM_NCPAINT + * and paint the border with the right colour */ + if ((GetStyle() & WS_BORDER) == 0) + { + /* This isn't a flat style menu. */ + bHandled = FALSE; + return 0; + } + + HDC hdc; + RECT rcWindow; + + hdc = GetWindowDC(); + GetWindowRect(&rcWindow); + OffsetRect(&rcWindow, -rcWindow.left, -rcWindow.top); + FrameRect(hdc, &rcWindow, GetSysColorBrush(COLOR_BTNSHADOW)); + ReleaseDC(hdc); + return 0; +} + HRESULT CMenuDeskBar::_AdjustForTheme(BOOL bFlatStyle) { DWORD style = bFlatStyle ? WS_BORDER : WS_CLIPCHILDREN|WS_DLGFRAME; Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.h [iso-8859-1] Fri May 5 09:01:15 2017 @@ -73,6 +73,7 @@ MESSAGE_HANDLER(WM_ACTIVATEAPP, _OnAppActivate) MESSAGE_HANDLER(WM_MOUSEACTIVATE, _OnMouseActivate) MESSAGE_HANDLER(WM_WININICHANGE , _OnWinIniChange) + MESSAGE_HANDLER(WM_NCPAINT, _OnNcPaint) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -140,6 +141,7 @@ LRESULT _OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnNcPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); HRESULT _AdjustForTheme(BOOL bFlatStyle); BOOL _IsSubMenuParent(HWND hwnd);

7 years, 7 months

[tfaber] 74478: [KERNEL32_APITEST] - Fix a broken test name. APITests can not have names already used by Wine tests! ... they should be named after APIs, anyway...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 4 16:45:42 2017 New Revision: 74478 URL: http://svn.reactos.org/svn/reactos?rev=74478&view=rev Log: [KERNEL32_APITEST] - Fix a broken test name. APITests can not have names already used by Wine tests! ... they should be named after APIs, anyway... Modified: trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Thu May 4 16:45:42 2017 @@ -29,7 +29,7 @@ const struct test winetest_testlist[] = { - { "Console", func_Console }, + { "ConsoleCP", func_Console }, { "DefaultActCtx", func_DefaultActCtx }, { "DeviceIoControl", func_DeviceIoControl }, { "dosdev", func_dosdev },

7 years, 7 months

[hbelusca] 74477: [NDK]: Guard the Bitmap API prototypes in a NTOS_MODE_USER, so that a driver that includes both wdm.h and ndk/rtlfuncs.h for whatever reason does not include twice the bitmap API....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 4 16:12:52 2017 New Revision: 74477 URL: http://svn.reactos.org/svn/reactos?rev=74477&view=rev Log: [NDK]: Guard the Bitmap API prototypes in a NTOS_MODE_USER, so that a driver that includes both wdm.h and ndk/rtlfuncs.h for whatever reason does not include twice the bitmap API. This in particular fixes compilation under x64 due to the fact that, in x64, one of these API is declared (force)inline and the compiler complained that this function already had a body. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Thu May 4 16:12:52 2017 @@ -3202,6 +3202,8 @@ // // Bitmap Functions // +#ifdef NTOS_MODE_USER + NTSYSAPI BOOLEAN NTAPI @@ -3420,6 +3422,9 @@ #else #define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP)/32]) >> ((BP)%32)) & 0x1) #endif /* defined(_M_AMD64) */ + +#endif // NTOS_MODE_USER + // // Timer Functions

7 years, 7 months

[hbelusca] 74476: [USBD.SYS]: Exports: - The three C-decorated exports _USBD_CreateConfigurationRequestEx@8, _USBD_ParseConfigurationDescriptorEx@28 and _USBD_ParseDescriptors@16 are only exported ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 4 15:46:09 2017 New Revision: 74476 URL: http://svn.reactos.org/svn/reactos?rev=74476&view=rev Log: [USBD.SYS]: Exports: - The three C-decorated exports _USBD_CreateConfigurationRequestEx@8, _USBD_ParseConfigurationDescriptorEx@28 and _USBD_ParseDescriptors@16 are only exported in the i386 version of the driver (not present in x64, checked on WinXP x64). This fixes warnings in ReactOS x64 compilation. - Add (commented out) the remaining exports (without their parameters) that need to be implemented and exported. Modified: trunk/reactos/drivers/usb/usbd/usbd.spec Modified: trunk/reactos/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.spec… ============================================================================== --- trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbd/usbd.spec [iso-8859-1] Thu May 4 15:46:09 2017 @@ -1,15 +1,33 @@ @ stdcall USBD_Debug_GetHeap(long long long long) @ stdcall USBD_Debug_RetHeap(ptr long long) @ stdcall USBD_Debug_LogEntry(ptr ptr ptr ptr) +;; stdcall USBD_AllocateDeviceName @ stdcall USBD_CalculateUsbBandwidth(long long long) -@ stdcall _USBD_CreateConfigurationRequestEx@8(ptr ptr) USBD_CreateConfigurationRequestEx +;; stdcall USBD_CompleteRequest +@ stdcall USBD_CreateConfigurationRequest(ptr ptr) +@ stdcall -arch=i386 _USBD_CreateConfigurationRequestEx@8(ptr ptr) USBD_CreateConfigurationRequestEx @ stdcall USBD_CreateConfigurationRequestEx(ptr ptr) -@ stdcall USBD_CreateConfigurationRequest(ptr ptr) +;; stdcall USBD_CreateDevice +;; stdcall USBD_Dispatch +;; stdcall USBD_FreeDeviceMutex +;; stdcall USBD_FreeDeviceName +;; stdcall USBD_GetDeviceInformation @ stdcall USBD_GetInterfaceLength(ptr ptr) +@ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long) +;; stdcall USBD_GetSuspendPowerState +@ stdcall USBD_GetUSBDIVersion(ptr) +;; stdcall USBD_InitializeDevice +;; stdcall USBD_MakePdoName @ stdcall USBD_ParseConfigurationDescriptor(ptr long long) -@ stdcall _USBD_ParseConfigurationDescriptorEx@28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx +@ stdcall -arch=i386 _USBD_ParseConfigurationDescriptorEx@28(ptr ptr long long long long long) USBD_ParseConfigurationDescriptorEx @ stdcall USBD_ParseConfigurationDescriptorEx(ptr ptr long long long long long) +@ stdcall -arch=i386 _USBD_ParseDescriptors@16(ptr long ptr long) USBD_ParseDescriptors @ stdcall USBD_ParseDescriptors(ptr long ptr long) -@ stdcall USBD_GetPdoRegistryParameter(ptr ptr long ptr long) -@ stdcall USBD_GetUSBDIVersion(ptr) -@ stdcall USBD_QueryBusTime(ptr ptr) +@ stdcall USBD_QueryBusTime(ptr ptr) +;; stdcall USBD_RegisterHcDeviceCapabilities +;; stdcall USBD_RegisterHcFilter +;; stdcall USBD_RegisterHostController +;; stdcall USBD_RemoveDevice +;; stdcall USBD_RestoreDevice +;; stdcall USBD_SetSuspendPowerState +;; stdcall USBD_WaitDeviceMutex

7 years, 7 months

[hbelusca] 74475: [KERNEL32_APITEST]: Internationalization console tests by Katayama Hirofumi MZ. Passes on Win2k3 (either are skipped because either Russian or Japanese locales or codepages are ab...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 4 15:39:50 2017 New Revision: 74475 URL: http://svn.reactos.org/svn/reactos?rev=74475&view=rev Log: [KERNEL32_APITEST]: Internationalization console tests by Katayama Hirofumi MZ. Passes on Win2k3 (either are skipped because either Russian or Japanese locales or codepages are absent, or are passed OK), but not on ReactOS yet. They are committed as reference for future work. CORE-12451 Added: trunk/rostests/apitests/kernel32/Console.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Thu May 4 15:39:50 2017 @@ -2,6 +2,7 @@ add_subdirectory(redirptest) list(APPEND SOURCE + Console.c DefaultActCtx.c DeviceIoControl.c dosdev.c Added: trunk/rostests/apitests/kernel32/Console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/Console… ============================================================================== --- trunk/rostests/apitests/kernel32/Console.c (added) +++ trunk/rostests/apitests/kernel32/Console.c [iso-8859-1] Thu May 4 15:39:50 2017 @@ -0,0 +1,476 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for i18n console test + * PROGRAMMERS: Katayama Hirofumi MZ + */ + +#include <apitest.h> +#include <wincon.h> +#include <winnls.h> + +#define okCURSOR(hCon, c) do { \ + CONSOLE_SCREEN_BUFFER_INFO __sbi; \ + BOOL expect = GetConsoleScreenBufferInfo((hCon), &__sbi) && \ + __sbi.dwCursorPosition.X == (c).X && __sbi.dwCursorPosition.Y == (c).Y; \ + ok(expect, "Expected cursor at (%d,%d), got (%d,%d)\n", \ + (c).X, (c).Y, __sbi.dwCursorPosition.X, __sbi.dwCursorPosition.Y); \ +} while (0) + +#define ATTR \ + (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) + +static const WCHAR u0414[] = { 0x0414, 0 }; /* Ð */ +static const WCHAR u9580[] = { 0x9580, 0 }; /* é */ +static const WCHAR ideograph_space = (WCHAR)0x3000; /* fullwidth space */ +LCID lcidJapanese = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT), SORT_DEFAULT); +LCID lcidRussian = MAKELCID(MAKELANGID(LANG_RUSSIAN , SUBLANG_DEFAULT), SORT_DEFAULT); + +/* Russian Code Page 855 */ +// NOTE that CP 866 can also be used +static void test_cp855(HANDLE hConOut) +{ + BOOL ret; + DWORD oldcp; + int n; + DWORD len; + COORD c; + CONSOLE_SCREEN_BUFFER_INFO csbi; + int count; + WCHAR str[32]; + WORD attr; + + if (!IsValidCodePage(855)) + { + skip("Codepage 855 not available\n"); + return; + } + + /* Set code page */ + oldcp = GetConsoleOutputCP(); + SetLastError(0xdeadbeef); + ret = SetConsoleOutputCP(855); + if (!ret) + { + skip("SetConsoleOutputCP failed with last error %lu\n", GetLastError()); + return; + } + + /* Get info */ + ret = GetConsoleScreenBufferInfo(hConOut, &csbi); + ok(ret, "GetConsoleScreenBufferInfo failed\n"); + trace("csbi.dwSize.X:%d, csbi.dwSize.Y:%d\n", csbi.dwSize.X, csbi.dwSize.Y); + count = csbi.dwSize.X * 3 / 2; + trace("count: %d\n", count); + + /* "\u0414" */ + { + /* Output u0414 "count" times at (0,0) */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u0414, lstrlenW(u0414), &len, NULL); + ok(ret && len == lstrlenW(u0414), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = count; /* u0414 is normal width in Russian */ + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 6, "len was: %ld\n", len); + ok(str[0] == 0x414, "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x414, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == 0x414, "str[2] was: 0x%04X\n", str[2]); + + /* Check cursor */ + c.X = 1; + c.Y = 0; + ret = SetConsoleCursorPosition(hConOut, c); + ok(ret, "SetConsoleCursorPosition failed\n"); + okCURSOR(hConOut, c); + + /* Fill by space */ + c.X = c.Y = 0; + FillConsoleOutputCharacterW(hConOut, L' ', csbi.dwSize.X * csbi.dwSize.Y, c, &len); + + /* Output u0414 "count" times at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u0414, lstrlenW(u0414), &len, NULL); + ok(ret && len == lstrlenW(u0414), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = 1 + count; + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 6, "len was: %ld\n", len); + ok(str[0] == L' ', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x414, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == 0x414, "str[2] was: 0x%04X\n", str[2]); + } + + /* "\u9580" */ + { + /* Output u9580 "count" times at (0,0) */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = count; /* u9580 is normal width in Russian */ + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Check cursor */ + c.X = 1; + c.Y = 0; + ret = SetConsoleCursorPosition(hConOut, c); + ok(ret, "SetConsoleCursorPosition failed\n"); + okCURSOR(hConOut, c); + + /* Fill by space */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, L' ', csbi.dwSize.X * csbi.dwSize.Y, c, &len); + ok(ret, "FillConsoleOutputCharacterW failed\n"); + ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); + + /* Output u9580 "count" times at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = 1 + count; + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Fill by ideograph space */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X * csbi.dwSize.Y, c, &len); + ok(ret, "FillConsoleOutputCharacterW failed\n"); + ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 6, "len was: %ld\n", len); + ok(str[0] == ideograph_space || str[0] == L'?', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == ideograph_space || str[1] == L'?', "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == ideograph_space || str[2] == L'?', "str[2] was: 0x%04X\n", str[2]); + + /* Read attr at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok(ret, "ReadConsoleOutputAttribute failed\n"); + ok(attr == ATTR, "attr was: %d\n", attr); + ok(len == 1, "len was %ld\n", len); + + /* Read characters at (1,0) */ + c.X = 1; + c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 6, "len was: %ld\n", len); + ok(str[0] == ideograph_space || str[0] == L'?', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == ideograph_space || str[1] == L'?', "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == ideograph_space || str[2] == L'?', "str[2] was: 0x%04X\n", str[2]); + + /* Output u9580 "count" once at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + + /* Read attr (1,0) */ + c.X = 1; + c.Y = 0; + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok(ret, "ReadConsoleOutputAttribute failed\n"); + ok(attr == ATTR, "attr was: %d\n", attr); + ok(len == 1, "len was %ld\n", len); + + /* Check cursor */ + c.X = 2; + c.Y = 0; + okCURSOR(hConOut, c); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 6, "len was: %ld\n", len); + ok(str[0] == ideograph_space || str[0] == L'?', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x9580 || str[1] == L'?', "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == ideograph_space || str[2] == L'?', "str[2] was: 0x%04X\n", str[2]); + } + + /* Restore code page */ + SetConsoleOutputCP(oldcp); +} + +/* Japanese Code Page 932 */ +static void test_cp932(HANDLE hConOut) +{ + BOOL ret; + DWORD oldcp; + int n; + DWORD len; + COORD c; + CONSOLE_SCREEN_BUFFER_INFO csbi; + int count; + WCHAR str[32]; + WORD attr; + + if (!IsValidCodePage(932)) + { + skip("Codepage 932 not available\n"); + return; + } + + /* Set code page */ + oldcp = GetConsoleOutputCP(); + SetLastError(0xdeadbeef); + ret = SetConsoleOutputCP(932); + if (!ret) + { + skip("SetConsoleOutputCP failed with last error %lu\n", GetLastError()); + return; + } + + /* Get info */ + ret = GetConsoleScreenBufferInfo(hConOut, &csbi); + ok(ret, "GetConsoleScreenBufferInfo failed\n"); + trace("csbi.dwSize.X:%d, csbi.dwSize.Y:%d\n", csbi.dwSize.X, csbi.dwSize.Y); + count = csbi.dwSize.X * 3 / 2; + trace("count: %d\n", count); + + /* "\u0414" */ + { + /* Output u0414 "count" times at (0,0) */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u0414, lstrlenW(u0414), &len, NULL); + ok(ret && len == lstrlenW(u0414), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + GetConsoleScreenBufferInfo(hConOut, &csbi); + len = count * 2; /* u0414 is fullwidth in Japanese */ + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 3, "len was: %ld\n", len); + ok(str[0] == 0x414, "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x414, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == 0x414, "str[2] was: 0x%04X\n", str[2]); + + /* Check cursor */ + c.X = 1; + c.Y = 0; + ret = SetConsoleCursorPosition(hConOut, c); + ok(ret, "SetConsoleCursorPosition failed\n"); + okCURSOR(hConOut, c); + + /* Fill by space */ + c.X = c.Y = 0; + FillConsoleOutputCharacterW(hConOut, L' ', csbi.dwSize.X * csbi.dwSize.Y, c, &len); + + /* Output u0414 "count" times at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u0414, lstrlenW(u0414), &len, NULL); + ok(ret && len == lstrlenW(u0414), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = csbi.dwSize.X + (count - (csbi.dwSize.X - 1) / 2) * 2; + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Read characters at (0,0) */ + c.X = 0; + c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 4, "len was: %ld\n", len); + ok(str[0] == L' ', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x414, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == 0x414, "str[2] was: 0x%04X\n", str[2]); + } + + /* "\u9580" */ + { + /* Output u9580 "count" times at (0,0) */ + c.X = c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = count * 2; /* u9580 is fullwidth in Japanese */ + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Check cursor */ + c.X = 1; + c.Y = 0; + ret = SetConsoleCursorPosition(hConOut, c); + ok(ret, "SetConsoleCursorPosition failed\n"); + okCURSOR(hConOut, c); + + /* Fill by space */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, L' ', csbi.dwSize.X * csbi.dwSize.Y, c, &len); + ok(ret, "FillConsoleOutputCharacterW failed\n"); + ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); + + /* Output u9580 "count" times at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + for (n = 0; n < count; ++n) + { + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + } + + /* Check cursor */ + len = csbi.dwSize.X + (count - (csbi.dwSize.X - 1) / 2) * 2; + c.X = (SHORT)(len % csbi.dwSize.X); + c.Y = (SHORT)(len / csbi.dwSize.X); + okCURSOR(hConOut, c); + + /* Fill by ideograph space */ + c.X = c.Y = 0; + ret = FillConsoleOutputCharacterW(hConOut, ideograph_space, csbi.dwSize.X * csbi.dwSize.Y, c, &len); + ok(ret, "FillConsoleOutputCharacterW failed\n"); + ok(len == csbi.dwSize.X * csbi.dwSize.Y, "len was: %ld\n", len); + + /* Read characters at (0,0) */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 3, "len was: %ld\n", len); + ok(str[0] == ideograph_space, "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == ideograph_space, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == ideograph_space, "str[2] was: 0x%04X\n", str[2]); + + /* Read attr */ + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok(ret, "ReadConsoleOutputAttribute failed\n"); + ok(attr == ATTR, "attr was: %d\n", attr); + ok(len == 1, "len was %ld\n", len); + + /* Output u9580 "count" once at (1,0) */ + c.X = 1; + c.Y = 0; + SetConsoleCursorPosition(hConOut, c); + okCURSOR(hConOut, c); + ret = WriteConsoleW(hConOut, u9580, lstrlenW(u9580), &len, NULL); + ok(ret && len == lstrlenW(u9580), "WriteConsoleW failed\n"); + + /* Read attr */ + ret = ReadConsoleOutputAttribute(hConOut, &attr, 1, c, &len); + ok(ret, "ReadConsoleOutputAttribute failed\n"); + ok(attr == ATTR, "attr was: %d\n", attr); + ok(len == 1, "len was %ld\n", len); + + /* Check cursor */ + c.X = 3; + c.Y = 0; + okCURSOR(hConOut, c); + + /* Read characters */ + c.X = c.Y = 0; + ret = ReadConsoleOutputCharacterW(hConOut, str, 3 * sizeof(WCHAR), c, &len); + ok(ret, "ReadConsoleOutputCharacterW failed\n"); + ok(len == 4, "len was: %ld\n", len); + ok(str[0] == L' ', "str[0] was: 0x%04X\n", str[0]); + ok(str[1] == 0x9580, "str[1] was: 0x%04X\n", str[1]); + ok(str[2] == L' ', "str[2] was: 0x%04X\n", str[2]); + } + + /* Restore code page */ + SetConsoleOutputCP(oldcp); +} + +START_TEST(Console) +{ + HANDLE hConIn, hConOut; + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); + + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hConIn != INVALID_HANDLE_VALUE, "Opening ConIn\n"); + ok(hConOut != INVALID_HANDLE_VALUE, "Opening ConOut\n"); + + if (IsValidLocale(lcidRussian, LCID_INSTALLED)) + test_cp855(hConOut); + else + skip("Russian locale is not installed\n"); + + if (IsValidLocale(lcidJapanese, LCID_INSTALLED)) + test_cp932(hConOut); + else + skip("Japanese locale is not installed\n"); + + CloseHandle(hConIn); + CloseHandle(hConOut); + FreeConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); +} Propchange: trunk/rostests/apitests/kernel32/Console.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Thu May 4 15:39:50 2017 @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_Console(void); extern void func_DefaultActCtx(void); extern void func_DeviceIoControl(void); extern void func_dosdev(void); @@ -28,6 +29,7 @@ const struct test winetest_testlist[] = { + { "Console", func_Console }, { "DefaultActCtx", func_DefaultActCtx }, { "DeviceIoControl", func_DeviceIoControl }, { "dosdev", func_dosdev },

7 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2017