[dreimer] 61640: [MPLAY32] Three patches for mplay32 by Ricardo Hanke. Some more or less heavy tabs->spaces fixing and removing of spaces which are too much by myself CORE-7590 #resolve CORE-7594 #...

Author: dreimer
Date: Wed Jan 15 23:59:44 2014
New Revision: 61640

URL: http://svn.reactos.org/svn/reactos?rev=61640&view=rev
Log:
[MPLAY32]
Three patches for mplay32 by Ricardo Hanke. Some more or less heavy tabs->spaces fixing
and removing of spaces which are too much by myself
CORE-7590 #resolve
CORE-7594 #resolve
CORE-7613 #resolve

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] Wed Jan 15 23:59:44
2014
@@ -12,6 +12,12 @@
         MENUITEM "&Затваряне", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "Из&ход", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "Помо&щ"
     BEGIN
@@ -31,4 +37,5 @@
     IDS_TOOLTIP_FORWARD "Търсене напред"
     IDS_APPTITLE "Мултимедийният възпроизводител на
РеактОС"
     IDS_PLAY "Възпроизвеждане"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -13,6 +13,12 @@
         MENUITEM "&Zavřít", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Ukončit", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Nápověda"
     BEGIN
@@ -32,4 +38,5 @@
     IDS_TOOLTIP_FORWARD "Přeskočit vpřed"
     IDS_APPTITLE "ReactOS Přehrávač multimédií"
     IDS_PLAY "Přehrát"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "Sch&ließen", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Beenden", IDM_EXIT
+    END
+    POPUP "&Gerät"
+    BEGIN
+        MENUITEM "&Eigenschaften", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Lautstärkeregelung", IDM_VOLUMECTL
     END
     POPUP "&Hilfe"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Weiter"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Abspielen"
+    IDS_DEFAULTMCIERRMSG "Für diesen Fehler steht keine Beschreibung zur
Verfügung"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Close", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Exit", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Help"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Skip Forward"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Cerrar", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Salir", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "Ay&uda"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Marca siguiente"
     IDS_APPTITLE "Reproductor Multimedia de ReactOS"
     IDS_PLAY "Reproducir"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Fermer", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Quitter", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Aide"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Suivant"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Lire"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&סגור", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&יציאה", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&עזרה"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "דלג קדימה"
     IDS_APPTITLE "× ×’×Ÿ המולטימדיה של ReactOS"
     IDS_PLAY "× ×’×Ÿ"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Chiudi", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Esci", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Aiuto"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Successivo"
     IDS_APPTITLE "Riproduttore multimediale ReactOS"
     IDS_PLAY "Riproduci"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "閉じる(&C)", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "終了(&E)", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "ヘルプ(&H)"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "前へスキップ"
     IDS_APPTITLE "ReactOS マルチメディア プレーヤー"
     IDS_PLAY "再生"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Sluiten", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Afsluiten", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Help"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Volgende"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Play"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Lukk", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Avslutt", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Hjelp"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Spole fremover"
     IDS_APPTITLE "ReactOS Multimedia avspiller"
     IDS_PLAY "Spill"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -15,6 +15,12 @@
         MENUITEM "&Zamknij", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Wyjdź", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Pomoc"
     BEGIN
@@ -34,4 +40,5 @@
     IDS_TOOLTIP_FORWARD "Przeskocz do przodu"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Odtwórz"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -10,6 +10,12 @@
         MENUITEM "&Fechar", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Sair", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "A&juda"
     BEGIN
@@ -29,4 +35,5 @@
     IDS_TOOLTIP_FORWARD "Pular Próxima"
     IDS_APPTITLE "ReactOS Multimedia Player"
     IDS_PLAY "Executar"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -15,6 +15,12 @@
         MENUITEM "Î&nchide", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "I&eșire", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&?"
     BEGIN
@@ -34,4 +40,5 @@
     IDS_TOOLTIP_FORWARD "Salt la următor"
     IDS_APPTITLE "Lector multimedia"
     IDS_PLAY "Lecturare"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -8,6 +8,12 @@
         MENUITEM "&Закрыть", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Выход", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Помощь"
     BEGIN
@@ -27,4 +33,5 @@
     IDS_TOOLTIP_FORWARD "Вперед"
     IDS_APPTITLE "Проигрыватель ReactOS"
     IDS_PLAY "Воспроизвести"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -13,6 +13,12 @@
         MENUITEM "&Zavrieť", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "S&končiť", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Pomocník"
     BEGIN
@@ -32,4 +38,5 @@
     IDS_TOOLTIP_FORWARD "Preskočiť dopredu"
     IDS_APPTITLE "Multimediálny prehrávač systému ReactOS"
     IDS_PLAY "Prehrať"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -12,6 +12,12 @@
         MENUITEM "&Mbylle", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Dil", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Ndihmë"
     BEGIN
@@ -31,4 +37,5 @@
     IDS_TOOLTIP_FORWARD "Kalo para"
     IDS_APPTITLE "Programi muzikor i ReactOS"
     IDS_PLAY "Fillo"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -15,6 +15,12 @@
         MENUITEM "&Stäng", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Avsluta", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Hjälp"
     BEGIN
@@ -34,4 +40,5 @@
     IDS_TOOLTIP_FORWARD "Spola fremåt"
     IDS_APPTITLE "ReactOS Multimediaspelare"
     IDS_PLAY "Play"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -10,6 +10,12 @@
         MENUITEM "&Kapat", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "&Çıkış", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "&Yardım"
     BEGIN
@@ -29,4 +35,5 @@
     IDS_TOOLTIP_FORWARD "Bir Sonraki"
     IDS_APPTITLE "Ortam Oynatıcısı"
     IDS_PLAY "Çal"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -17,6 +17,12 @@
         MENUITEM SEPARATOR
         MENUITEM "&Вихід", IDM_EXIT
     END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
+    END
     POPUP "&Довідка"
     BEGIN
         MENUITEM "&Про програму...", IDM_ABOUT
@@ -35,4 +41,5 @@
     IDS_TOOLTIP_FORWARD "Вперед"
     IDS_APPTITLE "Програвач ReactOS"
     IDS_PLAY "Відтворити"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -10,6 +10,12 @@
         MENUITEM "关闭(&C)", IDM_CLOSE_FILE
         MENUITEM SEPARATOR
         MENUITEM "退出(&E)", IDM_EXIT
+    END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
     END
     POPUP "帮助(&H)"
     BEGIN
@@ -29,4 +35,5 @@
     IDS_TOOLTIP_FORWARD "向前跳过"
     IDS_APPTITLE "ReactOS 多媒体播放器"
     IDS_PLAY "播放"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -17,6 +17,12 @@
         MENUITEM SEPARATOR
         MENUITEM "結束(&E)", IDM_EXIT
     END
+    POPUP "&Device"
+    BEGIN
+        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM SEPARATOR
+        MENUITEM "&Volume Control", IDM_VOLUMECTL
+    END
     POPUP "說明(&H)"
     BEGIN
         MENUITEM "關於(&A)...", IDM_ABOUT
@@ -35,4 +41,5 @@
     IDS_TOOLTIP_FORWARD "快轉"
     IDS_APPTITLE "ReactOS 多媒體播放器"
     IDS_PLAY "播放"
+    IDS_DEFAULTMCIERRMSG "No description is available for this error"
 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] Wed Jan 15 23:59:44
2014
@@ -12,6 +12,7 @@
 HINSTANCE hInstance = NULL;
 HWND hTrackBar = NULL;
 HWND hToolBar = NULL;
+HMENU hMainMenu = NULL;
 TCHAR szAppTitle[256] = _T("");
 TCHAR szPrevFile[MAX_PATH] = _T("\0");
 WORD wDeviceId;
@@ -19,17 +20,6 @@
 BOOL bIsPaused = FALSE;
 UINT MaxFilePos = 0;
 
-/* Known types table */
-static const TYPEBYEXT ExtTypes[] =
-{
-    { _T(".wav"),  WAVE_FILE    },
-    { _T(".wave"), WAVE_FILE    },
-    { _T(".mid"),  MIDI_FILE    },
-    { _T(".midi"), MIDI_FILE    },
-    { _T(".cda"),  AUDIOCD_FILE },
-    { _T(".avi"),  AVI_FILE     },
-    { _T("\0"),        0        }
-};
 
 /* ToolBar Buttons */
 static const TBBUTTON Buttons[] =
@@ -44,6 +34,26 @@
     {TBICON_FORWARD,   IDC_FORWARD,  TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}
 };
 
+void EnableMenuItems(void)
+{
+    MCI_GENERIC_PARMS mciGeneric;
+    DWORD dwError;
+
+    EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_ENABLED);
+
+    dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_TEST,
(DWORD_PTR)&mciGeneric);
+    if (dwError == 0)
+    {
+        EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_ENABLED);
+    }
+}
+
+void DisableMenuItems(void)
+{
+    EnableMenuItem(hMainMenu, IDM_CLOSE_FILE, MF_BYCOMMAND | MF_GRAYED);
+    EnableMenuItem(hMainMenu, IDM_DEVPROPS, MF_BYCOMMAND | MF_GRAYED);
+}
+
 static VOID
 SetImageList(HWND hwnd)
 {
@@ -89,6 +99,21 @@
                                               TB_SETIMAGELIST,
                                               0,
                                               (LPARAM)hImageList));
+}
+
+static VOID
+ShowMCIError(HWND hwnd, DWORD dwError)
+{
+    TCHAR szErrorMessage[256];
+    TCHAR szTempMessage[300];
+    
+    if (mciGetErrorString(dwError, szErrorMessage, sizeof(szErrorMessage) /
sizeof(TCHAR)) == FALSE)
+    {
+        LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage,
sizeof(szErrorMessage) / sizeof(TCHAR));
+    }
+
+    _stprintf(szTempMessage, _T("MMSYS%u: %s"), dwError, szErrorMessage);
+    MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION);
 }
 
 static VOID
@@ -141,43 +166,39 @@
     SendMessage(hToolBar, TB_ADDBUTTONS, NumButtons, (LPARAM)Buttons);
 }
 
-static UINT
-IsSupportedFileExtension(LPTSTR lpFileName)
-{
-    TCHAR szExt[MAX_PATH];
-    INT DotPos = 0, i, j;
-
-    for (i = _tcslen(lpFileName); i >= 0; --i)
-    {
-        if (lpFileName[i] == '.')
-        {
-            DotPos = _tcslen(lpFileName) - i;
-            break;
-        }
-    }
-
-    if (!DotPos) return UNSUPPORTED_FILE;
-
-    szExt[DotPos + 1] = _T('\0');
-    for (i = _tcslen(lpFileName), j = DotPos; j >= 0; --i, --j)
-    {
-        szExt[j] = lpFileName[i];
-    }
-
-    for (i = 0; ; i++)
-    {
-        if (ExtTypes[i].uType == UNSUPPORTED_FILE)
-        {
-            return UNSUPPORTED_FILE;
-        }
-
-        if (_tcscmp(ExtTypes[i].szExt, szExt) == 0)
-        {
-            return ExtTypes[i].uType;
-        }
-    }
-
-    return UNSUPPORTED_FILE;
+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 DWORD
@@ -192,6 +213,8 @@
         if (dwError) return dwError;
         bIsOpened = FALSE;
     }
+
+    DisableMenuItems();
 
     return TRUE;
 }
@@ -218,7 +241,7 @@
     dwError = mciSendCommand(0, MCI_OPEN, MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT,
(DWORD_PTR)&mciOpen);
     if (dwError != 0)
     {
-        MessageBox(0, _T("Can't open device! (1)"), NULL, MB_OK);
+        ShowMCIError(hwnd, dwError);
         return dwError;
     }
 
@@ -227,7 +250,7 @@
     dwError = mciSendCommand(mciOpen.wDeviceID, MCI_STATUS, MCI_STATUS_ITEM | MCI_WAIT,
(DWORD_PTR)&mciStatus);
     if (dwError != 0)
     {
-        MessageBox(0, _T("Can't open device! (2)"), NULL, MB_OK);
+        ShowMCIError(hwnd, dwError);
         return dwError;
     }
 
@@ -261,6 +284,9 @@
     wDeviceId = mciOpen.wDeviceID;
     bIsOpened = TRUE;
     _tcscpy(szPrevFile, lpFileName);
+
+    EnableMenuItems();
+
     return TRUE;
 }
 
@@ -288,14 +314,14 @@
         dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_TO,
(DWORD_PTR)&mciSeek);
         if (dwError != 0)
         {
-            MessageBox(hwnd, _T("SeekPlayback: Can't seek!"), NULL,
MB_OK);
+            ShowMCIError(hwnd, dwError);
         }
 
         mciPlay.dwCallback = (DWORD_PTR)hwnd;
         dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY,
(DWORD_PTR)&mciPlay);
         if (dwError != 0)
         {
-            MessageBox(hwnd, _T("SeekPlayback: Can't play!"), NULL,
MB_OK);
+            ShowMCIError(hwnd, dwError);
         }
     }
 }
@@ -357,7 +383,7 @@
         dwError = mciSendCommand(wDeviceId, MCI_PAUSE, MCI_WAIT,
(DWORD_PTR)&mciGeneric);
         if (dwError != 0)
         {
-            MessageBox(hwnd, _T("Can't pause!"), NULL, MB_OK);
+            ShowMCIError(hwnd, dwError);
         }
         bIsPaused = TRUE;
     }
@@ -374,9 +400,22 @@
         dwError = mciSendCommand(wDeviceId, MCI_RESUME, MCI_WAIT,
(DWORD_PTR)&mciGeneric);
         if (dwError != 0)
         {
-            MessageBox(hwnd, _T("Can't resume!"), NULL, MB_OK);
+            ShowMCIError(hwnd, dwError);
         }
         bIsPaused = FALSE;
+    }
+}
+
+static VOID
+ShowDeviceProperties(HWND hwnd)
+{
+    MCI_GENERIC_PARMS mciGeneric;
+    DWORD dwError;
+
+    dwError = mciSendCommand(wDeviceId, MCI_CONFIGURE, MCI_WAIT,
(DWORD_PTR)&mciGeneric);
+    if (dwError != 0)
+    {
+        MessageBox(0, _T("Can't display the device properties!"), NULL,
MB_OK);
     }
 }
 
@@ -407,7 +446,9 @@
 {
     MCI_PLAY_PARMS mciPlay;
     TCHAR szLocalFileName[MAX_PATH];
-    UINT FileType;
+    TCHAR szDeviceName[MAX_PATH];
+    DWORD dwSize;
+    BOOL IsSupported;
     MCIERROR mciError;
 
     if (lpFileName == NULL)
@@ -427,25 +468,13 @@
         return;
     }
 
-    FileType = IsSupportedFileExtension(szLocalFileName);
-
-    switch (FileType)
-    {
-        case UNSUPPORTED_FILE:
-            MessageBox(hwnd, _T("Unsupported format!"), NULL, MB_OK);
-            return;
-        case WAVE_FILE:
-            OpenMciDevice(hwnd, _T("waveaudio"), szLocalFileName);
-            break;
-        case MIDI_FILE:
-            OpenMciDevice(hwnd, _T("sequencer"), szLocalFileName);
-            break;
-        case AUDIOCD_FILE:
-            OpenMciDevice(hwnd, _T("cdaudio"), szLocalFileName);
-            break;
-        case AVI_FILE:
-            OpenMciDevice(hwnd, _T("avivideo"), szLocalFileName);
-            break;
+    dwSize = sizeof(szDeviceName) - 2;
+    _tcsnset(szDeviceName, _T('\0'), dwSize / sizeof(TCHAR));
+    IsSupported = IsSupportedFileExtension(szLocalFileName, szDeviceName, &dwSize);
+
+    if (IsSupported == TRUE)
+    {
+        OpenMciDevice(hwnd, szDeviceName, szLocalFileName);
     }
 
     SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc);
@@ -459,7 +488,7 @@
     mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM /*| MCI_TO*/,
(DWORD_PTR)&mciPlay);
     if (mciError != 0)
     {
-        MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);
+        ShowMCIError(hwnd, mciError);
     }
 }
 
@@ -502,7 +531,20 @@
     {
         case WM_CREATE:
             InitControls(hwnd);
+            hMainMenu = GetMenu(hwnd);
             break;
+
+        case WM_DROPFILES:
+        {
+            HDROP drophandle;
+            TCHAR droppedfile[MAX_PATH];
+            
+            drophandle = (HDROP)wParam;
+            DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile));
+            DragFinish(drophandle);
+            PlayFile(hwnd, droppedfile);
+            break;
+        }
 
         case WM_NOTIFY:
         {
@@ -641,6 +683,14 @@
                     _tcscpy(szPrevFile, _T("\0"));
                     break;
 
+                case IDM_DEVPROPS:
+                    ShowDeviceProperties(hwnd);
+                    break;
+                
+                case IDM_VOLUMECTL:
+                    ShellExecute(hwnd, NULL, _T("SNDVOL32.EXE"), NULL, NULL,
SW_SHOWNORMAL);
+                    break;
+
                 case IDM_ABOUT:
         {
                     HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
@@ -670,6 +720,7 @@
     TCHAR szClassName[] = _T("ROSMPLAY32");
     HWND hwnd;
     MSG msg;
+    DWORD dwError;
 
     hInstance = hInst;
 
@@ -699,6 +750,16 @@
                         hInstance,
                         NULL);
 
+    DragAcceptFiles(hwnd, TRUE);
+
+    DisableMenuItems();
+
+    dwError = SearchPath(NULL, _T("SNDVOL32.EXE"), NULL, 0, NULL, NULL);
+    if (dwError == 0)
+    {
+        EnableMenuItem(hMainMenu, IDM_VOLUMECTL, MF_BYCOMMAND | MF_GRAYED);
+    }
+
     /* Show it */
     ShowWindow(hwnd, SW_SHOW);
     UpdateWindow(hwnd);

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] Wed Jan 15 23:59:44
2014
@@ -3,9 +3,11 @@
 #include <winbase.h>
 #include <winuser.h>
 #include <wingdi.h>
+#include <winreg.h>
 #include <commdlg.h>
 #include <shellapi.h>
 #include <mmsystem.h>
+#include <digitalv.h>
 #include <commctrl.h>
 #include <tchar.h>
 

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] Wed Jan 15 23:59:44
2014
@@ -24,6 +24,7 @@
 #define IDS_TOOLTIP_FORWARD  107
 #define IDS_ALL_TYPES_FILTER 108
 #define IDS_PLAY             109
+#define IDS_DEFAULTMCIERRMSG 110
 
 /* Menu */
 #define IDR_MAINMENU 500
@@ -33,6 +34,8 @@
 #define IDM_CLOSE_FILE 1001
 #define IDM_EXIT       1002
 #define IDM_ABOUT      1003
+#define IDM_VOLUMECTL  1004
+#define IDM_DEVPROPS   1005
 
 /* ToolBar Icons */
 #define TBICON_PLAY     0