Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66593: [MPLAY32] - Additional improvements by Ricardo Hanke, see CORE-8477 for all the details! - Add support for play/pause button: now we change its icon and tooltip. - Do not block wh...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 23:49:49 2015 New Revision: 66593 URL: http://svn.reactos.org/svn/reactos?rev=66593&view=rev Log: [MPLAY32] - Additional improvements by Ricardo Hanke, see CORE-8477 for all the details! - Add support for play/pause button: now we change its icon and tooltip. - Do not block when repeatedly change play/pause state. Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc trunk/reactos/base/applications/mplay32/lang/de-DE.rc trunk/reactos/base/applications/mplay32/lang/en-US.rc trunk/reactos/base/applications/mplay32/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/fr-FR.rc trunk/reactos/base/applications/mplay32/lang/he-IL.rc trunk/reactos/base/applications/mplay32/lang/it-IT.rc trunk/reactos/base/applications/mplay32/lang/ja-JP.rc trunk/reactos/base/applications/mplay32/lang/nl-NL.rc trunk/reactos/base/applications/mplay32/lang/no-NO.rc trunk/reactos/base/applications/mplay32/lang/pl-PL.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ru-RU.rc trunk/reactos/base/applications/mplay32/lang/sk-SK.rc trunk/reactos/base/applications/mplay32/lang/sq-AL.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/uk-UA.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-TW.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mplay32/mplay32.h trunk/reactos/base/applications/mplay32/resource.h Modified: trunk/reactos/base/applications/mplay32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/bg-BG.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -55,8 +55,8 @@ IDS_TOOLTIP_SEEKBACK "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð¿ÑÐµÐ´" IDS_TOOLTIP_FORWARD "Ð¢ÑÑÑÐµÐ½Ðµ Ð½Ð°Ð¿ÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸ÑÑ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" IDS_PLAY "ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ¶Ð´Ð°Ð½Ðµ" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/cs-CZ.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -56,8 +56,8 @@ IDS_TOOLTIP_SEEKBACK "Posunout zpÄt" IDS_TOOLTIP_SEEKFORW "Posunout vpÅed" IDS_TOOLTIP_FORWARD "PÅeskoÄit vpÅed" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS PÅehrÃ¡vaÄ multimÃ©diÃ" IDS_PLAY "PÅehrÃ¡t" IDS_DEFAULTMCIERRMSG "Pro tuto chybu nenÃ dostupnÃ½ Å¾Ã¡dnÃ½ popis." - IDS_UNKNOWNFILEEXT "Nelze urÄit typ zaÅÃzenÃ z danÃ© pÅÃpony souboru." END Modified: trunk/reactos/base/applications/mplay32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Schneller RÃ¼cklauf" IDS_TOOLTIP_SEEKFORW "Schneller Vorlauf" IDS_TOOLTIP_FORWARD "Weiter" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Abspielen" IDS_DEFAULTMCIERRMSG "FÃ¼r diesen Fehler steht keine Beschreibung zur VerfÃ¼gung." - IDS_UNKNOWNFILEEXT "Kann keinen GerÃ¤tetyp aus der angegebenen Dateinamenerweiterung ermitteln." END Modified: trunk/reactos/base/applications/mplay32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/en-US.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Seek Backward" IDS_TOOLTIP_SEEKFORW "Seek Forward" IDS_TOOLTIP_FORWARD "Skip Forward" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/es-ES.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Rebobinar" IDS_TOOLTIP_SEEKFORW "Avance rÃ¡pido" IDS_TOOLTIP_FORWARD "Siguiente marca" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Reproductor multimedia de ReactOS" IDS_PLAY "Reproducir" IDS_DEFAULTMCIERRMSG "No hay una descripciÃ³n disponible para este error." - IDS_UNKNOWNFILEEXT "No se puede determinar el tipo de dispositivo a partir de la extensiÃ³n del archivo." END Modified: trunk/reactos/base/applications/mplay32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/fr-FR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Retour rapide" IDS_TOOLTIP_SEEKFORW "Avance rapide" IDS_TOOLTIP_FORWARD "Suivant" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Lire" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/he-IL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "××¤×© ××××¨× ××ª" IDS_TOOLTIP_SEEKFORW "××¤×© ×§××××" IDS_TOOLTIP_FORWARD "××× ×§××××" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "× ×× ×××××××××× ×©× ReactOS" IDS_PLAY "× ××" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/it-IT.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Riavvolgimento rapido" IDS_TOOLTIP_SEEKFORW "Avanzamento rapido" IDS_TOOLTIP_FORWARD "Successivo" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Riproduttore multimediale ReactOS" IDS_PLAY "Riproduci" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ja-JP.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "å¾ãã¸ã·ã¼ã¯" IDS_TOOLTIP_SEEKFORW "åã¸ã·ã¼ã¯" IDS_TOOLTIP_FORWARD "åã¸ã¹ããã" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ã¼" IDS_PLAY "åç" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/nl-NL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "Terugspoelen" IDS_TOOLTIP_SEEKFORW "Vooruitspoelen" IDS_TOOLTIP_FORWARD "Volgende" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/no-NO.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "SÃ¸ke tilbake" IDS_TOOLTIP_SEEKFORW "SÃ¸ke fremover" IDS_TOOLTIP_FORWARD "Spole fremover" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia avspiller" IDS_PLAY "Spill" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "PrzewiÅ do tyÅu" IDS_TOOLTIP_SEEKFORW "PrzewiÅ do przodu" IDS_TOOLTIP_FORWARD "Przeskocz do przodu" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Odtwarzacz multimedialny ReactOS" IDS_PLAY "OdtwÃ³rz" IDS_DEFAULTMCIERRMSG "Brak dostÄpnego opisu dla tego bÅÄdu." - IDS_UNKNOWNFILEEXT "Nie moÅ¼na okreÅliÄ typu urzÄdzenia z podanego rozszerzenia pliku." END Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/pt-BR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "Procurar Anterior" IDS_TOOLTIP_SEEKFORW "Procurar PrÃ³ximo" IDS_TOOLTIP_FORWARD "Pular PrÃ³xima" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimedia Player" IDS_PLAY "Executar" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -57,8 +57,8 @@ IDS_TOOLTIP_SEEKBACK "DeruleazÄ Ã®napoi" IDS_TOOLTIP_SEEKFORW "DeruleazÄ Ã®nainte" IDS_TOOLTIP_FORWARD "Salt la urmÄtor" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Lector multimedia" IDS_PLAY "Lecturare" IDS_DEFAULTMCIERRMSG "Nu existÄ descriere pentru aceastÄ eroare." - IDS_UNKNOWNFILEEXT "Nu se poate determina tipul dispozitivului din extensia fiÈierului." END Modified: trunk/reactos/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ru-RU.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -51,8 +51,8 @@ IDS_TOOLTIP_SEEKBACK "ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "ÐÐµÑÐµÐ¼Ð¾ÑÐºÐ° Ð²Ð¿ÐµÑÐµÐ´" IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ ReactOS" IDS_PLAY "ÐÐ¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸" IDS_DEFAULTMCIERRMSG "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°." - IDS_UNKNOWNFILEEXT "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ¸Ð¿ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð° Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°." END Modified: trunk/reactos/base/applications/mplay32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sk-SK.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -56,8 +56,8 @@ IDS_TOOLTIP_SEEKBACK "VyhÄ¾adaÅ¥ dozadu" IDS_TOOLTIP_SEEKFORW "VyhÄ¾adaÅ¥ dopredu" IDS_TOOLTIP_FORWARD "PreskoÄiÅ¥ dopredu" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "MultimediÃ¡lny prehrÃ¡vaÄ systÃ©mu ReactOS" IDS_PLAY "PrehraÅ¥" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sq-AL.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -55,8 +55,8 @@ IDS_TOOLTIP_SEEKBACK "KÃ«rko mbrapa" IDS_TOOLTIP_SEEKFORW "KÃ«rko pÃ«rpara" IDS_TOOLTIP_FORWARD "Kalo para" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Programi muzikor i ReactOS" IDS_PLAY "Fillo" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/sv-SE.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -58,8 +58,8 @@ IDS_TOOLTIP_SEEKBACK "SÃ¶k bakÃ¥t" IDS_TOOLTIP_SEEKFORW "SÃ¶k framÃ¥t" IDS_TOOLTIP_FORWARD "Spola fremÃ¥t" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS Multimediaspelare" IDS_PLAY "Play" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/tr-TR.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "Geri Sar" IDS_TOOLTIP_SEEKFORW "Ä°leri Sar" IDS_TOOLTIP_FORWARD "Bir Sonrakine GeÃ§" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "Ãoklu Ortam OynatÄ±cÄ±sÄ±" IDS_PLAY "Ãal" IDS_DEFAULTMCIERRMSG "Bu yanlÄ±ÅlÄ±ÄÄ±n tanÄ±mÄ± yoktur." - IDS_UNKNOWNFILEEXT "Verilen kÃ¼tÃ¼k tÃ¼rÃ¼nden aygÄ±t tÃ¼rÃ¼ belirlenemiyor." END Modified: trunk/reactos/base/applications/mplay32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/uk-UA.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "ÐÐµÑÐµÐ¼Ð¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð·Ð°Ð´" IDS_TOOLTIP_SEEKFORW "ÐÐµÑÐµÐ¼Ð¾ÑÑÐ²Ð°Ð½Ð½Ñ Ð²Ð¿ÐµÑÐµÐ´" IDS_TOOLTIP_FORWARD "ÐÐ¿ÐµÑÐµÐ´" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ÐÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ ReactOS" IDS_PLAY "ÐÑÐ´ÑÐ²Ð¾ÑÐ¸ÑÐ¸" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -53,8 +53,8 @@ IDS_TOOLTIP_SEEKBACK "å¿«é" IDS_TOOLTIP_SEEKFORW "å¿«è¿" IDS_TOOLTIP_FORWARD "ååè·³è¿" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS å¤åªä½ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "è¯¥éè¯¯æ²¡æå¯ç¨çæè¿°." - IDS_UNKNOWNFILEEXT "è¯¥è®¾å¤ç±»åä»ç»å®çæä»¶æ©å±åæ æ³æå®." END Modified: trunk/reactos/base/applications/mplay32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-TW.rc [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -59,8 +59,8 @@ IDS_TOOLTIP_SEEKBACK "å¾é" IDS_TOOLTIP_SEEKFORW "åé²" IDS_TOOLTIP_FORWARD "å¿«è½" + IDS_TOOLTIP_PAUSE "Pause" IDS_APPTITLE "ReactOS å¤åªé«ææ¾å¨" IDS_PLAY "ææ¾" IDS_DEFAULTMCIERRMSG "No description is available for this error." - IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension." END Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -6,6 +6,8 @@ #include "mplay32.h" +#define IDT_PLAYTIMER 1000 + #define MAIN_WINDOW_HEIGHT 125 #define MAIN_WINDOW_MIN_WIDTH 250 #define MAX_MCISTR 256 @@ -20,9 +22,7 @@ TCHAR szDefaultFilter[MAX_PATH] = _T(""); TCHAR *szFilter = NULL; -WORD wDeviceId; -BOOL bIsOpened = FALSE; -BOOL bIsPaused = FALSE; +WORD wDeviceId = 0; BOOL bRepeat = FALSE; BOOL bIsSingleWindow = FALSE; UINT MaxFilePos = 0; @@ -39,7 +39,8 @@ {TBICON_BACKWARD, IDC_BACKWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, {TBICON_SEEKBACK, IDC_SEEKBACK, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, {TBICON_SEEKFORW, IDC_SEEKFORW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, - {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} + {TBICON_FORWARD, IDC_FORWARD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, +// {TBICON_PAUSE, IDC_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0} }; void EnableMenuItems(HWND hwnd) @@ -47,7 +48,7 @@ MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; MCI_DGV_RECT_PARMS mciVideoRect; - MCI_DGV_WINDOW_PARMSW mciVideoWindow; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED); @@ -59,7 +60,7 @@ mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); if (!mciError) { mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); @@ -148,6 +149,10 @@ LoadImage(hInstance, MAKEINTRESOURCE(IDB_FORWARDICON), IMAGE_BITMAP, 16, 16, LR_DEFAULTCOLOR), RGB(255, 255, 255)); + ImageList_AddMasked(hImageList, + LoadImage(hInstance, MAKEINTRESOURCE(IDB_PAUSEICON), IMAGE_BITMAP, 16, 16, LR_DEFAULTCOLOR), + RGB(255, 255, 255)); + ImageList_Destroy((HIMAGELIST)SendMessage(hToolBar, TB_SETIMAGELIST, 0, @@ -160,9 +165,9 @@ TCHAR szErrorMessage[MAX_MCISTR]; TCHAR szTempMessage[MAX_MCISTR + 44]; - if (mciGetErrorString(mciError, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])) == FALSE) - { - LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); + if (mciGetErrorString(mciError, szErrorMessage, ARRAYSIZE(szErrorMessage)) == FALSE) + { + LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, ARRAYSIZE(szErrorMessage)); } StringCbPrintf(szTempMessage, sizeof(szTempMessage), _T("MMSYS%lu: %s"), mciError, szErrorMessage); @@ -172,7 +177,7 @@ static VOID InitControls(HWND hwnd) { - INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]); + INT NumButtons = ARRAYSIZE(Buttons); InitCommonControls(); @@ -219,63 +224,24 @@ SendMessage(hToolBar, TB_ADDBUTTONS, NumButtons, (LPARAM)Buttons); } -static BOOL -IsSupportedFileExtension(LPTSTR lpFileName, LPTSTR lpDeviceName, LPDWORD dwSize) -{ - HKEY hKey; - DWORD dwType; - TCHAR *pathend; - - pathend = _tcsrchr(lpFileName, '.'); - - if (pathend == NULL) - { - return FALSE; - } - - pathend++; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - if (RegQueryValueEx(hKey, pathend, NULL, &dwType, (LPBYTE)lpDeviceName, dwSize) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - if (dwType != REG_SZ) - { - return FALSE; - } - - return TRUE; - } - - RegCloseKey(hKey); - } - - return FALSE; -} - static VOID SwitchViewMode(HWND hwnd) { MCIERROR mciError; MCI_DGV_RECT_PARMS mciVideoRect; - MCI_DGV_WINDOW_PARMSW mciVideoWindow; + MCI_DGV_WINDOW_PARMSW mciVideoWindow; RECT rcToolbarRect; RECT rcTempRect; mciVideoWindow.hWnd = hwnd; - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); - if (mciError) - { + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND | MCI_TEST, (DWORD_PTR)&mciVideoWindow); + if (mciError != 0) return; - } mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE | MCI_TEST, (DWORD_PTR)&mciVideoRect); - if (mciError) - { + if (mciError != 0) return; - } if (!bIsSingleWindow) { @@ -284,17 +250,17 @@ SetParent(hTrackBar, hToolBar); mciError = mciSendCommand(wDeviceId, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&mciVideoRect); - if (mciError) + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; } - GetWindowRect(hToolBar, &rcToolbarRect); + GetWindowRect(hToolBar, &rcToolbarRect); ResizeClientArea(hwnd, mciVideoRect.rc.right, mciVideoRect.rc.bottom + (rcToolbarRect.bottom - rcToolbarRect.top)); - mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); - if (mciError) + mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; @@ -313,7 +279,7 @@ mciVideoWindow.hWnd = MCI_DGV_WINDOW_DEFAULT; mciError = mciSendCommand(wDeviceId, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&mciVideoWindow); - if (mciError) + if (mciError != 0) { ShowMCIError(hwnd, mciError); return; @@ -371,10 +337,8 @@ mciOpen.lpstrAlias = NULL; mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_WAIT, (DWORD_PTR)&mciOpen); - if (mciError) - { + if (mciError != 0) return mciError; - } mciInfo.dwCallback = 0; mciInfo.lpstrReturn = lpFriendlyName; @@ -388,17 +352,17 @@ return mciError; } -static DWORD +static MCIERROR CloseMciDevice(VOID) { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - if (bIsOpened) + if (wDeviceId) { mciError = mciSendCommand(wDeviceId, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError) return mciError; - bIsOpened = FALSE; + if (mciError != 0) return mciError; + wDeviceId = 0; } DisableMenuItems(); @@ -406,18 +370,17 @@ return 0; } -static DWORD +static MCIERROR OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName) { MCIERROR mciError; MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; - TCHAR szNewTitle[MAX_PATH + 128]; - - if (bIsOpened) - { + DWORD dwFlags = MCI_OPEN_ELEMENT | MCI_WAIT; + TCHAR szNewTitle[MAX_PATH + 3 + 256]; + + if (wDeviceId) CloseMciDevice(); - } mciOpen.lpstrDeviceType = lpType; mciOpen.lpstrElementName = lpFileName; @@ -425,41 +388,40 @@ mciOpen.wDeviceID = 0; mciOpen.lpstrAlias = NULL; - mciError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, (DWORD_PTR)&mciOpen); + if (lpType) + dwFlags |= MCI_OPEN_TYPE; + + mciError = mciSendCommand(0, MCI_OPEN, dwFlags, (DWORD_PTR)&mciOpen); if (mciError != 0) - { return mciError; - } mciStatus.dwItem = MCI_STATUS_LENGTH; mciError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT, (DWORD_PTR)&mciStatus); if (mciError != 0) - { return mciError; - } - - SendMessage(hTrackBar, TBM_SETRANGEMIN, (WPARAM) TRUE, (LPARAM) 1); - SendMessage(hTrackBar, TBM_SETRANGEMAX, (WPARAM) TRUE, (LPARAM) mciStatus.dwReturn); + + SendMessage(hTrackBar, TBM_SETRANGEMIN, (WPARAM)TRUE, (LPARAM)1); + SendMessage(hTrackBar, TBM_SETRANGEMAX, (WPARAM)TRUE, (LPARAM)mciStatus.dwReturn); SendMessage(hTrackBar, TBM_SETPAGESIZE, 0, 10); SendMessage(hTrackBar, TBM_SETLINESIZE, 0, 1); - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1); + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)1); if (mciStatus.dwReturn < 10000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100, (LPARAM)0); } else if (mciStatus.dwReturn < 100000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 1000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)1000, (LPARAM)0); } else if (mciStatus.dwReturn < 1000000) { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 10000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)10000, (LPARAM)0); } else { - SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100000, (LPARAM) 0); + SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM)100000, (LPARAM)0); } StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle, lpFileName); @@ -467,7 +429,6 @@ MaxFilePos = mciStatus.dwReturn; wDeviceId = mciOpen.wDeviceID; - bIsOpened = TRUE; StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName); EnableMenuItems(hwnd); @@ -475,21 +436,52 @@ return 0; } +static DWORD +GetDeviceMode(HWND hwnd) +{ + MCIERROR mciError; + MCI_STATUS_PARMS mciStatus; + + mciStatus.dwItem = MCI_STATUS_MODE; + mciError = mciSendCommand(wDeviceId, MCI_STATUS, MCI_WAIT | MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return MCI_MODE_NOT_READY; + } + + return mciStatus.dwReturn; +} + static VOID StopPlayback(HWND hwnd) { - if (bIsOpened) - { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) 1); - KillTimer(hwnd, IDT_PLAYTIMER); - - if (bIsSingleWindow) - { - SwitchViewMode(hwnd); - } - - CloseMciDevice(); - } + MCIERROR mciError; + MCI_GENERIC_PARMS mciGeneric; + + if (wDeviceId == 0) return; + + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)1); + KillTimer(hwnd, IDT_PLAYTIMER); + + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_STOP, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + IDC_PLAY); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + IDC_PLAY, + IDB_PLAYICON - IDB_PLAYICON); } static VOID @@ -499,21 +491,20 @@ MCI_SEEK_PARMS mciSeek; MCI_PLAY_PARMS mciPlay; - if (bIsOpened) - { - mciSeek.dwTo = (DWORD_PTR)dwNewPos; - mciError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - - mciPlay.dwCallback = (DWORD_PTR)hwnd; - mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } + if (wDeviceId == 0) return; + + mciSeek.dwTo = (DWORD_PTR)dwNewPos; + mciError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO, (DWORD_PTR)&mciSeek); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + } + + mciPlay.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY, (DWORD_PTR)&mciPlay); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); } } @@ -523,14 +514,14 @@ MCI_STATUS_PARMS mciStatus; DWORD dwNewPos; - if (!bIsOpened) return; + if (wDeviceId == 0) return; mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn - 1; - if((UINT)dwNewPos <= 1) + if ((UINT)dwNewPos <= 1) { StopPlayback(hwnd); } @@ -546,14 +537,14 @@ MCI_STATUS_PARMS mciStatus; DWORD dwNewPos; - if (!bIsOpened) return; + if (wDeviceId == 0) return; mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwNewPos = mciStatus.dwReturn + 1; - if((UINT)dwNewPos >= MaxFilePos) + if ((UINT)dwNewPos >= MaxFilePos) { StopPlayback(hwnd); } @@ -564,37 +555,46 @@ } static VOID -PausePlayback(HWND hwnd) +TogglePlaybackState(HWND hwnd) { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; - - if (bIsOpened) - { - mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - bIsPaused = TRUE; - } -} - -static VOID -ResumePlayback(HWND hwnd) -{ - MCIERROR mciError; - MCI_GENERIC_PARMS mciGeneric; - - if (bIsPaused) - { - mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT, (DWORD_PTR)&mciGeneric); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - } - bIsPaused = FALSE; - } + DWORD dwMode; + ULONG idBmp = IDB_PLAYICON; + ULONG idCmd = IDC_PLAY; + + if (wDeviceId == 0) return; + + dwMode = GetDeviceMode(hwnd); + if (dwMode == MCI_MODE_PLAY) + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PLAYICON; + idCmd = IDC_PLAY; + } + else if (dwMode == MCI_MODE_PAUSE) + { + mciGeneric.dwCallback = (DWORD_PTR)hwnd; + mciError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_NOTIFY, (DWORD_PTR)&mciGeneric); + idBmp = IDB_PAUSEICON; + idCmd = IDC_PAUSE; + } + + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + idCmd); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + idCmd, + idBmp - IDB_PLAYICON); } static VOID @@ -617,13 +617,13 @@ MCI_PLAY_PARMS mciPlay; DWORD dwPos; - if (!bIsOpened) KillTimer(hwnd, IDT_PLAYTIMER); + if (wDeviceId == 0) KillTimer(hwnd, IDT_PLAYTIMER); mciStatus.dwItem = MCI_STATUS_POSITION; mciSendCommand(wDeviceId, MCI_STATUS, MCI_STATUS_ITEM, (DWORD_PTR)&mciStatus); dwPos = mciStatus.dwReturn; - if((UINT)dwPos >= MaxFilePos) + if ((UINT)dwPos >= MaxFilePos) { if (!bRepeat) { @@ -638,61 +638,17 @@ } else { - SendMessage(hTrackBar, TBM_SETPOS, (WPARAM) TRUE, (LPARAM) dwPos); - } -} - -static VOID -PlayFile(HWND hwnd, LPTSTR lpFileName) -{ + SendMessage(hTrackBar, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)dwPos); + } +} + +static VOID +StartPlayback(HWND hwnd) +{ + MCIERROR mciError; MCI_PLAY_PARMS mciPlay; - TCHAR szLocalFileName[MAX_PATH]; - TCHAR szDeviceName[MAX_PATH]; - DWORD dwSize; - MCIERROR mciError; - - if (lpFileName == NULL) - { - if (szPrevFile[0] == _T('\0')) - return; - - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); - } - else - { - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); - } - - if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) - { - return; - } - - dwSize = sizeof(szDeviceName) - 2; - _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR)); - - if (!IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize)) - { - TCHAR szErrorMessage[256]; - - LoadString(hInstance, IDS_UNKNOWNFILEEXT, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); - MessageBox(hwnd, szErrorMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); - return; - } - - if (bIsOpened) - { - StopPlayback(hwnd); - } - - mciError = OpenMciDevice(hwnd, szDeviceName, szLocalFileName); - if (mciError != 0) - { - ShowMCIError(hwnd, mciError); - return; - } - - SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc); + + SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); @@ -704,7 +660,63 @@ if (mciError != 0) { ShowMCIError(hwnd, mciError); - } + return; + } + + SendMessage(hToolBar, + TB_SETCMDID, + 0, + IDC_PAUSE); + SendMessage(hToolBar, + TB_CHANGEBITMAP, + IDC_PAUSE, + IDB_PAUSEICON - IDB_PLAYICON); +} + +static VOID +CloseMediaFile(HWND hwnd) +{ + StopPlayback(hwnd); + + if (bIsSingleWindow) + SwitchViewMode(hwnd); + + CloseMciDevice(); + SetWindowText(hwnd, szAppTitle); +} + +static VOID +OpenMediaFile(HWND hwnd, LPTSTR lpFileName) +{ + MCIERROR mciError; + TCHAR szLocalFileName[MAX_PATH]; + + if (lpFileName == NULL) + { + if (szPrevFile[0] == _T('\0')) + return; + + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); + } + else + { + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); + } + + if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) + return; + + if (wDeviceId) + CloseMediaFile(hwnd); + + mciError = OpenMciDevice(hwnd, NULL, szLocalFileName); + if (mciError != 0) + { + ShowMCIError(hwnd, mciError); + return; + } + + StartPlayback(hwnd); } static VOID @@ -733,7 +745,7 @@ HKEY hKey = NULL; /* Always load the default (all files) filter */ - LoadString(hInstance, IDS_ALL_TYPES_FILTER, szDefaultFilter, sizeof(szDefaultFilter) / sizeof(szDefaultFilter[0])); + LoadString(hInstance, IDS_ALL_TYPES_FILTER, szDefaultFilter, ARRAYSIZE(szDefaultFilter)); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions"), 0, KEY_READ, &hKey) != ERROR_SUCCESS) { @@ -749,9 +761,7 @@ szExtensionList = malloc(dwMaskLen * sizeof(TCHAR)); if (!szExtensionList) - { goto Failure; - } dwNumDevices = GetNumDevices(); @@ -763,21 +773,15 @@ szFilter = malloc(dwFilterSize); if (!szFilter) - { goto Failure; - } szExtension = malloc((dwValueNameLen + 1) * sizeof(TCHAR)); if (!szExtension) - { goto Failure; - } szDevice = malloc(dwValueDataSize + sizeof(TCHAR)); if (!szDevice) - { goto Failure; - } ZeroMemory(szFilter, dwFilterSize); @@ -813,7 +817,7 @@ if (RegEnumValue(hKey, i, szExtension, &dwExtensionLen, NULL, NULL, (LPBYTE)szDevice, &dwDeviceSize) == ERROR_SUCCESS) { CharLowerBuff(szDevice, dwDeviceSize / sizeof(TCHAR)); - CharLowerBuff(szDeviceName, sizeof(szDeviceName) / sizeof(szDeviceName[0])); + CharLowerBuff(szDeviceName, ARRAYSIZE(szDeviceName)); if (_tcscmp(szDeviceName, szDevice) == 0) { CharLowerBuff(szExtension, dwExtensionLen); @@ -835,7 +839,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); /* Skip another char to seperate the elements of the filter mask */ c++; @@ -870,7 +874,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szExtensionList, &c, &uSizeRemain, 0); Cleanup: if (szExtensionList) free(szExtensionList); @@ -896,7 +900,7 @@ uSizeRemain -= sizeof(*c); /* Append the filter mask */ - StringCbCopyEx(c, uSizeRemain, szDefaultExtension, &c, &uSizeRemain, 0); + StringCbCopyEx(c, uSizeRemain, szDefaultExtension, &c, &uSizeRemain, 0); goto Cleanup; } @@ -916,7 +920,7 @@ ZeroMemory(&OpenFileName, sizeof(OpenFileName)); - if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir)) + if (!GetCurrentDirectory(ARRAYSIZE(szCurrentDir), szCurrentDir)) { StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\")); } @@ -926,15 +930,15 @@ OpenFileName.hInstance = hInstance; OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFile = szFile; - OpenFileName.nMaxFile = sizeof(szFile) / sizeof(szFile[0]); + OpenFileName.nMaxFile = ARRAYSIZE(szFile); OpenFileName.lpstrInitialDir = szCurrentDir; OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); - if (GetOpenFileName(&OpenFileName)) - { - PlayFile(hwnd, OpenFileName.lpstrFile); - } + if (!GetOpenFileName(&OpenFileName)) + return; + + OpenMediaFile(hwnd, OpenFileName.lpstrFile); } LRESULT CALLBACK @@ -955,9 +959,9 @@ TCHAR droppedfile[MAX_PATH]; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile) / sizeof(droppedfile[0])); + DragQueryFile(drophandle, 0, droppedfile, ARRAYSIZE(droppedfile)); DragFinish(drophandle); - PlayFile(hwnd, droppedfile); + OpenMediaFile(hwnd, droppedfile); break; } @@ -995,6 +999,9 @@ case IDC_FORWARD: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_FORWARD); break; + case IDC_PAUSE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PAUSE); + break; } break; } @@ -1054,11 +1061,11 @@ case WM_HSCROLL: { - if (hTrackBar == (HWND) lParam) + if (hTrackBar == (HWND)lParam) { - if (bIsOpened) + if (wDeviceId) { - DWORD dwNewPos = (DWORD) SendMessage(hTrackBar, TBM_GETPOS, 0, 0); + DWORD dwNewPos = (DWORD)SendMessage(hTrackBar, TBM_GETPOS, 0, 0); SeekPlayback(hwnd, dwNewPos); } else @@ -1083,20 +1090,23 @@ switch (LOWORD(wParam)) { case IDC_PLAY: + case IDC_PAUSE: { - if (bIsOpened) + if (wDeviceId) { - if (bIsPaused) - ResumePlayback(hwnd); - else - PausePlayback(hwnd); + DWORD dwMode = GetDeviceMode(hwnd); + + if ((dwMode == MCI_MODE_STOP) || (dwMode == MCI_MODE_OPEN)) + StartPlayback(hwnd); + else if ((dwMode == MCI_MODE_PAUSE) || (dwMode = MCI_MODE_PLAY)) + TogglePlaybackState(hwnd); } else { if (szPrevFile[0] == _T('\0')) OpenFileDialog(hwnd); else - PlayFile(hwnd, NULL); + OpenMediaFile(hwnd, NULL); } break; } @@ -1127,8 +1137,8 @@ return 0; case IDM_CLOSE_FILE: - StopPlayback(hwnd); szPrevFile[0] = _T('\0'); + CloseMediaFile(hwnd); break; case IDM_REPEAT: @@ -1174,7 +1184,7 @@ } case WM_DESTROY: - StopPlayback(hwnd); + CloseMediaFile(hwnd); PostQuitMessage(0); return 0; } @@ -1194,9 +1204,9 @@ hInstance = hInst; - LoadString(hInstance, IDS_APPTITLE, szAppTitle, sizeof(szAppTitle) / sizeof(szAppTitle[0])); - - WndClass.cbSize = sizeof(WNDCLASSEX); + LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)); + + WndClass.cbSize = sizeof(WndClass); WndClass.lpszClassName = szClassName; WndClass.lpfnWndProc = MainWndProc; WndClass.hInstance = hInstance; @@ -1247,7 +1257,7 @@ ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); - PlayFile(hwnd, lpCmdLine); + OpenMediaFile(hwnd, lpCmdLine); /* Message Loop */ while (GetMessage(&msg, NULL, 0, 0)) Modified: trunk/reactos/base/applications/mplay32/mplay32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.h [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -14,17 +14,3 @@ #include <strsafe.h> #include "resource.h" - -#define IDT_PLAYTIMER 1000 - -#define UNSUPPORTED_FILE 0 -#define WAVE_FILE 1 -#define MIDI_FILE 2 -#define AUDIOCD_FILE 3 -#define AVI_FILE 4 - -typedef struct -{ - TCHAR szExt[MAX_PATH]; - UINT uType; -} TYPEBYEXT; Modified: trunk/reactos/base/applications/mplay32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/resource.h [iso-8859-1] Fri Mar 6 23:49:49 2015 @@ -22,10 +22,10 @@ #define IDS_TOOLTIP_SEEKBACK 105 #define IDS_TOOLTIP_SEEKFORW 106 #define IDS_TOOLTIP_FORWARD 107 -#define IDS_ALL_TYPES_FILTER 108 -#define IDS_PLAY 109 -#define IDS_DEFAULTMCIERRMSG 110 -#define IDS_UNKNOWNFILEEXT 111 +#define IDS_TOOLTIP_PAUSE 108 +#define IDS_ALL_TYPES_FILTER 109 +#define IDS_PLAY 110 +#define IDS_DEFAULTMCIERRMSG 111 /* Menu */ #define IDR_MAINMENU 500 @@ -60,3 +60,4 @@ #define IDC_SEEKBACK 1504 #define IDC_SEEKFORW 1505 #define IDC_FORWARD 1506 +#define IDC_PAUSE 1507

9 years, 9 months

[hbelusca] 66592: [SHIMGVW] - Few whitespace fixes. - Fix a regression where an exception was thrown when opening a file from cdrom. Patch by Ricardo Hanke. CORE-9250 #resolve #comment Patch v2 com...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 20:32:38 2015 New Revision: 66592 URL: http://svn.reactos.org/svn/reactos?rev=66592&view=rev Log: [SHIMGVW] - Few whitespace fixes. - Fix a regression where an exception was thrown when opening a file from cdrom. Patch by Ricardo Hanke. CORE-9250 #resolve #comment Patch v2 committed! Thanks! Modified: trunk/reactos/dll/win32/shimgvw/comsup.c trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/comsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/comsup.c… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/comsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/comsup.c [iso-8859-1] Fri Mar 6 20:32:38 2015 @@ -34,12 +34,12 @@ STDAPI DllCanUnloadNow(VOID) { - if ((ObjectCount != 0) || (LockCount != 0)) + if ((ObjectCount != 0) || (LockCount != 0)) { return S_FALSE; } else - { + { return S_OK; } } @@ -53,6 +53,6 @@ /* There are no classes to export, so always return CLASS_E_CLASSNOTAVAILABLE*/ *ppv = NULL; hr = CLASS_E_CLASSNOTAVAILABLE; - + return hr; } Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Fri Mar 6 20:32:38 2015 @@ -1,5 +1,4 @@ /* - * * PROJECT: ReactOS Picture and Fax Viewer * FILE: dll/win32/shimgvw/shimgvw.c * PURPOSE: shimgvw.dll @@ -175,9 +174,9 @@ { c++; } - - LoadStringW(hInstance, IDS_APPTITLE, szResStr, 512); - StringCbPrintfExW(szTitleBuf, 800, NULL, NULL, 0, L"%ls%ls%ls", szResStr, L" - ", c); + + LoadStringW(hInstance, IDS_APPTITLE, szResStr, ARRAYSIZE(szResStr)); + StringCbPrintfW(szTitleBuf, sizeof(szTitleBuf), L"%ls%ls%ls", szResStr, L" - ", c); SetWindowTextW(hwnd, szTitleBuf); if (image) @@ -200,16 +199,15 @@ WCHAR szSearchMask[MAX_PATH]; WCHAR szFileTypes[MAX_PATH]; WIN32_FIND_DATAW findData; - SHIMGVW_FILENODE *currentNode; - SHIMGVW_FILENODE *root; - SHIMGVW_FILENODE *conductor; + SHIMGVW_FILENODE *currentNode = NULL; + SHIMGVW_FILENODE *root = NULL; + SHIMGVW_FILENODE *conductor = NULL; ImageCodecInfo *codecInfo; UINT num; UINT size; UINT j; - - wcscpy(szSearchPath, szFirstFile); + StringCbCopyW(szSearchPath, sizeof(szSearchPath), szFirstFile); PathRemoveFileSpecW(szSearchPath); GdipGetImageDecodersSize(&num, &size); @@ -234,19 +232,19 @@ for (j = 0; j < num; ++j) { - StringCbPrintfExW(szFileTypes, MAX_PATH, NULL, NULL, 0, L"%ls", codecInfo[j].FilenameExtension); - + StringCbCopyW(szFileTypes, sizeof(szFileTypes), codecInfo[j].FilenameExtension); + extension = wcstok(szFileTypes, L";"); while (extension != NULL) { - StringCbPrintfExW(szSearchMask, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", extension); + PathCombineW(szSearchMask, szSearchPath, extension); hFindHandle = FindFirstFileW(szSearchMask, &findData); if (hFindHandle != INVALID_HANDLE_VALUE) { do { - StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls%ls%ls", szSearchPath, L"\\", findData.cFileName); + PathCombineW(conductor->FileName, szSearchPath, findData.cFileName); // compare the name of the requested file with the one currently found. // if the name matches, the current node is returned by the function. @@ -261,7 +259,7 @@ if (!conductor->Next) { DPRINT1("malloc() failed in pLoadFileList()\n"); - + conductor->Next = root; root->Prev = conductor; @@ -286,7 +284,7 @@ // we use this node to store the name of it, otherwise we free it. if (currentNode == NULL) { - StringCbPrintfExW(conductor->FileName, MAX_PATH, NULL, NULL, 0, L"%ls", szFirstFile); + StringCchCopyW(conductor->FileName, MAX_PATH, szFirstFile); currentNode = conductor; } else @@ -503,7 +501,7 @@ ImageView_DrawImage(hwnd); return 0L; } - } + } return CallWindowProc(PrevProc, hwnd, Message, wParam, lParam); } @@ -793,4 +791,3 @@ return TRUE; } -

9 years, 9 months

[akhaldi] 66591: [RAPPS] Fix maximizing. By Ismael Ferreras Morezuelas. CORE-9060

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 6 20:23:45 2015 New Revision: 66591 URL: http://svn.reactos.org/svn/reactos?rev=66591&view=rev Log: [RAPPS] Fix maximizing. By Ismael Ferreras Morezuelas. CORE-9060 Modified: trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Fri Mar 6 20:23:45 2015 @@ -102,8 +102,8 @@ BOOL Maximized; INT Left; INT Top; - INT Right; - INT Bottom; + INT Width; + INT Height; } SETTINGS_INFO, *PSETTINGS_INFO; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Fri Mar 6 20:23:45 2015 @@ -42,10 +42,10 @@ pSettingsInfo->bDelInstaller = FALSE; pSettingsInfo->Maximized = FALSE; - pSettingsInfo->Left = 0; - pSettingsInfo->Top = 0; - pSettingsInfo->Right = 680; - pSettingsInfo->Bottom = 450; + pSettingsInfo->Left = CW_USEDEFAULT; + pSettingsInfo->Top = CW_USEDEFAULT; + pSettingsInfo->Width = 680; + pSettingsInfo->Height = 450; } static BOOL @@ -82,9 +82,9 @@ SettingsInfo.Left = wp.rcNormalPosition.left; SettingsInfo.Top = wp.rcNormalPosition.top; - SettingsInfo.Right = wp.rcNormalPosition.right; - SettingsInfo.Bottom = wp.rcNormalPosition.bottom; - SettingsInfo.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); + SettingsInfo.Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; + SettingsInfo.Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; + SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED))); } if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL, @@ -333,20 +333,12 @@ BOOL InitControls(HWND hwnd) { - if (SettingsInfo.bSaveWndPos) - { - MoveWindow(hwnd, SettingsInfo.Left, SettingsInfo.Top, - SettingsInfo.Right - SettingsInfo.Left, - SettingsInfo.Bottom - SettingsInfo.Top, TRUE); - - if (SettingsInfo.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); - } if (CreateStatusBar(hwnd) && - CreateToolBar(hwnd) && - CreateListView(hwnd) && - CreateTreeView(hwnd) && - CreateRichEdit(hwnd) && + CreateToolBar(hwnd) && + CreateListView(hwnd) && + CreateTreeView(hwnd) && + CreateRichEdit(hwnd) && CreateVSplitBar(hwnd) && CreateHSplitBar(hwnd)) { @@ -959,10 +951,10 @@ szWindowClass, szWindowName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, - CW_USEDEFAULT, - CW_USEDEFAULT, - 680, - 450, + (SettingsInfo.bSaveWndPos ? SettingsInfo.Left : CW_USEDEFAULT), + (SettingsInfo.bSaveWndPos ? SettingsInfo.Top : CW_USEDEFAULT), + (SettingsInfo.bSaveWndPos ? SettingsInfo.Width : 680), + (SettingsInfo.bSaveWndPos ? SettingsInfo.Height : 450), NULL, NULL, hInstance, @@ -970,8 +962,8 @@ if (!hMainWnd) goto Exit; - /* Show it */ - ShowWindow(hMainWnd, nShowCmd); + /* Maximize it if we must */ + ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd)); UpdateWindow(hMainWnd); if (SettingsInfo.bUpdateAtStart)

9 years, 9 months

[akhaldi] 66590: [RAPPS] Change APPLICATION_DATEBASE_URL to APPLICATION_DATABASE_URL and add a FIXME about switching to HTTPS once is supported. By Ismael Ferreras Morezuelas. CORE-9060

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 6 20:20:25 2015 New Revision: 66590 URL: http://svn.reactos.org/svn/reactos?rev=66590&view=rev Log: [RAPPS] Change APPLICATION_DATEBASE_URL to APPLICATION_DATABASE_URL and add a FIXME about switching to HTTPS once is supported. By Ismael Ferreras Morezuelas. CORE-9060 Modified: trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/rapps.h Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… ============================================================================== --- trunk/reactos/base/applications/rapps/available.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/available.c [iso-8859-1] Fri Mar 6 20:20:25 2015 @@ -100,7 +100,7 @@ if (!DeleteCurrentAppsDB()) return FALSE; - DownloadApplicationsDB(APPLICATION_DATEBASE_URL); + DownloadApplicationsDB(APPLICATION_DATABASE_URL); if (!GetStorageDirectory(szPath, sizeof(szPath) / sizeof(szPath[0]))) return FALSE; @@ -168,7 +168,7 @@ if (hFind == INVALID_HANDLE_VALUE) { if (GetFileAttributesW(szCabPath) == INVALID_FILE_ATTRIBUTES) - DownloadApplicationsDB(APPLICATION_DATEBASE_URL); + DownloadApplicationsDB(APPLICATION_DATABASE_URL); ExtractFilesFromCab(szCabPath, szAppsPath); hFind = FindFirstFileW(szPath, &FindFileData); Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Fri Mar 6 20:20:25 2015 @@ -25,7 +25,8 @@ #include "resource.h" -#define APPLICATION_DATEBASE_URL L"http://svn.reactos.org/packages/rappmgr.cab" +/* FIXME: this should be downloaded by HTTPS once is supported */ +#define APPLICATION_DATABASE_URL L"http://svn.reactos.org/packages/rappmgr.cab" #define SPLIT_WIDTH 4 #define MAX_STR_LEN 256

9 years, 9 months

[hbelusca] 66589: [DESK]: Include files from the wallpaper directory in the list of available desktop backgrounds. Patch by Ricardo Hanke. CORE-9288 #resolve #comment Patch v3 committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 20:13:21 2015 New Revision: 66589 URL: http://svn.reactos.org/svn/reactos?rev=66589&view=rev Log: [DESK]: Include files from the wallpaper directory in the list of available desktop backgrounds. Patch by Ricardo Hanke. CORE-9288 #resolve #comment Patch v3 committed, thanks! Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Fri Mar 6 20:13:21 2015 @@ -11,6 +11,7 @@ #include "desk.h" #include <shellapi.h> +#include <shlwapi.h> #define MAX_BACKGROUNDS 100 @@ -163,14 +164,121 @@ } -/* Add the images in the C:\ReactOS directory and the current wallpaper if any */ -static VOID -AddListViewItems(HWND hwndDlg, PDATA pData) +static UINT +AddWallpapersFromDirectory(UINT uCounter, HWND hwndBackgroundList, BackgroundItem *backgroundItem, PDATA pData, LPCTSTR wallpaperFilename, LPCTSTR wallpaperDirectory) { WIN32_FIND_DATA fd; HANDLE hFind; TCHAR szSearchPath[MAX_PATH]; LPTSTR szFileTypes = NULL; + TCHAR separators[] = TEXT(";"); + TCHAR *token; + HRESULT hr; + SHFILEINFO sfi; + UINT i = uCounter; + LV_ITEM listItem; + HIMAGELIST himl; + + + szFileTypes = GdipGetSupportedFileExtensions(); + if (!szFileTypes) + { + return i; + } + + token = _tcstok(szFileTypes, separators); + while (token != NULL) + { + if (!PathCombine(szSearchPath, wallpaperDirectory, token)) + { + HeapFree(GetProcessHeap(), 0, szFileTypes); + return i; + } + + hFind = FindFirstFile(szSearchPath, &fd); + while (hFind != INVALID_HANDLE_VALUE) + { + TCHAR filename[MAX_PATH]; + + if (!PathCombine(filename, wallpaperDirectory, fd.cFileName)) + { + FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); + return i; + } + + /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ + if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcsicmp(wallpaperFilename, filename) != 0)) + { + himl = (HIMAGELIST)SHGetFileInfo(filename, + 0, + &sfi, + sizeof(sfi), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | + SHGFI_DISPLAYNAME); + + if (himl == NULL) + break; + + if (i++ == 0) + { + (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); + } + + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; + + hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); + if (FAILED(hr)) + { + FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); + return i; + } + + PathRemoveExtension(backgroundItem->szDisplayName); + + hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), filename); + if (FAILED(hr)) + { + FindClose(hFind); + HeapFree(GetProcessHeap(), 0, szFileTypes); + return i; + } + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.pszText = backgroundItem->szDisplayName; + listItem.state = 0; + listItem.iImage = sfi.iIcon; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; + + (void)ListView_InsertItem(hwndBackgroundList, &listItem); + + pData->listViewItemCount++; + } + + if(!FindNextFile(hFind, &fd)) + break; + } + + token = _tcstok(NULL, separators); + FindClose(hFind); + } + + HeapFree(GetProcessHeap(), 0, szFileTypes); + + return i; +} + + +/* Add the images in the C:\ReactOS, the wallpaper directory and the current wallpaper if any */ +static VOID +AddListViewItems(HWND hwndDlg, PDATA pData) +{ + TCHAR szSearchPath[MAX_PATH]; LV_ITEM listItem; LV_COLUMN dummy; RECT clientRect; @@ -185,10 +293,7 @@ LONG result; UINT i = 0; BackgroundItem *backgroundItem = NULL; - TCHAR separators[] = TEXT(";"); - TCHAR *token; HWND hwndBackgroundList; - TCHAR *p; HRESULT hr; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -290,9 +395,7 @@ return; } - p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); - if (p) - *p = (TCHAR)0; + PathRemoveExtension(backgroundItem->szDisplayName); hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), wallpaperFilename); if (FAILED(hr)) @@ -323,116 +426,16 @@ } /* Add all the images in the C:\ReactOS directory. */ - - szFileTypes = GdipGetSupportedFileExtensions(); - if (!szFileTypes) - { - return; - } - - token = _tcstok(szFileTypes, separators); - while (token != NULL) - { - GetWindowsDirectory(szSearchPath, MAX_PATH); - - hr = StringCbCat(szSearchPath, sizeof(szSearchPath), TEXT("\\")); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - - hr = StringCbCat(szSearchPath, sizeof(szSearchPath), token); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - - hFind = FindFirstFile(szSearchPath, &fd); - while (hFind != INVALID_HANDLE_VALUE) - { - TCHAR filename[MAX_PATH]; - - GetWindowsDirectory(filename, MAX_PATH); - - hr = StringCbCat(filename, sizeof(filename), TEXT("\\")); - if (FAILED(hr)) - { - FindClose(hFind); - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - hr = StringCbCat(filename, sizeof(filename), fd.cFileName); - if (FAILED(hr)) - { - FindClose(hFind); - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - - /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ - if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcsicmp(wallpaperFilename, filename) != 0)) - { - himl = (HIMAGELIST)SHGetFileInfo(filename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); - - if (himl == NULL) - break; - - if (i++ == 0) - { - (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); - } - - backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; - - backgroundItem->bWallpaper = TRUE; - - hr = StringCbCopy(backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName), sfi.szDisplayName); - if (FAILED(hr)) - { - FindClose(hFind); - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); - if (p) - *p = (TCHAR)0; - hr = StringCbCopy(backgroundItem->szFilename, sizeof(backgroundItem->szFilename), filename); - if (FAILED(hr)) - { - FindClose(hFind); - HeapFree(GetProcessHeap(), 0, szFileTypes); - return; - } - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.pszText = backgroundItem->szDisplayName; - listItem.state = 0; - listItem.iImage = sfi.iIcon; - listItem.iItem = pData->listViewItemCount; - listItem.lParam = pData->listViewItemCount; - - (void)ListView_InsertItem(hwndBackgroundList, &listItem); - - pData->listViewItemCount++; - } - - if(!FindNextFile(hFind, &fd)) - break; - } - - token = _tcstok(NULL, separators); - FindClose(hFind); - } - - HeapFree(GetProcessHeap(), 0, szFileTypes); + if (GetWindowsDirectory(szSearchPath, MAX_PATH)) + { + i = AddWallpapersFromDirectory(i, hwndBackgroundList, backgroundItem, pData, wallpaperFilename, szSearchPath); + } + + /* Add all the images in the wallpaper directory. */ + if (SHRegGetPath(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion"), TEXT("WallpaperDir"), szSearchPath, 0) == ERROR_SUCCESS) + { + i = AddWallpapersFromDirectory(i, hwndBackgroundList, backgroundItem, pData, wallpaperFilename, szSearchPath); + } }

9 years, 9 months

[hbelusca] 66588: Revert tree-restructure attempt: r66583, r66582, r66581, r66578, sauf ntdll changes, r66576 and r66575 sauf mvdm changes (ok with Aleksander).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 14:33:02 2015 New Revision: 66588 URL: http://svn.reactos.org/svn/reactos?rev=66588&view=rev Log: Revert tree-restructure attempt: r66583, r66582, r66581, r66578, sauf ntdll changes, r66576 and r66575 sauf mvdm changes (ok with Aleksander). Added: trunk/reactos/base/services/svchost/ - copied from r66574, trunk/reactos/base/services/svchost/ trunk/reactos/base/system/services/ - copied from r66574, trunk/reactos/base/system/services/ trunk/reactos/dll/shellext/ - copied from r66574, trunk/reactos/dll/shellext/ trunk/reactos/dll/win32/advapi32/ - copied from r66574, trunk/reactos/dll/win32/advapi32/ trunk/reactos/dll/win32/browseui/ - copied from r66574, trunk/reactos/dll/win32/browseui/ trunk/reactos/dll/win32/ieframe/ - copied from r66574, trunk/reactos/dll/win32/ieframe/ trunk/reactos/dll/win32/kernel32/ - copied from r66574, trunk/reactos/dll/win32/kernel32/ trunk/reactos/dll/win32/kernel32_vista/ - copied from r66574, trunk/reactos/dll/win32/kernel32_vista/ trunk/reactos/dll/win32/mshtml/ - copied from r66574, trunk/reactos/dll/win32/mshtml/ trunk/reactos/dll/win32/mshtml.tlb/ - copied from r66574, trunk/reactos/dll/win32/mshtml.tlb/ trunk/reactos/dll/win32/shdoclc/ - copied from r66574, trunk/reactos/dll/win32/shdoclc/ trunk/reactos/dll/win32/shdocvw/ - copied from r66574, trunk/reactos/dll/win32/shdocvw/ trunk/reactos/dll/win32/shell32/ - copied from r66580, trunk/reactos/dll/win32/shell32/ trunk/reactos/dll/win32/shfolder/ - copied from r66580, trunk/reactos/dll/win32/shfolder/ trunk/reactos/dll/win32/shimgvw/ - copied from r66580, trunk/reactos/dll/win32/shimgvw/ trunk/reactos/dll/win32/shlwapi/ - copied from r66580, trunk/reactos/dll/win32/shlwapi/ trunk/reactos/dll/win32/url/ - copied from r66574, trunk/reactos/dll/win32/url/ trunk/reactos/dll/win32/urlmon/ - copied from r66574, trunk/reactos/dll/win32/urlmon/ trunk/reactos/subsystems/win/ - copied from r66574, trunk/reactos/subsystems/win/ trunk/reactos/subsystems/win32/ - copied from r66574, trunk/reactos/subsystems/win32/ trunk/reactos/win32ss/drivers/ - copied from r66574, trunk/reactos/win32ss/drivers/ trunk/reactos/win32ss/gdi/ - copied from r66574, trunk/reactos/win32ss/gdi/ trunk/reactos/win32ss/include/ - copied from r66574, trunk/reactos/win32ss/include/ trunk/reactos/win32ss/napi.h - copied unchanged from r66574, trunk/reactos/win32ss/napi.h trunk/reactos/win32ss/pch.h - copied unchanged from r66574, trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/reactx/ - copied from r66574, trunk/reactos/win32ss/reactx/ trunk/reactos/win32ss/sys-stubs.S - copied unchanged from r66574, trunk/reactos/win32ss/sys-stubs.S trunk/reactos/win32ss/user/ - copied from r66574, trunk/reactos/win32ss/user/ trunk/reactos/win32ss/w32ksvc.db - copied unchanged from r66574, trunk/reactos/win32ss/w32ksvc.db trunk/reactos/win32ss/w32ksvc.h - copied unchanged from r66574, trunk/reactos/win32ss/w32ksvc.h trunk/reactos/win32ss/win32k.h - copied unchanged from r66574, trunk/reactos/win32ss/win32k.h trunk/reactos/win32ss/win32k.rc - copied unchanged from r66574, trunk/reactos/win32ss/win32k.rc trunk/reactos/win32ss/win32k.spec - copied unchanged from r66574, trunk/reactos/win32ss/win32k.spec trunk/reactos/win32ss/win32kp.h - copied unchanged from r66574, trunk/reactos/win32ss/win32kp.h Removed: trunk/reactos/base/shell/browseui/ trunk/reactos/base/shell/ie/ trunk/reactos/base/shell/shell32/ trunk/reactos/base/shell/shellext/ trunk/reactos/base/shell/shfolder/ trunk/reactos/base/shell/shlwapi/ trunk/reactos/win32ss/base/ trunk/reactos/win32ss/core/ Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/base/shell/CMakeLists.txt trunk/reactos/base/system/CMakeLists.txt trunk/reactos/dll/CMakeLists.txt trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -3,6 +3,7 @@ add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(spoolsv) +add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) #add_subdirectory(tftpd) Modified: trunk/reactos/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/CMakeLists.txt?… ============================================================================== --- trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -1,11 +1,5 @@ -add_subdirectory(browseui) add_subdirectory(cmd) add_subdirectory(explorer) add_subdirectory(filebrowser) -add_subdirectory(ie) add_subdirectory(rshell) -add_subdirectory(shell32) -add_subdirectory(shfolder) -add_subdirectory(shlwapi) -add_subdirectory(shellext) Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -9,6 +9,7 @@ add_subdirectory(regsvr32) add_subdirectory(rundll32) add_subdirectory(runonce) +add_subdirectory(services) add_subdirectory(smss) add_subdirectory(subst) add_subdirectory(userinit) Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=665… ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -5,4 +5,5 @@ add_subdirectory(keyboard) add_subdirectory(ntdll) add_subdirectory(opengl) +add_subdirectory(shellext) add_subdirectory(win32) Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -1,7 +1,7 @@ include_directories( - ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv - ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv/frontends/gui) + ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv + ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv/frontends/gui) spec2def(console.dll console.spec) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -3,6 +3,7 @@ add_subdirectory(aclui) add_subdirectory(activeds) add_subdirectory(actxprxy) +add_subdirectory(advapi32) add_subdirectory(advpack) add_subdirectory(atl) add_subdirectory(atl100) @@ -13,6 +14,7 @@ add_subdirectory(batt) add_subdirectory(bcrypt) add_subdirectory(beepmidi) +add_subdirectory(browseui) add_subdirectory(cabinet) add_subdirectory(cards) add_subdirectory(cfgmgr32) @@ -50,6 +52,7 @@ add_subdirectory(httpapi) add_subdirectory(iccvid) add_subdirectory(icmp) +add_subdirectory(ieframe) add_subdirectory(iernonce) add_subdirectory(imaadp32.acm) add_subdirectory(imagehlp) @@ -65,6 +68,8 @@ add_subdirectory(itss) add_subdirectory(jscript) add_subdirectory(jsproxy) +add_subdirectory(kernel32) +add_subdirectory(kernel32_vista) add_subdirectory(loadperf) add_subdirectory(localspl) add_subdirectory(localui) @@ -95,7 +100,9 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) +add_subdirectory(mshtml) add_subdirectory(msi) +add_subdirectory(mshtml.tlb) add_subdirectory(msimg32) add_subdirectory(msimtf) add_subdirectory(msisip) @@ -173,6 +180,12 @@ add_subdirectory(setupapi) add_subdirectory(sfc) add_subdirectory(sfc_os) +add_subdirectory(shdoclc) +add_subdirectory(shdocvw) +add_subdirectory(shell32) +add_subdirectory(shfolder) +add_subdirectory(shimgvw) +add_subdirectory(shlwapi) add_subdirectory(slbcsp) add_subdirectory(smdll) add_subdirectory(sndblst) @@ -197,6 +210,8 @@ add_subdirectory(unicows) add_subdirectory(untfs) add_subdirectory(updspapi) +add_subdirectory(url) +add_subdirectory(urlmon) add_subdirectory(userenv) add_subdirectory(usp10) add_subdirectory(uxtheme) Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?… ============================================================================== --- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -1,2 +1,4 @@ add_subdirectory(mvdm) +add_subdirectory(win) +add_subdirectory(win32) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:33:02 2015 @@ -1,3 +1,235 @@ -add_subdirectory(base) -add_subdirectory(core) +set(USE_DIBLIB FALSE) + +# Give WIN32 subsystem its own project. +PROJECT(WIN32SS) + +add_subdirectory(drivers) + +if(USE_DIBLIB) + add_subdirectory(gdi/diblib) +endif() + +add_subdirectory(gdi/gdi32) +add_subdirectory(reactx) +add_subdirectory(user/user32) +add_subdirectory(user/winsrv) + +spec2def(win32k.sys win32k.spec ADD_IMPORTLIB) + +include_directories( + . + include + ${REACTOS_SOURCE_DIR}/ntoskrnl/include + ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +add_definitions( + -DLANGPACK + -D_WIN32K_) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib) + +list(APPEND GENDIB_FILES + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c + ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c) + +add_custom_command( + OUTPUT ${GENDIB_FILES} + COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib + DEPENDS native-gendib) + +list(APPEND SOURCE + gdi/dib/alphablend.c + gdi/dib/dib1bpp.c + gdi/dib/dib4bpp.c + gdi/dib/dib8bpp.c + gdi/dib/dib16bpp.c + gdi/dib/dib24bpp.c + gdi/dib/dib32bpp.c + gdi/dib/floodfill.c + gdi/dib/stretchblt.c + gdi/eng/alphablend.c + gdi/eng/bitblt.c + gdi/eng/engbrush.c + gdi/eng/engevent.c + gdi/eng/clip.c + gdi/eng/debug.c + gdi/eng/device.c + gdi/eng/driverobj.c + gdi/eng/error.c + gdi/eng/float.c + gdi/eng/gradient.c + gdi/eng/lineto.c + gdi/eng/ldevobj.c + gdi/eng/mapping.c + gdi/eng/math.c + gdi/eng/mem.c + gdi/eng/engmisc.c + gdi/eng/mouse.c + gdi/eng/paint.c + gdi/eng/pdevobj.c + gdi/eng/perfcnt.c + gdi/eng/rlecomp.c + gdi/eng/semaphor.c + gdi/eng/sort.c + gdi/eng/string.c + gdi/eng/stretchblt.c + gdi/eng/surface.c + gdi/eng/transblt.c + gdi/eng/engwindow.c + gdi/eng/xlateobj.c + user/ntuser/main.c + user/ntuser/misc/file.c + user/ntuser/misc/rtlstr.c + user/ntuser/misc/copy.c + user/ntuser/misc/registry.c + reactx/ntddraw/ddraw.c + reactx/ntddraw/dd.c + reactx/ntddraw/ddsurf.c + reactx/ntddraw/d3d.c + reactx/ntddraw/dvp.c + reactx/ntddraw/mocomp.c + reactx/ntddraw/eng.c + reactx/ntddraw/dxeng.c + user/ntuser/accelerator.c + user/ntuser/callback.c + user/ntuser/callproc.c + user/ntuser/caret.c + user/ntuser/class.c + user/ntuser/clipboard.c + user/ntuser/csr.c + user/ntuser/cursoricon.c + user/ntuser/dde.c + user/ntuser/defwnd.c + user/ntuser/desktop.c + user/ntuser/display.c + user/ntuser/draw.c + user/ntuser/event.c + user/ntuser/focus.c + user/ntuser/guicheck.c + user/ntuser/hook.c + user/ntuser/hotkey.c + user/ntuser/input.c + user/ntuser/ime.c + user/ntuser/keyboard.c + user/ntuser/kbdlayout.c + user/ntuser/menu.c + user/ntuser/message.c + user/ntuser/metric.c + user/ntuser/misc.c + user/ntuser/monitor.c + user/ntuser/mouse.c + user/ntuser/msgqueue.c + user/ntuser/ntstubs.c + user/ntuser/ntuser.c + user/ntuser/painting.c + user/ntuser/prop.c + user/ntuser/scrollbar.c + user/ntuser/session.c + user/ntuser/shutdown.c + user/ntuser/simplecall.c + user/ntuser/sysparams.c + user/ntuser/timer.c + user/ntuser/useratom.c + user/ntuser/usrheap.c + user/ntuser/vis.c + user/ntuser/windc.c + user/ntuser/window.c + user/ntuser/winpos.c + user/ntuser/winsta.c + user/ntuser/object.c + gdi/ntgdi/arc.c + gdi/ntgdi/bezier.c + gdi/ntgdi/bitblt.c + gdi/ntgdi/bitmaps.c + gdi/ntgdi/brush.c + gdi/ntgdi/cliprgn.c + gdi/ntgdi/coord.c + gdi/ntgdi/dcattr.c + gdi/ntgdi/dclife.c + gdi/ntgdi/dcobjs.c + gdi/ntgdi/dcstate.c + gdi/ntgdi/dcutil.c + gdi/ntgdi/device.c + gdi/ntgdi/dibobj.c + gdi/ntgdi/drawing.c + gdi/ntgdi/fillshap.c + gdi/ntgdi/font.c + gdi/ntgdi/freetype.c + gdi/ntgdi/gdibatch.c + gdi/ntgdi/gdidbg.c + gdi/ntgdi/gdiobj.c + gdi/ntgdi/gdipool.c + gdi/ntgdi/icm.c + gdi/ntgdi/init.c + gdi/ntgdi/line.c + gdi/ntgdi/metafile.c + gdi/ntgdi/palette.c + gdi/ntgdi/path.c + gdi/ntgdi/pen.c + gdi/ntgdi/polyfill.c + gdi/ntgdi/print.c + gdi/ntgdi/rect.c + gdi/ntgdi/region.c + gdi/ntgdi/stockobj.c + gdi/ntgdi/text.c + gdi/ntgdi/wingl.c + gdi/ntgdi/xformobj.c + gdi/eng/stubs.c + gdi/eng/umpdstubs.c + pch.h) + +if(USE_DIBLIB) + add_definitions(-D_USE_DIBLIB_) + list(APPEND SOURCE + gdi/dib/dib_new.c + gdi/eng/bitblt_new.c) +else() + list(APPEND SOURCE + gdi/dib/dib.c + gdi/eng/copybits.c + ${GENDIB_FILES}) +endif() + +if(ARCH STREQUAL "i386") +list(APPEND ASM_SOURCE + gdi/dib/i386/dib24bpp_hline.s + gdi/dib/i386/dib32bpp_hline.s + gdi/dib/i386/dib32bpp_colorfill.s + gdi/eng/i386/floatobj.S) +else() +list(APPEND SOURCE + gdi/dib/dib24bppc.c + gdi/dib/dib32bppc.c) +endif() + +if(KDBG) + list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c) +endif() + +add_asm_files(win32k_asm ${ASM_SOURCE}) + +add_library(win32k SHARED + ${SOURCE} + ${win32k_asm} + win32k.rc + ${CMAKE_CURRENT_BINARY_DIR}/win32k.def) + +set_module_type(win32k kernelmodedriver) +target_link_libraries(win32k ${PSEH_LIB} dxguid libcntpr) + +if(USE_DIBLIB) + target_link_libraries(win32k diblib) +endif() + +add_importlibs(win32k ntoskrnl hal ftfd) +add_pch(win32k pch.h SOURCE) +add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) + +set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) +add_asm_files(win32ksys_asm sys-stubs.S) +add_library(win32ksys ${win32ksys_asm}) +set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")

9 years, 9 months

[hbelusca] 66587: Revert r66580 and r66579.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 14:31:32 2015 New Revision: 66587 URL: http://svn.reactos.org/svn/reactos?rev=66587&view=rev Log: Revert r66580 and r66579. Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/w32knapi/CMakeLists.txt Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:31:32 2015 @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/win32ss/core) +include_directories(${REACTOS_SOURCE_DIR}/win32ss) list(APPEND SOURCE AddFontResource.c Modified: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Fri Mar 6 14:31:32 2015 @@ -1,6 +1,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/win32ss/core/include) +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include) list(APPEND SOURCE osver.c

9 years, 9 months

[cwittich] 66586: revert r66585

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Mar 6 11:49:28 2015 New Revision: 66586 URL: http://svn.reactos.org/svn/reactos?rev=66586&view=rev Log: revert r66585 Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Mar 6 11:49:28 2015 @@ -306,7 +306,7 @@ /* Check if the CPU is too old to support SYSENTER */ if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0300))) + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) { /* Disable it */ Reg[3] &= ~0x800;

9 years, 9 months

[cwittich] 66585: [NTOSKRNL] disable sysenter on Pentium Pro http://lkml.iu.edu/hypermail/linux/kernel/0308.2/1534.html CORE-6582

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Mar 6 09:29:50 2015 New Revision: 66585 URL: http://svn.reactos.org/svn/reactos?rev=66585&view=rev Log: [NTOSKRNL] disable sysenter on Pentium Pro http://lkml.iu.edu/hypermail/linux/kernel/0308.2/1534.html CORE-6582 Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Mar 6 09:29:50 2015 @@ -306,7 +306,7 @@ /* Check if the CPU is too old to support SYSENTER */ if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0300))) { /* Disable it */ Reg[3] &= ~0x800;

9 years, 9 months

[hbelusca] 66584: [MSTSC]: Add support for 32-bit colour. Patch by 'hater'. CORE-9322 #resolve #comment Committed in r66584, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 6 02:16:00 2015 New Revision: 66584 URL: http://svn.reactos.org/svn/reactos?rev=66584&view=rev Log: [MSTSC]: Add support for 32-bit colour. Patch by 'hater'. CORE-9322 #resolve #comment Committed in r66584, thanks! Modified: trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/bg-BG.rc trunk/reactos/base/applications/mstsc/lang/ca-ES.rc trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/lang/el-GR.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/es-ES.rc trunk/reactos/base/applications/mstsc/lang/fr-FR.rc trunk/reactos/base/applications/mstsc/lang/he-IL.rc trunk/reactos/base/applications/mstsc/lang/it-IT.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ko-KR.rc trunk/reactos/base/applications/mstsc/lang/lt-LT.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc trunk/reactos/base/applications/mstsc/lang/pl-PL.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/sk-SK.rc trunk/reactos/base/applications/mstsc/lang/sq-AL.rc trunk/reactos/base/applications/mstsc/lang/sv-SE.rc trunk/reactos/base/applications/mstsc/lang/tr-TR.rc trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/mstsc/lang/zh-CN.rc trunk/reactos/base/applications/mstsc/lang/zh-TW.rc trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… ============================================================================== --- trunk/reactos/base/applications/mstsc/bsops.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/bsops.c [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -228,13 +228,7 @@ return data[(y * 2) * width + (x * 2)] != 0 || data[(y * 2) * width + (x * 2) + 1] != 0; } - else if (bpp == 24) - { - return data[(y * 3) * width + (x * 3)] != 0 || - data[(y * 3) * width + (x * 3) + 1] != 0 || - data[(y * 3) * width + (x * 3) + 2] != 0; - } - else if (bpp == 32) + else if (bpp == 24 || bpp == 32) { return data[(y * 4) * width + (x * 4)] != 0 || data[(y * 4) * width + (x * 4) + 1] != 0 || @@ -276,6 +270,10 @@ else if (bpp == 15 || bpp == 16) { ((unsigned short *) data)[y * width + x] = pixel; + } + else if (bpp == 24 || bpp == 32) + { + ((unsigned int *) data)[y * width + x] = (unsigned int) pixel; } } Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -669,7 +669,7 @@ PSETTINGS_ENTRY Current; DWORD index, i, num; DWORD MaxBpp = 0; - UINT types[4]; + UINT types[5]; pInfo->CurrentDisplayDevice = pInfo->DisplayDeviceList; /* Update global variable */ @@ -686,10 +686,11 @@ } switch (MaxBpp) { - case 32: - case 24: num = 4; break; - case 16: num = 3; break; - case 8: num = 1; break; + case 32: num = 4; break; + case 24: num = 3; break; + case 16: num = 2; break; + case 15: num = 1; break; + case 8: num = 0; break; default: num = 0; break; } @@ -697,6 +698,7 @@ types[1] = IDS_HIGHCOLOR15; types[2] = IDS_HIGHCOLOR16; types[3] = IDS_HIGHCOLOR24; + types[4] = IDS_HIGHCOLOR32; /* Fill color depths combo box */ SendDlgItemMessageW(pInfo->hDisplayPage, Modified: trunk/reactos/base/applications/mstsc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/bg-BG.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "ÐÐ¸ÑÐ¾ÐºÐ° ÑÐ²ÐµÑÐ½Ð¾ÑÑ (15 ÑÐ°Ð·ÑÑÐ´Ð°)" IDS_HIGHCOLOR16 "ÐÐ¸ÑÐ¾ÐºÐ° ÑÐ²ÐµÑÐ½Ð¾ÑÑ (16 ÑÐ°Ð·ÑÑÐ´Ð°)" IDS_HIGHCOLOR24 "ÐÑÑÐ¸Ð½ÑÐºÐ° ÑÐ²ÐµÑÐ½Ð¾ÑÑ (24 ÑÐ°Ð·ÑÑÐ´Ð°)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu ÑÐ¾ÑÐºÐ¸" IDS_FULLSCREEN "Ð¦ÑÐ» ÐµÐºÑÐ°Ð½" IDS_BROWSESERVER "<ÐÐ±Ð·Ð¾Ñ Ð·Ð° Ð¾ÑÐµ...>" Modified: trunk/reactos/base/applications/mstsc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ca-ES.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 Colors (15 bit)" IDS_HIGHCOLOR16 "65,536 Colors (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Colors (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Pantalla Complerta" IDS_BROWSESERVER "<Navega per mÃ©s...>" Modified: trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/cs-CZ.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 Barev (15 bit)" IDS_HIGHCOLOR16 "65,536 Barev (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Barev (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu PixelÅ¯" IDS_FULLSCREEN "CelÃ¡ obrazovka" IDS_BROWSESERVER "<NajÃt dalÅ¡Ã...>" Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 Farben (15 bit)" IDS_HIGHCOLOR16 "65,536 Farben (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Farben (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixel" IDS_FULLSCREEN "Vollbild" IDS_BROWSESERVER "<Nach mehr suchen...>" Modified: trunk/reactos/base/applications/mstsc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/el-GR.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 ÏÏÏÎ¼Î±ÏÎ± (15 bit)" IDS_HIGHCOLOR16 "65,536 ÏÏÏÎ¼Î±ÏÎ± (16 bit)" IDS_HIGHCOLOR24 "16,777,216 ÏÏÏÎ¼Î±ÏÎ± (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Î Î»Î®ÏÎ·Ï Î¿Î¸ÏÎ½Î·" IDS_BROWSESERVER "<ÎÎ½Î±Î¶Î®ÏÎ·ÏÎ· Î³Î¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ±...>" Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -52,9 +52,10 @@ IDS_TAB_GENERAL "General" IDS_TAB_DISPLAY "Display" IDS_256COLORS "256 Colors" - IDS_HIGHCOLOR15 "32,768 Colors (15 bit)" - IDS_HIGHCOLOR16 "65,536 Colors (16 bit)" - IDS_HIGHCOLOR24 "16,777,216 Colors (24 bit)" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Full Screen" IDS_BROWSESERVER "<Browse for more...>" Modified: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/es-ES.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 colores (15 bit)" IDS_HIGHCOLOR16 "65,536 colores (16 bit)" IDS_HIGHCOLOR24 "16,777,216 colores (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu pÃxeles" IDS_FULLSCREEN "Pantalla completa" IDS_BROWSESERVER "<Buscar mÃ¡s...>" Modified: trunk/reactos/base/applications/mstsc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/fr-FR.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 Couleurs (15 bit)" IDS_HIGHCOLOR16 "65,536 Couleurs (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Couleurs (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Plein Ã©cran" IDS_BROWSESERVER "<Parcourir pour plus...>" Modified: trunk/reactos/base/applications/mstsc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/he-IL.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 ×¦××¢×× (15 ×¡×××××ª)" IDS_HIGHCOLOR16 "65,536 ×¦××¢×× (16 ×¡×××××ª)" IDS_HIGHCOLOR24 "16,777,216 ×¦××¢×× (24 ×¡×××××ª)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu ×¤××§×¡×××" IDS_FULLSCREEN "××¡× ×××" IDS_BROWSESERVER "<Browse for more...>" Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 colori (15 bit)" IDS_HIGHCOLOR16 "65.536 colori (16 bit)" IDS_HIGHCOLOR24 "16,777,216 colori (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixel" IDS_FULLSCREEN "Schermo Intero" IDS_BROWSESERVER "<Cerca...>" Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ja-JP.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 è² (15 ããã)" IDS_HIGHCOLOR16 "65,536 è² (16 ããã)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ããã)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lu x %lu ãã¯ã»ã«" IDS_FULLSCREEN "å¨ç»é¢è¡¨ç¤º" IDS_BROWSESERVER "<åç§...>" Modified: trunk/reactos/base/applications/mstsc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ko-KR.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 ì (15 ë¹í¸)" IDS_HIGHCOLOR16 "65,536 ì (16 ë¹í¸)" IDS_HIGHCOLOR24 "16,777,216 ì (24 ë¹í¸)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu í½ì" IDS_FULLSCREEN "ìµë íë©´" IDS_BROWSESERVER "<ë ë§ì´...>" Modified: trunk/reactos/base/applications/mstsc/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/lt-LT.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 spalvos (15 bitÅ³)" IDS_HIGHCOLOR16 "65,536 spalvos (16 bitÅ³)" IDS_HIGHCOLOR24 "16,777,216 spalvÅ³ (24 bitai)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu taÅ¡kÅ³" IDS_FULLSCREEN "Visas ekranas" IDS_BROWSESERVER "<Daugiau...>" Modified: trunk/reactos/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -55,6 +55,7 @@ IDS_HIGHCOLOR15 "32,768 Farger (15 bit)" IDS_HIGHCOLOR16 "65,536 Farger (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Farger (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Piksler" IDS_FULLSCREEN "Full skjerm" IDS_BROWSESERVER "<Bla gjennom etter flere...>" Modified: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/pl-PL.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -65,6 +65,7 @@ IDS_HIGHCOLOR15 "32,768 kolorÃ³w (15 bit)" IDS_HIGHCOLOR16 "65,536 kolorÃ³w (16 bit)" IDS_HIGHCOLOR24 "16,777,216 kolorÃ³w (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu pikseli" IDS_FULLSCREEN "PeÅny ekran" IDS_BROWSESERVER "<Wybierz inne...>" Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ro-RO.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -62,6 +62,7 @@ IDS_HIGHCOLOR15 "32,768 culori (15 biÈi)" IDS_HIGHCOLOR16 "65,536 culori (16 biÈi)" IDS_HIGHCOLOR24 "16,777,216 culori (24 biÈi)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu pixeli" IDS_FULLSCREEN "Pe tot ecranul" IDS_BROWSESERVER "<CÄutare mai multeâ¦>" Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 ÑÐ²ÐµÑÐ¾Ð² (15 Ð±Ð¸Ñ)" IDS_HIGHCOLOR16 "65,536 ÑÐ²ÐµÑÐ¾Ð² (16 Ð±Ð¸Ñ)" IDS_HIGHCOLOR24 "16,777,216 ÑÐ²ÐµÑÐ¾Ð² (24 Ð±Ð¸Ñ)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lu Ð½Ð° %lu Ð¿Ð¸ÐºÑÐµÐ»ÐµÐ¹" IDS_FULLSCREEN "ÐÐ¾Ð»Ð½ÑÐ¹ ÑÐºÑÐ°Ð½" IDS_BROWSESERVER "<Ð£ÐºÐ°Ð·Ð°ÑÑ Ð¿ÑÑÑ...>" Modified: trunk/reactos/base/applications/mstsc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sk-SK.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -59,6 +59,7 @@ IDS_HIGHCOLOR15 "32,768 farieb (15 bitov)" IDS_HIGHCOLOR16 "65,536 farieb (16 bitov)" IDS_HIGHCOLOR24 "16,777,216 farieb (24 bitov)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu pixelov" IDS_FULLSCREEN "CelÃ¡ obrazovka" IDS_BROWSESERVER "<PrehÄ¾adÃ¡vaÅ¥ pre viac...>" Modified: trunk/reactos/base/applications/mstsc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sq-AL.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -59,6 +59,7 @@ IDS_HIGHCOLOR15 "32,768 Ngjyra (15 bit)" IDS_HIGHCOLOR16 "65,536 Ngjyra (16 bit)" IDS_HIGHCOLOR24 "16,777,216 Ngjyra (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Ekran i plote" IDS_BROWSESERVER "<Shfleto pÃ«r mÃ« shume...>" Modified: trunk/reactos/base/applications/mstsc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/sv-SE.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -62,6 +62,7 @@ IDS_HIGHCOLOR15 "32,768 FÃ¤rger (15 bit)" IDS_HIGHCOLOR16 "65,536 FÃ¤rger (16 bit)" IDS_HIGHCOLOR24 "16,777,216 FÃ¤rger (24 bit)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu Pixlar" IDS_FULLSCREEN "FullskÃ¤rm" IDS_BROWSESERVER "<BlÃ¤ddra efter fler...>" Modified: trunk/reactos/base/applications/mstsc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/tr-TR.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 (15 Bitlik) Renk" IDS_HIGHCOLOR16 "65,536 (16 Bitlik) Renk" IDS_HIGHCOLOR24 "16,777,216 (24 Bitlik) Renk" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lu*%lu Nokta" IDS_FULLSCREEN "TÃ¼m GÃ¶rÃ¼ntÃ¼lÃ¼k" IDS_BROWSESERVER "(Daha ÃoÄu Ä°Ã§in GÃ¶z At...)" Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -63,6 +63,7 @@ IDS_HIGHCOLOR15 "32,768 ÐºÐ¾Ð»ÑÐ¾ÑÑÐ² (15 Ð±ÑÑ)" IDS_HIGHCOLOR16 "65,536 ÐºÐ¾Ð»ÑÐ¾ÑÑÐ² (16 Ð±ÑÑ)" IDS_HIGHCOLOR24 "16,777,216 ÐºÐ¾Ð»ÑÐ¾ÑÑÐ² (24 Ð±ÑÑÐ¸)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lu Ð½Ð° %lu ÐºÑÐ°Ð¿Ð¾Ðº" IDS_FULLSCREEN "ÐÐ° Ð²ÐµÑÑ ÐµÐºÑÐ°Ð½" IDS_BROWSESERVER "<ÐÐ¾ÑÑÐº ÑÐ½ÑÐ¸Ñ...>" Modified: trunk/reactos/base/applications/mstsc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-CN.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -57,6 +57,7 @@ IDS_HIGHCOLOR15 "32,768 è² (15 ä½)" IDS_HIGHCOLOR16 "65,536 è² (16 ä½)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ä½)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu åç´ " IDS_FULLSCREEN "å¨å±" IDS_BROWSESERVER "<æµè§æ´å¤...>" Modified: trunk/reactos/base/applications/mstsc/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/zh-TW.rc [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -62,6 +62,7 @@ IDS_HIGHCOLOR15 "32,768 è² (15 ä½å)" IDS_HIGHCOLOR16 "65,536 è² (16 ä½å)" IDS_HIGHCOLOR24 "16,777,216 è² (24 ä½å)" + IDS_HIGHCOLOR32 "Highest Quality (32 bit)" IDS_PIXEL "%lux%lu åç´ " IDS_FULLSCREEN "å¨å±å¹" IDS_BROWSESERVER "<çè¦½æ´å¤...>" Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/resource.h [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -6,6 +6,7 @@ #define IDS_HIGHCOLOR15 15 #define IDS_HIGHCOLOR16 16 #define IDS_HIGHCOLOR24 24 +#define IDS_HIGHCOLOR32 32 #define IDD_CONNECTDIALOG 101 #define IDD_GENERAL 105 Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… ============================================================================== --- trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/uimain.c [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -38,8 +38,7 @@ RD_BOOL g_bitmap_cache_precache = True; RD_BOOL g_bitmap_cache = True; RD_BOOL g_encryption = True; -int g_server_depth = 8; -RD_BOOL g_use_rdp5 = False; +int g_server_depth = 16; int g_width = 800; int g_height = 600; uint32 g_keylayout = 0x409; /* Defaults to US keyboard layout */ Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Fri Mar 6 02:16:00 2015 @@ -942,6 +942,10 @@ } } } + else if (g_server_depth == 24 || g_server_depth == 32) + { + memcpy(bits, data, cx*cy*4); + } dc = CreateCompatibleDC(maindc); if (dc == 0) { @@ -1116,7 +1120,6 @@ strcpy(g_password, ""); strcpy(g_hostname, tcp_get_address()); g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); - if (g_server_depth > 16) g_server_depth = 16; /* hack, we don't support 24bpp yet */ g_screen_width = GetSystemMetrics(SM_CXSCREEN); g_screen_height = GetSystemMetrics(SM_CYSCREEN); g_width = GetIntegerFromSettings(pRdpSettings, L"desktopwidth"); @@ -1192,11 +1195,11 @@ { SPLIT_COLOUR16(colour, red, green, blue); } - else - { - red = 0; - green = 0; - blue = 0; + else if (g_server_depth == 24 || g_server_depth == 32) + { + red = (colour>>16)&0xff; + green = (colour>>8)&0xff; + blue = colour&0xff; } maindc = GetWindowDC(g_Wnd); rgn = mi_clip(maindc); @@ -1237,11 +1240,11 @@ { SPLIT_COLOUR16(colour, red, green, blue); } - else - { - red = 0; - green = 0; - blue = 0; + else if (g_server_depth == 24 || g_server_depth == 32) + { + red = (colour>>16)&0xff; + green = (colour>>8)&0xff; + blue = colour&0xff; } maindc = GetWindowDC(g_Wnd); rgn = mi_clip(maindc);

9 years, 9 months

← Newer
1
...
39
40
41
42
43
44
45
...
50
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 March 2015