Ros-diffs July 2014

ros-diffs@reactos.org

9 participants
111 discussions

[dreimer] 63761: [RAPPS] Database update: Update to most recent Versions. Change 7-zip to the MSI Installer. Remove all those "(FIXME)" added by Erdem.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jul 29 11:30:52 2014 New Revision: 63761 URL: http://svn.reactos.org/svn/reactos?rev=63761&view=rev Log: [RAPPS] Database update: Update to most recent Versions. Change 7-zip to the MSI Installer. Remove all those "(FIXME)" added by Erdem. Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/alreader.txt trunk/reactos/base/applications/rapps/rapps/ants.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/bochs.txt trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/lazaruside.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/peazip.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,46 +1,46 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = 7-Zip -Version = 9.32a +Version = 9.34a Licence = LGPL Description = A file archiving utility with support for 7zip, zip, tar, rar and many other archive formats. -Size = 1.1 MB +Size = 1.14 MB Category = 12 URLSite = http://www.7-zip.org/ -URLDownload = http://dl.7-zip.org/7z932.exe +URLDownload = http://dl.7-zip.org/7z934.msi CDPath = none [Section.0407] Description = Ein Dateiarchivierungswerkzeug zum Erstellen und Ãffnen von 7zip, zip, tar, rar und vielen anderen Archivformaten. [Section.040a] -Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. (FIXME) +Description = Utilidad para crear y abrir 7zip, zip, tar, rar y otros archivos comprimidos. [Section.040c] -Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. (FIXME) -Size = 1,1 Mo +Description = Utilitaire pour crÃ©er et ouvrir les fichiers 7zip, zip, tar, rar et autres archives. +Size = 1,14 Mo [Section.0410] -Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. (FIXME) +Description = UtilitÃ per creare e aprire 7zip, zip, tar, rar e altri file archivio. [Section.0413] -Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME) +Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. [Section.0415] -Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. (FIXME) +Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. [Section.0418] Description = Un utilitar de arhivare a fiÈierelor, compatibil cu 7zip, zip, tar, rar Èi multe alte formate de arhive. -Size = 1,1 Mo +Size = 1,14 Mo [Section.041f] Description = 7zip, zip, tar, rar ve baÅka birÃ§ok belgelik biÃ§imi destekli bir kÃ¼tÃ¼k belgelikleme aracÄ±. -Size = 1,1 MB +Size = 1,14 MB [Section.0422] -Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². (FIXME) +Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². [Section.0813] -Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. (FIXME) +Description = Gereedschap voor het maken en openen van 7z, zip, tar, rar and andere archiefbestanden. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,7 +3,7 @@ [Section] Name = Abyss Web server X1 -Version = 2.9.3.2 +Version = 2.9.3.5 Licence = Freeware Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle. Size = 2.1 MB Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] @@ -14,12 +14,12 @@ [Section.0405] Name = OvladaÄ AC97 pro VirtualBox Licence = NeznÃ¡mÃ¡ -Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. (FIXME) +Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. [Section.0407] Name = AC97 Treiber fÃ¼r VirtualBox Licence = Unbekannt -Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. (FIXME) +Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. [Section.0410] Name = Driver AC97 per VirtualBox @@ -29,39 +29,39 @@ [Section.040a] Name = Driver AC97 para VirtualBox Licence = Desconocida -Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. (FIXME) +Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. [Section.040c] Name = Pilote AC97 pour VirtualBox Licence = Inconnue -Description = DÃ©compresser dans le dossier "ReactOS" puis redÃ©marrer ReactOS deux fois. (FIXME) +Description = DÃ©compresser dans le dossier "ReactOS" puis redÃ©marrer ReactOS deux fois. Size = 185,5 ko [Section.0410] Name = Driver AC97 per VirtualBox Licence = Sconosciuta -Description = Decomprimere nella cartella "ReactOS" e riavviare ReactOS. (FIXME) +Description = Decomprimere nella cartella "ReactOS" e riavviare ReactOS. [Section.0413] Name = AC97 Driver voor VirtualBox Licence = Ongekend -Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. (FIXME) +Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. [Section.0415] Name = Sterownik AC97 dla VirtualBox Licence = Nieznana -Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. (FIXME) +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. [Section.0418] Name = Modul pilot AC97 pentru VirtualBox Licence = NespecificatÄ -Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. (FIXME) +Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. Size = 185,5 ko [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ -Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. (FIXME) +Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.041f] Name = VirtualBox iÃ§in AC97 SÃ¼rÃ¼cÃ¼sÃ¼ @@ -72,9 +72,9 @@ [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. (FIXME) +Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.0813] Name = AC97 Driver voor VirtualBox Licence = Ongekend -Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. (FIXME) +Description = Pak uit in de "ReactOS" map en start tweemaal opnieuw op. Modified: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/alreader.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] @@ -11,16 +11,16 @@ CDPath = none [Section.0407] -Description = Ein FB2 eBook Reader. UnterstÃ¼tzung fÃ¼r folgende Formate: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ZIP und GZ Archive werden ebenfalls unterstÃ¼tzt. (FIXME?) +Description = Ein FB2 eBook Reader. UnterstÃ¼tzung fÃ¼r folgende Formate: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ZIP und GZ Archive werden ebenfalls unterstÃ¼tzt. [Section.0410] -Description = Un eBook Reader. Legge i formati fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supporta gli archivi ZIP e GZ. (FIXME) +Description = Un eBook Reader. Legge i formati fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supporta gli archivi ZIP e GZ. [Section.0415] -Description = Czytnik eBookÃ³w. ObsÅuguje formaty: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ObsÅugiwane sÄ takÅ¼e pliki w archivach ZIP i GZ. (FIXME) +Description = Czytnik eBookÃ³w. ObsÅuguje formaty: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. ObsÅugiwane sÄ takÅ¼e pliki w archivach ZIP i GZ. [Section.0418] -Description = Cititor de cÄrÈi electronice Ã®n format FB2. Supported read formats: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supported ZIP and GZ archives. (FIXME) +Description = Cititor de cÄrÈi electronice Ã®n format FB2. Supported read formats: fb2, fbz, txt, epub, html, doc, docx, odt, rtf, mobi, prc (PalmDoc), tcr. Supported ZIP and GZ archives. Size = 4,6 Mo [Section.041f] Modified: trunk/reactos/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Polish translation by wojo664 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) @@ -14,17 +14,17 @@ CDPath = none [Section.0407] -Description = Ein strategisches Kartenspiel. Sie bauen Ihr eigenes Schloss und versuchen, die gegnerische Burg zu zerstÃ¶ren. Sie benÃ¶tigen ein ZIP-Programm, um es zu installieren. (FIXME) +Description = Ein strategisches Kartenspiel. Sie bauen Ihr eigenes Schloss und versuchen, die gegnerische Burg zu zerstÃ¶ren. Sie benÃ¶tigen ein ZIP-Programm, um es zu installieren. [Section.0410] Description = Un gioco di carte strategico. Costruisci il tuo castello e prova a distruggere il castello nemico. Necessita di un programma di estrazione ZIP per essere installato. [Section.0415] -Description = Karciana gra strategiczna. Budujesz zamek, przy okazji prÃ³bujesz zniszczyÄ zamek wroga. Wymaga programu archiwizujÄcego do wypakowania. (FIXME) +Description = Karciana gra strategiczna. Budujesz zamek, przy okazji prÃ³bujesz zniszczyÄ zamek wroga. Wymaga programu archiwizujÄcego do wypakowania. [Section.0418] Licence = GratuitÄ -Description = Un joc strategic de cÄrÈi. JucÄtorul Ã®Èi va construi un castel Èi Ã®ncerca sÄ distrugÄ castelele oponenÈilor. Este necesar un utilitar de dezarhivare ZIP pentru a instala acest joc. (FIXME) +Description = Un joc strategic de cÄrÈi. JucÄtorul Ã®Èi va construi un castel Èi Ã®ncerca sÄ distrugÄ castelele oponenÈilor. Este necesar un utilitar de dezarhivare ZIP pentru a instala acest joc. Size = 632 ko [Section.041f] Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,12 +1,12 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = BitTorrent -Version = 7.8 +Version = 7.9.2 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. -Size = 1.07 MB +Size = 1.9 MB Category = 5 URLSite = http://www.bittorrent.com/ URLDownload = http://download-new.utorrent.com/endpoint/bittorrent/os/windows/track/stabl… @@ -26,9 +26,9 @@ [Section.0418] Licence = GratuitÄ pentru uz necomercial Description = Originalul client BitTorrent. -Size = 1,07 Mo +Size = 1,9 Mo [Section.041f] Licence = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz. Description = ÃzgÃ¼n BitTorrent istemcisi. -Size = 1,07 MB +Size = 1,9 MB Modified: trunk/reactos/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bochs.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bochs.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -4,13 +4,13 @@ [Section] Name = Bochs -Version = 2.6.5 +Version = 2.6.6 Licence = LGPL v2 Description = Bochs is a highly portable open source IA-32 (x86) PC emulator written in C++, that runs on most popular platforms. Size = 4.7 MB Category = 15 URLSite = http://bochs.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.5/Bochs-2.6.5.exe +URLDownload = http://download.sourceforge.net/project/bochs/bochs/2.6.6/Bochs-2.6.6.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = Orwell Dev-C++ MinGW32 -Version = 5.6.3 +Version = 5.7.0 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains MinGW32 compiler. Size = 60.2 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = Orwell Dev-C++ TDM GCC x64 -Version = 5.6.3 +Version = 5.7.0 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains 64 bit TDM-GCC compiler. -Size = 44.8 MB +Size = 44.7 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] @@ -21,4 +21,4 @@ [Section.041f] Licence = GPL 2. sÃ¼rÃ¼m Description = Dev-C++'nÄ±n sÃ¼rdÃ¼rÃ¼len bir sÃ¼rÃ¼mÃ¼. 64 bitlik TDM-GCC derleyicisi iÃ§erir. -Size = 44,8 MB +Size = 44,7 MB Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fira.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -15,7 +15,7 @@ [Section.0407] Licence = Unbekannt -Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte in den "ReactOS" Ordner entpacken. (FIXME) +Description = Mozilla Fira Font Pack, Beinhaltet Mono und Sans Schriften. Bitte in den "ReactOS" Ordner entpacken. [Section.0410] Licence = Sconosciuta @@ -23,11 +23,11 @@ [Section.0415] Licence = Nieznana -Description = Pakiet czcionek Mozilla Fira Font, zawiera czcionki Mono i Sans. Wypakuj do folderu "ReactOS". (FIXME) +Description = Pakiet czcionek Mozilla Fira Font, zawiera czcionki Mono i Sans. Wypakuj do folderu "ReactOS". [Section.0418] Licence = NespecificatÄ -Description = Pachetul Mozilla Fira Font, include fonturile Mono Èi Sans. DezarhivaÈi Ã®n dosarul âReactOSâ. (FIXME) +Description = Pachetul Mozilla Fira Font, include fonturile Mono Èi Sans. DezarhivaÈi Ã®n dosarul âReactOSâ. Size = 1,1 Mo [Section.041f] Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -2,83 +2,83 @@ ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] -Name = Mozilla Firefox 29 -Version = 29.0.1 +Name = Mozilla Firefox 31 +Version = 31.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 27.7 MB +Size = 30.75 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/en-US/… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/en-US/Fi… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 27.5 MB +Size = 30.56 MB URLSite = http://www.mozilla.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/de/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/de/Firef… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 27.5 MB +Size = 30.5 MB URLSite = http://www.mozilla.org/es-ES/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/es-ES/… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/es-ES/Fi… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 27,8 Mo +Size = 30,85 Mo URLSite = http://www.mozilla.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/fr/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/fr/Firef… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. -Size = 27.5 MB +Size = 30.49 MB URLSite = http://www.mozilla.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/it/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/it/Firef… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. -Size = 28.2 MB +Size = 31.2 MB URLSite = http://www.mozilla.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nl/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firef… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 27.5 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/nb-NO/… +Size = 30.55 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nb-NO/Fi… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 28.4 MB +Size = 31.42 MB URLSite = http://www.mozilla.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/pl/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/pl/Firef… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. -Size = 28,0 Mo +Size = 31,0 Mo URLSite = http://www.mozilla.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ro/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ro/Firef… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 27.9 MB +Size = 30.94 MB URLSite = http://www.mozilla.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/ru/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ru/Firef… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 28.2 MB +Size = 31.23 MB URLSite = http://www.mozilla.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/sk/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/sk/Firef… [Section.041f] Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyilerinden biri. -Size = 27,5 MB +Size = 30,58 MB URLSite = http://www.mozilla.org/tr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/tr/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/tr/Firef… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 27.9 MB +Size = 30.97 MB URLSite = http://www.mozilla.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/29.0.1/win32/uk/Fir… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/uk/Firef… Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = IrfanView -Version = 4.37 +Version = 4.38 Licence = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. -Size = 1.8 MB +Size = 1.81 MB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10829/iview437_setu… +URLDownload = http://www.irfanview.info/files/iview438_setup.exe CDPath = none [Section.0407] @@ -23,7 +23,7 @@ [Section.040c] Licence = Gratuit (pour un usage personnel) Description = Visionneur pour tous les types de fichiers graphiques/audio/vidÃ©o. -Size = 1,8 Mo +Size = 1,81 Mo [Section.0410] Licence = Gratuita (per uso personale) @@ -40,12 +40,12 @@ [Section.0418] Licence = GratuitÄ (pentru uz personal) Description = Lector pentru multiple formaturi de fiÈiere grafice/audio/video. -Size = 1,8 Mo +Size = 1,81 Mo [Section.041f] Licence = ÅahsÃ® kullanÄ±m iÃ§in Ã¼cretsiz. Description = Ãizgelerin, ses kÃ¼tÃ¼klerinin, vidyo kÃ¼tÃ¼klerinin tÃ¼m tÃ¼rleri iÃ§in gÃ¶rÃ¼ntÃ¼leyici. -Size = 1,8 MB +Size = 1,81 MB [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = IrfanView Plugins -Version = 4.37 +Version = 4.38 Licence = Freeware (for personal use) Description = Additional Plugins for supporting more file types. -Size = 10.2 MB +Size = 10.24 MB Category = 3 URLSite = http://www.irfanview.com/ -URLDownload = http://ring.maffin.ad.jp/archives/pc/forest/i/irfanview/10830/irfanview_plu… +URLDownload = http://www.irfanview.info/files/irfanview_plugins_438_setup.exe CDPath = none [Section.0407] @@ -23,7 +23,7 @@ [Section.040c] Licence = Gratuit (pour un usage personnel) Description = Modules additionnels pour supporter plus de types de fichiers. -Size = 10,2 Mo +Size = 10,24 Mo [Section.0410] Licence = Gratuita (per uso personale) @@ -40,13 +40,13 @@ [Section.0418] Licence = GratuitÄ (pentru uz personal) Description = Extensii adiÈionale pentru a spori numÄrul de formate de fiÈiere recunoscute. -Size = 10,2 Mo +Size = 10,24 Mo [Section.041f] Name = IrfanView Eklentileri Licence = ÅahsÃ® kullanÄ±m iÃ§in Ã¼cretsiz. Description = Daha Ã§ok kÃ¼tÃ¼k tÃ¼rÃ¼ desteklemek iÃ§in eklentiler. -Size = 10,2 MB +Size = 10,24 MB [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) Modified: trunk/reactos/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lazaruside.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -4,13 +4,13 @@ [Section] Name = Lazarus -Version = 1.2.2 +Version = 1.2.4 Licence = modified LGPL, GPL Description = A cross-platform integrated development environment (IDE) that lets you create visual (GUI) and non-visual Object Pascal programs, and uses the Free Pascal compiler to generate your executable. Size = 114 MB Category = 7 URLSite = http://www.lazarus.freepascal.org/ -URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bi… +URLDownload = http://download.sourceforge.net/project/lazarus/Lazarus%20Windows%2032%20bi… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,44 +3,44 @@ [Section] Name = LibreOffice -Version = 4.2.4 +Version = 4.2.5 Licence = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 209.3 MB +Size = 209.36 MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.4/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.5/win/x86/Lib… CDPath = none [Section.0407] -Description = Vorher bekannt als OpenOffice. Open Source Office Suite. (FIXME) +Description = Vorher bekannt als OpenOffice. Open Source Office Suite. [Section.040a] -Description = La suite de ofimÃ¡tica de cÃ³digo abierto. (FIXME) +Description = La suite de ofimÃ¡tica de cÃ³digo abierto. [Section.040c] -Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. (FIXME) -Size = 209,3 Mo +Description = PrÃ©cÃ©demment appelÃ© OpenOffice. Suite bureautique open source. +Size = 209,36 Mo [Section.0410] -Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. (FIXME) +Description = Precedentemente chiamato OpenOffice. Open Source Office Suite. [Section.0413] -Description = Voorheen OpenOffice. Open-bron Office pakket. (FIXME) +Description = Voorheen OpenOffice. Open-bron Office pakket. [Section.0415] -Description = Otwarty pakiet biurowy. (FIXME) +Description = Otwarty pakiet biurowy. [Section.0418] -Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. (FIXME) -Size = 209,3 Mo +Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. +Size = 209,36 Mo [Section.041f] Description = GÃ¼Ã§lÃ¼ ve aÃ§Ä±k kaynak bir bÃ¼ro takÄ±mÄ±. OpenOffice'ten Ã§atallanÄ±lmÄ±ÅtÄ±r. -Size = 209,3 MB +Size = 209,36 MB [Section.0422] -Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. (FIXME) +Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. [Section.0813] -Description = Voorheen OpenOffice. Open-bron Office pakket. (FIXME) +Description = Voorheen OpenOffice. Open-bron Office pakket. Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = mIRC 7 -Version = 7.32 +Version = 7.34 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). -Size = 1.85 MB +Size = 1.89 MB Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/8/mirc732.exe +URLDownload = http://download.mirc.com/9/mirc734.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Le client le plus populaire pour l'Internet Relay Chat (IRC). -Size = 1,85 Mo +Size = 1,89 Mo [Section.0410] Description = Il famoso client per Internet Relay Chat (IRC). @@ -34,12 +34,12 @@ [Section.0418] Licence = Versiune de evaluare Description = Cel mai popular client de IRC (Internet Relay Chat). -Size = 1,85 Mo +Size = 1,89 Mo [Section.041f] Licence = PaylaÅÄ±mlÄ± Description = UmÃ»mÃ® AÄ EÅ ZamanlÄ± SÃ¶yleÅi (IRC) iÃ§in en Ã§ok tutulan istemci. -Size = 1,85 MB +Size = 1,89 MB [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = Media Player Classic Home Cinema -Version = 1.7.5 +Version = 1.7.6 Licence = GPL Description = A media player. -Size = 10.1 MB +Size = 10.3 MB Category = 2 URLSite = http://mpc-hc.org/ -URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32… +URLDownload = http://download.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win32… CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Un lecteur media. -Size = 10,1 Mo +Size = 10,3 Mo [Section.0410] Description = Lettore multimediale. @@ -33,7 +33,7 @@ [Section.0418] Description = Lector multimedia. -Size = 10,1 Mo +Size = 10,3 Mo [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. @@ -43,7 +43,7 @@ [Section.041f] Description = Bir ortam oynatÄ±cÄ±sÄ±. -Size = 10,1 MB +Size = 10,3 MB [Section.0422] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = Notepad++ -Version = 6.6.3 +Version = 6.6.8 Licence = GPL Description = A text editor. -Size = 7.3 MB +Size = 7.55 MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.6.3/npp.6.6.3.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.6.8/npp.6.6.8.Installer.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Un Ã©diteur de texte. -Size = 7,3 Mo +Size = 7,55 Mo URLSite = http://notepad-plus-plus.org/fr/ [Section.0410] @@ -34,7 +34,7 @@ [Section.0418] Description = Un editor de text. -Size = 7,3 Mo +Size = 7,55 Mo [Section.0419] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. @@ -44,7 +44,7 @@ [Section.041f] Description = Bir metin dÃ¼zenleyicisi. -Size = 7,3 MB +Size = 7,55 MB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -13,7 +13,7 @@ CDPath = none [Section.0407] -Description = DIE Open Source Office Suite. (FIXME) +Description = DIE Open Source Office Suite. Size = 154.88 MB URLSite = http://www.openoffice.org/de/ URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… @@ -37,7 +37,7 @@ URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… [Section.0413] -Description = Open-bron Office Pakket. (FIXME) +Description = Open-bron Office Pakket. Size = 132.11 MB URLSite = http://www.openoffice.org/nl/ URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… @@ -65,7 +65,7 @@ URLSite = http://www.openoffice.org/ua/ [Section.0813] -Description = Open-bron Office Pakket. (FIXME) +Description = Open-bron Office Pakket. Size = 132.11 MB URLSite = http://www.openoffice.org/nl/ URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] @@ -13,7 +13,7 @@ CDPath = none [Section.0407] -Description = DIE Open Source Office Suite. (FIXME) +Description = DIE Open Source Office Suite. Size = 114.25 MB URLSite = http://www.openoffice.org/de/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/… @@ -39,7 +39,7 @@ [Section.0413] Version = 2.4.2 -Description = Open-bron Office Pakket. (FIXME) +Description = Open-bron Office Pakket. Size = 113.8 MB URLSite = http://www.openoffice.org/nl/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/… @@ -68,7 +68,7 @@ [Section.0813] Version = 2.4.2 -Description = Open-bron Office Pakket. (FIXME) +Description = Open-bron Office Pakket. Size = 113.8 MB URLSite = http://www.openoffice.org/nl/ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/nl/… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = OpenTTD -Version = 1.4.0 +Version = 1.4.1 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 7.0 MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.4.0/openttd-1.4.0-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.4.1/openttd-1.4.1-windows-win32.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = PeaZip -Version = 5.3.1 +Version = 5.4.0 Licence = LGPL v3, OpenCandy EULA Description = PeaZip is a free, cross-platform, open source file and archive manager. It supports over 150 archive formats. Size = 5.8 MB Category = 12 URLSite = http://peazip.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/peazip/5.3.1/peazip-5.3.1.WINDOWS.e… +URLDownload = http://download.sourceforge.net/project/peazip/5.4.0/peazip-5.4.0.WINDOWS.e… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -4,13 +4,13 @@ [Section] Name = Qmmp (Qt-based Multimedia Player) -Version = 0.7.7 +Version = 0.8.0 Licence = GPL Description = Qmmp is an audio-player, written with the help of the Qt library. The user interface is similar to WinAMP or XMMS. Alternative user interfaces also are available. -Size = 10.5 MB +Size = 12.49 MB Category = 1 URLSite = http://qmmp.ylsoftware.com/index.php -URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.7.7-win32.exe +URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.8.0-win32.exe CDPath = none [Section.0407] @@ -24,7 +24,7 @@ [Section.0418] Description = Qmmp este un lector audio, ce utilizeazÄ biblioteca QT. InterfaÈa de utilizare e asemÄnÄtoare cu cea din WinAMP sau XMMS. De asemenea sunt disponibile interfeÈe de utilizare alternative. -Size = 10,5 Mo +Size = 12,49 Mo [Section.0419] Description = ÐÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Qmmp (Qt-based Multimedia Player). @@ -32,4 +32,4 @@ [Section.041f] Name = Qmmp (Qt TabanlÄ± Ãoklu Ortam OynatÄ±cÄ±sÄ±) Description = Qmmp, Qt kitaplÄ±ÄÄ±nÄ±n yardÄ±mÄ±yla yazÄ±lmÄ±Å bir ses oynatÄ±cÄ±sÄ±dÄ±r. KullanÄ±cÄ± arayÃ¼zÃ¼ WinAMP'a ve XMMS'ye benzer. BaÅka kullanÄ±cÄ± arayÃ¼zleri de vardÄ±r. -Size = 10,5 MB +Size = 12,49 MB Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,4 +1,4 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] @@ -14,49 +14,49 @@ [Section.0405] Name = OvladaÄ SoundBlaster pro VMWare Licence = NeznÃ¡mÃ¡ -Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. (FIXME) +Description = Rozbalte do sloÅ¾ky "ReactOS" a pak ReactOS dvakrÃ¡t restartujte. [Section.0407] Name = SoundBlaster Treiber fÃ¼r VMWare Licence = Unbekannt -Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. (FIXME) +Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. [Section.040a] Name = Driver SoundBlaster para VMWare Licence = Desconocida -Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. (FIXME) +Description = Descomprimir en la carpeta "Reactos" y reiniciar Reactos dos veces. [Section.040c] Name = Pilote SoundBlaster pour VMWare Licence = Inconnue -Description = DÃ©zippez dans le rÃ©pertoire "ReactOS" puis redÃ©marrez deux fois. (FIXME) +Description = DÃ©zippez dans le rÃ©pertoire "ReactOS" puis redÃ©marrez deux fois. Size = 2,22 Mo [Section.0410] Name = Driver SoundBlaster per VMWare Licence = Sconosciuta -Description = Estrarre nella cartella "ReactOS" e riavviare ReactOS due volte. (FIXME) +Description = Estrarre nella cartella "ReactOS" e riavviare ReactOS due volte. [Section.0413] Name = SoundBlaster Driver voor VMWare Licence = Ongekend -Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. (FIXME) +Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. [Section.0415] Name = Sterownik SoundBlaster dla VMWare Licence = Nieznana -Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. (FIXME) +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. [Section.0418] Name = Modul pilot SoundBlaster pentru VMWare Licence = NespecificatÄ -Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. (FIXME) +Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. Size = 2,22 Mo [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ SoundBlaster Ð´Ð»Ñ VMWare Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ -Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. (FIXME) +Description = PÐ°Ð·Ð°ÑÑÐ¸Ð²Ð¸ÑÑÐ¹ÑÐµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð² Ð¿Ð°Ð¿ÐºÑ "ReactOS", Ð·Ð°ÑÐµÐ¼ Ð´Ð²Ð°Ð¶Ð´Ñ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.041f] Name = VMWare iÃ§in SoundBlaster SÃ¼rÃ¼cÃ¼sÃ¼ @@ -67,9 +67,9 @@ [Section.0422] Name = ÐÑÐ°Ð¹Ð²ÐµÑ SoundBlaster Ð´Ð»Ñ VMWare Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° -Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. (FIXME) +Description = PÐ¾Ð·Ð°ÑÑÑÐ²ÑÐ¹ÑÐµ Ð²Ð¼ÑÑÑ Ð² ÑÐµÐºÑ "ReactOS" Ð¿ÑÑÐ»Ñ ÑÐ¾Ð³Ð¾ Ð´Ð²ÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ. [Section.0813] Name = SoundBlaster Driver voor VMWare Licence = Ongekend -Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. (FIXME) +Description = Pak uit in de "ReactOS" folder en start ReactOS tweemaal opnieuw op. Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -3,13 +3,13 @@ [Section] Name = SciTE -Version = 3.4.3 +Version = 3.4.4 Licence = Freeware Description = SciTE is a SCIntilla based text editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 737 kB +Size = 736 kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.3/Sc343.exe +URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.4/Sc344.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 737 ko +Size = 736 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato su scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -34,12 +34,12 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 737 ko +Size = 736 ko [Section.041f] Licence = Ãcretsiz Description = SciTE, bir Scintilla tabanlÄ± metin dÃ¼zenleyicisidir. Ä°lk baÅta Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±ldÄ±, izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle bir umÃ»miyetle kullanÄ±ÅlÄ± dÃ¼zenleyici olmak iÃ§in geliÅti. -Size = 737 KB +Size = 736 KB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,46 +1,46 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = ScummVM -Version = 1.6.0 +Version = 1.7.0 Licence = GPL Description = Software that reproduce the working of graphical engine for videogames (Sam and Max, Day of the Tentacle, etc.) on ReactOS. -Size = 6.28 MB +Size = 6.9 MB Category = 4 URLSite = http://scummvm.org/ -URLDownload = http://download.sourceforge.net/project/scummvm/scummvm/1.6.0/scummvm-1.6.0… +URLDownload = http://download.sourceforge.net/project/scummvm/scummvm/1.7.0/scummvm-1.7.0… CDPath = none [Section.0407] -Description = Sam and Max, Day of the Tentacle usw in ReactOS. (FIXME) +Description = Sam and Max, Day of the Tentacle usw in ReactOS. [Section.040a] -Description = Sam and Max, Day of the Tentacle en ReactOS. (FIXME) +Description = Sam and Max, Day of the Tentacle en ReactOS. [Section.040c] -Description = Sam and Max, Day of the Tentacle, etc sur ReactOS. (FIXME) -Size = 6,28 Mo +Description = Sam and Max, Day of the Tentacle, etc sur ReactOS. +Size = 6,9 Mo [Section.0410] -Description = Software che riproduce il funzionamento di motori grafici per videogiochi (Sam and Max, Day of the Tentacle, etc) su ReactOS. (FIXME?) +Description = Software che riproduce il funzionamento di motori grafici per videogiochi (Sam and Max, Day of the Tentacle, etc) su ReactOS. [Section.0413] -Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. (FIXME) +Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. [Section.0415] Description = Program pozwalajÄcy uruchomiÄ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS. [Section.0418] -Description = Motor de execuÈie pentru jocuri SCUMM. (FIXME) -Size = 6,28 Mo +Description = Motor de execuÈie pentru jocuri SCUMM. +Size = 6,9 Mo [Section.041f] Description = ReactOS Ã¼zerinde Sam ve Max, Day of the Tentacle gibi vidyo oyunlarÄ±nÄ±n oyun motorlarÄ±nÄ±n Ã§alÄ±ÅmasÄ±nÄ± taklit eden yazÄ±lÄ±m. -Size = 6,28 MB +Size = 6,9 MB [Section.0422] -Description = ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð³ÑÐ°ÑÐ¸ Sam and Max, Day of the Tentacle ÑÐ° ÑÐ½ÑÑ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ñ ÑÐ³ÑÐ¸ Ð² ReactOS. (FIXME) +Description = ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð³ÑÐ°ÑÐ¸ Sam and Max, Day of the Tentacle ÑÐ° ÑÐ½ÑÑ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ñ ÑÐ³ÑÐ¸ Ð² ReactOS. [Section.0813] -Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. (FIXME) +Description = Sam and Max, Day of the Tentacle, enz. op ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -13,29 +13,29 @@ CDPath = none [Section.0407] -Description = Sumatra PDF ist ein freies, schlankes, Open-Source PDF-Anzeigeprogramm. (FIXME) +Description = Sumatra PDF ist ein freies, schlankes, Open-Source PDF-Anzeigeprogramm. URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-de.html [Section.040a] -Description = Sumatra PDF es un lector PDF ligero, libre y open-source. (FIXME) +Description = Sumatra PDF es un lector PDF ligero, libre y open-source. URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-es.html [Section.040c] -Description = Sumatra PDF est un lecteur PDF lÃÂ©ger, libre et open-source. (FIXME) +Description = Sumatra PDF est un lecteur PDF lÃÂ©ger, libre et open-source. Size = 4,0 Mo URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-fr.html [Section.0410] -Description = Sumatra PDF Ã¨ un visualizzatore di file PDF, leggero e open source. (FIXME) +Description = Sumatra PDF Ã¨ un visualizzatore di file PDF, leggero e open source. [Section.0413] -Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. (FIXME) +Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. [Section.0415] -Description = Sumatra PDF to maÅy, darmowy, otwarty czytnik PDF. (FIXME) +Description = Sumatra PDF to maÅy, darmowy, otwarty czytnik PDF. [Section.0418] -Description = Lector PDF - uÈor, gratuit (open-source), Èi portabil. (FIXME) +Description = Lector PDF - uÈor, gratuit (open-source), Èi portabil. Size = 4,0 Mo URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-ro.html @@ -45,4 +45,4 @@ Size = 4,0 MB [Section.0813] -Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. (FIXME) +Description = Sumatra PDF is een slanke, gratis, open-bron PDF lezer. Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -2,78 +2,78 @@ ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] -Name = Mozilla Thunderbird 24 -Version = 24.5.0 +Name = Mozilla Thunderbird 31 +Version = 31.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 21.12 MB +Size = 25.25 MB Category = 5 URLSite = https://www.mozilla.org/en-US/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/en… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/en-U… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 20.96 MB +Size = 25.09 MB URLSite = https://www.mozilla.org/de/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/de… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/de/T… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. -Size = 20.92 MB +Size = 25.04 MB URLSite = https://www.mozilla.org/es-ES/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/es… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/es-E… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. -Size = 21,27 Mo +Size = 25,39 Mo URLSite = https://www.mozilla.org/fr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/fr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/fr/T… [Section.0410] Description = Il piÃ¹ popolare e il migliore Client mail gratuito. -Size = 20.91 MB +Size = 25.04 MB URLSite = https://www.mozilla.org/it/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/it… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/it/T… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. -Size = 21.61 MB +Size = 25.73 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/T… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. -Size = 21.80 MB +Size = 25.95 MB URLSite = https://www.mozilla.org/pl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/pl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/pl/T… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. -Size = 21,48 Mo +Size = 25,61 Mo URLSite = https://www.mozilla.org/ro/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ro… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ro/T… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 21.38 MB +Size = 25.5 MB URLSite = https://www.mozilla.org/ru/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/ru… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ru/T… [Section.041f] Description = ÃzgÃ¼r posta istemcileri arasÄ±nda en tutulanÄ± ve en iyilerinden biri. -Size = 20,99 MB +Size = 25,12 MB URLSite = https://www.mozilla.org/tr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/tr… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/tr/T… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². -Size = 21.41 MB +Size = 25.54 MB URLSite = https://www.mozilla.org/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/uk… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/uk/T… [Section.0813] Description = De meest populaire en een van de beste gratis e-mail-programma's. -Size = 9.71 MB +Size = 25.73 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/24.5.0/win32/nl… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/T… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Tue Jul 29 11:30:52 2014 @@ -1,15 +1,15 @@ -; UTF-8 +ï»¿; UTF-8 ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] Name = VLC media player -Version = 2.1.3 +Version = 2.1.5 Licence = GPL Description = A media player. -Size = 23.5 MB +Size = 23.6 MB Category = 2 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.3/win32/vlc-2.1.3-win32.exe +URLDownload = http://mirror.de.leaseweb.net/videolan/vlc/2.1.5/win32/vlc-2.1.5-win32.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Un lecteur media. -Size = 23,5 Mo +Size = 23,6 Mo [Section.0410] Description = Lettore multimediale. @@ -33,7 +33,7 @@ [Section.0418] Description = Lector multimedia. -Size = 23,5 Mo +Size = 23,6 Mo [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. @@ -44,7 +44,7 @@ [Section.041f] Name = VLC Ortam OynatÄ±cÄ±sÄ± Description = Bir ortam oynatÄ±cÄ±sÄ±. -Size = 23,5 MB +Size = 23,6 MB [Section.0422] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ.

10 years, 2 months

[dreimer] 63760: [TRANSLATION] system: German translation fixes + new translation of SUBST by zehnvor Subst translation added to application by me. CORE-8268 #resolve #comment Committed, thx.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jul 29 10:29:37 2014 New Revision: 63760 URL: http://svn.reactos.org/svn/reactos?rev=63760&view=rev Log: [TRANSLATION] system: German translation fixes + new translation of SUBST by zehnvor Subst translation added to application by me. CORE-8268 #resolve #comment Committed, thx. Added: trunk/reactos/base/system/subst/lang/de-DE.rc (with props) Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/format/lang/de-DE.rc trunk/reactos/base/system/regsvr32/lang/de-DE.rc trunk/reactos/base/system/rundll32/lang/de-DE.rc trunk/reactos/base/system/runonce/lang/de-DE.rc trunk/reactos/base/system/subst/subst.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US /* Basic application information */ STRINGTABLE Modified: trunk/reactos/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de… ============================================================================== --- trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -11,7 +11,7 @@ empfohlen, grundsÃ¤tzlich Standardeinstellungen zu verwenden!\n\ NTFS unterstÃ¼tzt 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ FAT unterstÃ¼tzt 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS-Kompression wird fÃ¼r BlockgrÃ¶ssen Ã¼ber 4096 nicht\n\ + NTFS-Kompression wird fÃ¼r BlockgrÃ¶Ãen Ã¼ber 4096 nicht\n\ unterstÃ¼tzt.\n\ -C Auf dem neuen DatentrÃ¤ger erstellte Dateien werden\n\ standardmÃ¤Ãig komprimiert.\n\n" @@ -35,8 +35,8 @@ STRING_CREATE_FSYS "Erzeuge Dateisystem-Strukturen.\n" STRING_FMT_COMPLETE "Formatierung abgeschlossen.\n" STRING_VOL_COMPRESS "Medium unterstÃ¼tzt keine Kompression.\n" - STRING_ENTER_LABEL "DatentrÃ¤gerbezeichnung (11 Zeichen, Enter fÃ¼r keine)? " + STRING_ENTER_LABEL "DatentrÃ¤gerbezeichnung (11 Zeichen, Eingabetaste fÃ¼r keine)? " STRING_NO_LABEL "Konnte DatentrÃ¤ger nicht benennen" - STRING_FREE_SPACE "\n%I64d Byte SpeicherkapazitÃ¤t.\n%I64d bytes freier Speicher.\n" + STRING_FREE_SPACE "\n%I64d Bytes SpeicherkapazitÃ¤t.\n%I64d Bytes freier Speicher.\n" STRING_SERIAL_NUMBER "\nDatentrÃ¤ger-Seriennummer ist %04X-%04X\n" END Modified: trunk/reactos/base/system/regsvr32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -4,7 +4,7 @@ STRINGTABLE BEGIN - IDS_UsageMessage "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ + IDS_UsageMessage "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:Befehlszeile]] DLL-Name\n\ /u - Serverregistrierung aufheben\n\ /s - Hintergrundmodus; Meldungen werden nicht angezeigt\n\ /c - Konsolenausgabe verwenden\n\ @@ -15,9 +15,9 @@ IDS_NoDllSpecified "Es wurde kein DLL-Name angegeben." IDS_InvalidFlag "UngÃ¼ltiger Parameter: %s" IDS_SwitchN_NoI "UngÃ¼ltiger Parameter: /n muss zusammen mit dem /i-Schalter verwendet werden." - IDS_DllNotLoaded "LoadLibrary('%s') ist fehlgeschlagen.\nGetLastError-RÃ¼ckgabewert 0x%08x." + IDS_DllNotLoaded "LoadLibrary('%s') ist fehlgeschlagen.\nRÃ¼ckgabewert von GetLastError: 0x%08x." IDS_MissingEntry "%s wurde geladen, aber der %s Einstiegspunkt wurde nicht gefunden.\n\n\ -%s wurde mÃ¶glicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet sich im Speicher. ErwÃ¤gen Sie die Verwendung von PView, um es festzustellen und zu lÃ¶schen." +%s wurde mÃ¶glicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet sich im Speicher.\n Mit PView kÃ¶nnen Sie diese finden und lÃ¶schen." IDS_FailureMessage "%s in %s ist fehlgeschlagen.\nRÃ¼ckgabewert: 0x%08x" IDS_SuccessMessage "%s in %s war erfolgreich." END Modified: trunk/reactos/base/system/rundll32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -4,6 +4,6 @@ STRINGTABLE BEGIN - IDS_DllNotLoaded "LoadLibrary laden von '%s' fehlgeschlagen" + IDS_DllNotLoaded "LoadLibrary konnte '%s' nicht laden" IDS_MissingEntry "Fehlender Eintrag:%s\nIn %s" END Modified: trunk/reactos/base/system/runonce/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/d… ============================================================================== --- trunk/reactos/base/system/runonce/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -2,7 +2,7 @@ IDD_RUNONCE_DLG DIALOG 0, 0, 239, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Setup" +CAPTION "ReactOS-Installation" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS nimmt nun die folgenden Einstellungen vor:", -1, 38, 8, 196, 18 Added: trunk/reactos/base/system/subst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/de-… ============================================================================== --- trunk/reactos/base/system/subst/lang/de-DE.rc (added) +++ trunk/reactos/base/system/subst/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -0,0 +1,18 @@ +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Falsche Anzahl an Parametern - %s\n" + IDS_INVALID_PARAMETER "Falsche Anzahl an Parametern - %s\n" + IDS_INVALID_PARAMETER2 "Falscher Parameter - %s\n" + IDS_DRIVE_ALREADY_SUBSTED "SUBST wurde hier schon ausgefÃ¼hrt.\n" + IDS_FAILED_WITH_ERRORCODE "Fehlgeschlagen - Code 0x%x: %s\n" + IDS_USAGE "Weist einem Pfad einen Laufwerksbuchstaben zu.n\n\ +SUBST [Laufwerk1: [Laufwerk2:]Pfad]\n\ +SUBST Laufwerk1: /D\n\n\ + Laufwerk1: Laufwerksbezeichnung, die dem Pfad zugewiesen werden soll.\n\ + [Laufwerk2:]Pfad Laufwerk und Pfad, die als virtuelles Laufwerk (Laufwerk1:)\n\ + angesprochen werden sollen.\n\ + /D LÃ¶scht ein virtuelles Laufwerk.\n\n\ +SUBST ohne Parameter zeigt alle bereits erstellten, virtuellen Laufwerke an.\n" +END Propchange: trunk/reactos/base/system/subst/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.rc… ============================================================================== --- trunk/reactos/base/system/subst/subst.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/subst.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -12,6 +12,9 @@ #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" Modified: trunk/reactos/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/de-DE.rc [iso-8859-1] Tue Jul 29 10:29:37 2014 @@ -17,8 +17,8 @@ CAPTION "Benutzerinterface-Fehler" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Die Logon-Benutzerschnittstellen-DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Kontaktieren Sie Ihren Systemadministrator, um die DLL zu ersetzen, oder stellen Sie die Original-DLL wieder her.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "Die DLL %s konnte nicht geladen werden.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontaktieren Sie Ihren Systemadministrator, um die Datei zu ersetzen, oder stellen Sie die Originaldatei wieder her.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14 END @@ -28,7 +28,7 @@ IDS_APPLYINGCOMPUTERSETTINGS "Computereinstellungen laden..." IDS_RUNNINGSTARTUPSCRIPTS "Startskripte ausfÃ¼hren..." IDS_RUNNINGSHUTDOWNSCRIPTS "Skripte zum Herunterfahren ausfÃ¼hren..." - IDS_APPLYINGYOURPERSONALSETTINGS "Ihre persÃ¶nlichen Einstellungen setzen..." + IDS_APPLYINGYOURPERSONALSETTINGS "PersÃ¶nliche Einstellungen werden Ã¼bernommen..." IDS_RUNNINGLOGOFFSCRIPTS "Abmeldeskripte ausfÃ¼hren..." IDS_RUNNINGLOGONSCRIPTS "Anmeldeskripte ausfÃ¼hren..." IDS_LOADINGYOURPERSONALSETTINGS "Ihre persÃ¶nlichen Einstellungen laden..."

10 years, 2 months

[tfaber] 63759: [NTDLL:LDR] - Fix a DPRINT

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 29 10:29:22 2014 New Revision: 63759 URL: http://svn.reactos.org/svn/reactos?rev=63759&view=rev Log: [NTDLL:LDR] - Fix a DPRINT Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Tue Jul 29 10:29:22 2014 @@ -2334,7 +2334,7 @@ if (!ExportDir) { DPRINT1("Image %wZ has no exports, but were trying to get procedure %Z. BaseAddress asked 0x%p, got entry BA 0x%p\n", - &LdrEntry->BaseDllName, &Name, BaseAddress, LdrEntry->DllBase); + &LdrEntry->BaseDllName, Name, BaseAddress, LdrEntry->DllBase); Status = STATUS_PROCEDURE_NOT_FOUND; _SEH2_YIELD(goto Quickie;) }

10 years, 2 months

[tfaber] 63758: [AMSTREAM_WINETEST][QUARTZ_WINETEST] - Enable skipped tests ROSTESTS-116 #resolve ROSTESTS-123

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 29 07:56:08 2014 New Revision: 63758 URL: http://svn.reactos.org/svn/reactos?rev=63758&view=rev Log: [AMSTREAM_WINETEST][QUARTZ_WINETEST] - Enable skipped tests ROSTESTS-116 #resolve ROSTESTS-123 Modified: trunk/rostests/winetests/amstream/amstream.c trunk/rostests/winetests/quartz/dsoundrender.c trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/misc.c trunk/rostests/winetests/quartz/videorenderer.c Modified: trunk/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Tue Jul 29 07:56:08 2014 @@ -440,14 +440,7 @@ CoInitializeEx(NULL, COINIT_MULTITHREADED); - if (!winetest_interactive) - { - win_skip("test_media_streams(), ROSTESTS-123\n"); - } - else - { - test_media_streams(); - } + test_media_streams(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE) Modified: trunk/rostests/winetests/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre… ============================================================================== --- trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/dsoundrender.c [iso-8859-1] Tue Jul 29 07:56:08 2014 @@ -221,11 +221,6 @@ START_TEST(dsoundrender) { - if (!winetest_interactive) - { - skip("Skipping dsoundrender test, see ROSTESTS-116\n"); - return; - } CoInitialize(NULL); if (!create_dsound_renderer()) return; Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Jul 29 07:56:08 2014 @@ -1878,12 +1878,6 @@ { HRESULT hr; - if (!winetest_interactive) - { - skip("Skipping filtergraph test, see ROSTESTS-116\n"); - return; - } - CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&pgraph); Modified: trunk/rostests/winetests/quartz/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/misc.c?r… ============================================================================== --- trunk/rostests/winetests/quartz/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/misc.c [iso-8859-1] Tue Jul 29 07:56:08 2014 @@ -224,17 +224,10 @@ { CoInitialize(NULL); - if (!winetest_interactive) - { - skip("Skipping misc test, see ROSTESTS-116\n"); - return; - } - else - { - test_null_renderer_aggregations(); - test_video_renderer_aggregations(); - test_filter_graph_aggregations(); - test_filter_mapper_aggregations(); - } + test_null_renderer_aggregations(); + test_video_renderer_aggregations(); + test_filter_graph_aggregations(); + test_filter_mapper_aggregations(); + CoUninitialize(); } Modified: trunk/rostests/winetests/quartz/videorenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/videoren… ============================================================================== --- trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/videorenderer.c [iso-8859-1] Tue Jul 29 07:56:08 2014 @@ -156,16 +156,9 @@ if (!create_video_renderer()) return; - if (!winetest_interactive) - { - skip("Skipping filtergraph test, see ROSTESTS-116\n"); - return; - } - else - { - test_query_interface(); - test_basefilter(); - } + test_query_interface(); + test_basefilter(); + release_video_renderer(); CoUninitialize();

10 years, 2 months

[tfaber] 63757: [QUARTZ][STRMBASE] - Fix use-after-free on critical sections, which caused test hangs. Also fix some memory leaks. More fixes coming with the next Wine-sync, but this should be enou...

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 29 07:49:06 2014 New Revision: 63757 URL: http://svn.reactos.org/svn/reactos?rev=63757&view=rev Log: [QUARTZ][STRMBASE] - Fix use-after-free on critical sections, which caused test hangs. Also fix some memory leaks. More fixes coming with the next Wine-sync, but this should be enough to get tests working. ROSTESTS-116 Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/nullrenderer.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/include/reactos/wine/strmbase.h trunk/reactos/lib/3rdparty/strmbase/filter.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/lib/3rdparty/strmbase/transform.c Modified: trunk/reactos/dll/directx/wine/quartz/enumfilters.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/en… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/enumfilters.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -113,6 +113,7 @@ if (!refCount) { IGraphVersion_Release(This->pVersionSource); + CoTaskMemFree(This); return 0; } else Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -465,7 +465,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { AsyncReader *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -485,6 +485,7 @@ CoTaskMemFree(This->pszFileName); if (This->pmt) FreeMediaType(This->pmt); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; } Modified: trunk/reactos/dll/directx/wine/quartz/nullrenderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/nu… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/nullrenderer.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -108,7 +108,7 @@ static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseFilterImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); if (!refCount) { Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -180,6 +180,7 @@ } CoTaskMemFree(This->ppPins); + BaseFilter_Destroy(&This->filter); TRACE("Destroying parser\n"); CoTaskMemFree(This); @@ -188,7 +189,7 @@ ULONG WINAPI Parser_Release(IBaseFilter * iface) { ParserImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); Modified: trunk/reactos/include/reactos/wine/strmbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/strmb… ============================================================================== --- trunk/reactos/include/reactos/wine/strmbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/strmbase.h [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -194,6 +194,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable); +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); Modified: trunk/reactos/lib/3rdparty/strmbase/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/filt… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/filter.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -60,14 +60,7 @@ TRACE("(%p)->() Release from %d\n", This, refCount + 1); if (!refCount) - { - if (This->pClock) - IReferenceClock_Release(This->pClock); - - This->IBaseFilter_iface.lpVtbl = NULL; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); - } + BaseFilter_Destroy(This); return refCount; } @@ -209,3 +202,15 @@ return S_OK; } + +HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) +{ + if (This->pClock) + IReferenceClock_Release(This->pClock); + + This->IBaseFilter_iface.lpVtbl = NULL; + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + + return S_OK; +} Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -284,7 +284,7 @@ ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) { BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); if (!refCount) { @@ -309,6 +309,7 @@ CloseHandle(This->ThreadSignal); CloseHandle(This->RenderEvent); QualityControlImpl_Destroy(This->qcimpl); + BaseFilter_Destroy(&This->filter); } return refCount; } Modified: trunk/reactos/lib/3rdparty/strmbase/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/transform.c [iso-8859-1] Tue Jul 29 07:49:06 2014 @@ -295,7 +295,7 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) { TransformFilter *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseFilterImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -325,6 +325,7 @@ FreeMediaType(&This->pmt); QualityControlImpl_Destroy(This->qcimpl); IUnknown_Release(This->seekthru_unk); + BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0;

10 years, 2 months

[tfaber] 63756: [DSOUND] - Do not call CoUninitialize if CoInitialize failed. ROSTESTS-123

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 29 07:32:47 2014 New Revision: 63756 URL: http://svn.reactos.org/svn/reactos?rev=63756&view=rev Log: [DSOUND] - Do not call CoUninitialize if CoInitialize failed. ROSTESTS-123 Modified: trunk/reactos/dll/directx/wine/dsound/dsound_main.c Modified: trunk/reactos/dll/directx/wine/dsound/dsound_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/ds… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/dsound_main.c [iso-8859-1] Tue Jul 29 07:32:47 2014 @@ -150,7 +150,8 @@ hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - CoUninitialize(); + if(SUCCEEDED(init_hr)) + CoUninitialize(); *devenum = NULL; ERR("CoCreateInstance failed: %08x\n", hr); return hr;

10 years, 2 months

[hbelusca] 63755: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. Th...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jul 29 00:00:21 2014 New Revision: 63755 URL: http://svn.reactos.org/svn/reactos?rev=63755&view=rev Log: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleCharacter/Attribute and FillConsoleOutputCharacter/Attribute functions. The underlying CONSOLE_READOUTPUTCODE and CONSOLE_WRITEOUTPUTCODE structures are the same. It should be noticed, as for the Read/WriteConsoleInput functions of r63754 and the other Read/WriteConsole*** functions, that for performance purposes Windows uses a local buffer for "small" sizes; we should do the same too because both the client and the server use the number of elements to actually read/write in order to determine which buffer one should use (local or some shared buffer). - Some memcpy --> RtlCopyMemory. Part 7/X CORE-7931 Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Tue Jul 29 00:00:21 2014 @@ -71,9 +71,9 @@ * For ANSI mode, set this parameter to NULL." */ ReadConsoleRequest->NrCharactersRead = pInputControl->nInitialChars; - memcpy(ReadConsoleRequest->Buffer, - lpBuffer, - pInputControl->nInitialChars * sizeof(WCHAR)); + RtlCopyMemory(ReadConsoleRequest->Buffer, + lpBuffer, + pInputControl->nInitialChars * sizeof(WCHAR)); ReadConsoleRequest->CtrlWakeupMask = pInputControl->dwCtrlWakeupMask; } @@ -86,9 +86,9 @@ /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) { - memcpy(lpBuffer, - ReadConsoleRequest->Buffer, - ReadConsoleRequest->NrCharactersRead * CharSize); + RtlCopyMemory(lpBuffer, + ReadConsoleRequest->Buffer, + ReadConsoleRequest->NrCharactersRead * CharSize); if (lpNumberOfCharsRead != NULL) *lpNumberOfCharsRead = ReadConsoleRequest->NrCharactersRead; @@ -312,14 +312,21 @@ COORD dwReadCoord, LPDWORD lpNumberOfCodesRead) { - BOOL bRet = TRUE; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &ApiMessage.Data.ReadOutputCodeRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; ULONG SizeBytes, CodeSize; - DWORD CodesRead; + + DPRINT("IntReadConsoleOutputCode\n"); + + /* Set up the data to send to the Console Server */ + ReadOutputCodeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ReadOutputCodeRequest->OutputHandle = hConsoleOutput; + ReadOutputCodeRequest->Coord = dwReadCoord; + ReadOutputCodeRequest->NumCodes = nLength; /* Determine the needed size */ + ReadOutputCodeRequest->CodeType = CodeType; switch (CodeType) { case CODE_ASCII: @@ -340,26 +347,33 @@ } SizeBytes = nLength * CodeSize; - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Allocate space in the Buffer */ - CsrAllocateMessagePointer(CaptureBuffer, - SizeBytes, - (PVOID*)&ReadOutputCodeRequest->pCode.pCode); - - /* Start reading */ - ReadOutputCodeRequest->OutputHandle = hConsoleOutput; - ReadOutputCodeRequest->CodeType = CodeType; - ReadOutputCodeRequest->ReadCoord = dwReadCoord; - - ReadOutputCodeRequest->NumCodesToRead = nLength; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are read. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (SizeBytes <= sizeof(ReadOutputCodeRequest->CodeStaticBuffer)) + { + ReadOutputCodeRequest->pCode.pCode = ReadOutputCodeRequest->CodeStaticBuffer; + // CaptureBuffer = NULL; + } + else + { + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Allocate space in the Buffer */ + CsrAllocateMessagePointer(CaptureBuffer, + SizeBytes, + (PVOID*)&ReadOutputCodeRequest->pCode.pCode); + } /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -370,15 +384,13 @@ /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) { - CodesRead = ReadOutputCodeRequest->CodesRead; - memcpy(pCode, ReadOutputCodeRequest->pCode.pCode, CodesRead * CodeSize); - - // ReadOutputCodeRequest->ReadCoord = ReadOutputCodeRequest->EndCoord; + DWORD NumCodes = ReadOutputCodeRequest->NumCodes; + RtlCopyMemory(pCode, + ReadOutputCodeRequest->pCode.pCode, + NumCodes * CodeSize); if (lpNumberOfCodesRead != NULL) - *lpNumberOfCodesRead = CodesRead; - - bRet = TRUE; + *lpNumberOfCodesRead = NumCodes; } else { @@ -387,12 +399,13 @@ /* Error out */ BaseSetLastNTError(ApiMessage.Status); - bRet = FALSE; - } - - CsrFreeCaptureBuffer(CaptureBuffer); - - return bRet; + } + + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + + /* Return TRUE or FALSE */ + return NT_SUCCESS(ApiMessage.Status); } @@ -651,13 +664,27 @@ COORD dwWriteCoord, LPDWORD lpNumberOfCodesWritten) { - BOOL bRet = TRUE; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &ApiMessage.Data.WriteOutputCodeRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; - ULONG CodeSize; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + ULONG SizeBytes, CodeSize; + + if (pCode == NULL) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + DPRINT("IntWriteConsoleOutputCode\n"); + + /* Set up the data to send to the Console Server */ + WriteOutputCodeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + WriteOutputCodeRequest->OutputHandle = hConsoleOutput; + WriteOutputCodeRequest->Coord = dwWriteCoord; + WriteOutputCodeRequest->NumCodes = nLength; /* Determine the needed size */ + WriteOutputCodeRequest->CodeType = CodeType; switch (CodeType) { case CODE_ASCII: @@ -676,29 +703,40 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - WriteOutputCodeRequest->BufferSize = nLength * CodeSize; - - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, WriteOutputCodeRequest->BufferSize); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Capture the buffer to write */ - CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)pCode, - WriteOutputCodeRequest->BufferSize, - (PVOID*)&WriteOutputCodeRequest->pCode.pCode); - - /* Start writing */ - WriteOutputCodeRequest->OutputHandle = hConsoleOutput; - WriteOutputCodeRequest->CodeType = CodeType; - WriteOutputCodeRequest->Coord = dwWriteCoord; - - WriteOutputCodeRequest->Length = (USHORT)nLength; + SizeBytes = nLength * CodeSize; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are written. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (SizeBytes <= sizeof(WriteOutputCodeRequest->CodeStaticBuffer)) + { + WriteOutputCodeRequest->pCode.pCode = WriteOutputCodeRequest->CodeStaticBuffer; + // CaptureBuffer = NULL; + + RtlCopyMemory(WriteOutputCodeRequest->pCode.pCode, + pCode, + SizeBytes); + } + else + { + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, SizeBytes); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Capture the buffer to write */ + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)pCode, + SizeBytes, + (PVOID*)&WriteOutputCodeRequest->pCode.pCode); + } /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -706,16 +744,14 @@ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutputString), sizeof(*WriteOutputCodeRequest)); + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) { - // WriteOutputCodeRequest->Coord = WriteOutputCodeRequest->EndCoord; - if (lpNumberOfCodesWritten != NULL) - // *lpNumberOfCodesWritten = WriteOutputCodeRequest->NrCharactersWritten; - *lpNumberOfCodesWritten = WriteOutputCodeRequest->Length; - - bRet = TRUE; + *lpNumberOfCodesWritten = WriteOutputCodeRequest->NumCodes; } else { @@ -724,12 +760,10 @@ /* Error out */ BaseSetLastNTError(ApiMessage.Status); - bRet = FALSE; - } - - CsrFreeCaptureBuffer(CaptureBuffer); - - return bRet; + } + + /* Return TRUE or FALSE */ + return NT_SUCCESS(ApiMessage.Status); } @@ -745,9 +779,13 @@ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest; - FillOutputRequest->OutputHandle = hConsoleOutput; + /* Set up the data to send to the Console Server */ + FillOutputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + FillOutputRequest->OutputHandle = hConsoleOutput; + FillOutputRequest->WriteCoord = dwWriteCoord; + FillOutputRequest->NumCodes = nLength; + FillOutputRequest->CodeType = CodeType; - switch (CodeType) { case CODE_ASCII: @@ -766,10 +804,6 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - /* Set up the data to send to the Console Server */ - FillOutputRequest->Coord = dwWriteCoord; - FillOutputRequest->Length = nLength; /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -781,10 +815,7 @@ if (NT_SUCCESS(ApiMessage.Status)) { if (lpNumberOfCodesWritten != NULL) - *lpNumberOfCodesWritten = FillOutputRequest->Length; - // *lpNumberOfCodesWritten = Request.Data.FillOutputRequest.NrCharactersWritten; - - return TRUE; + *lpNumberOfCodesWritten = FillOutputRequest->NumCodes; } else { @@ -792,8 +823,10 @@ *lpNumberOfCodesWritten = 0; BaseSetLastNTError(ApiMessage.Status); - return FALSE; - } + } + + /* Return TRUE or FALSE */ + return NT_SUCCESS(ApiMessage.Status); } Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Tue Jul 29 00:00:21 2014 @@ -423,7 +423,7 @@ BOOL Unicode; COORD BufferSize; - COORD BufferCoord; + COORD BufferCoord; // WriteCoord SMALL_RECT WriteRegion; PCHAR_INFO CharInfo; } CONSOLE_WRITEOUTPUT, *PCONSOLE_WRITEOUTPUT; @@ -461,15 +461,12 @@ typedef struct { - HANDLE OutputHandle; - - DWORD NumCodesToRead; - COORD ReadCoord; - COORD EndCoord; - - DWORD CodesRead; + HANDLE ConsoleHandle; + HANDLE OutputHandle; + COORD Coord; CODE_TYPE CodeType; + CHAR CodeStaticBuffer[80]; union { PVOID pCode; @@ -477,32 +474,16 @@ PWCHAR UnicodeChar; PWORD Attribute; } pCode; // Either a pointer to a character or to an attribute. -} CONSOLE_READOUTPUTCODE, *PCONSOLE_READOUTPUTCODE; - -typedef struct -{ - HANDLE OutputHandle; - - ULONG BufferSize; // Seems unusued - WORD Length; - COORD Coord; - COORD EndCoord; - - ULONG NrCharactersWritten; // Seems unusued - - CODE_TYPE CodeType; - union - { - PVOID pCode; - PCHAR AsciiChar; - PWCHAR UnicodeChar; - PWORD Attribute; - } pCode; // Either a pointer to a character or to an attribute. -} CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE; - -typedef struct -{ - HANDLE OutputHandle; + + ULONG NumCodes; +} CONSOLE_READOUTPUTCODE , *PCONSOLE_READOUTPUTCODE, + CONSOLE_WRITEOUTPUTCODE, *PCONSOLE_WRITEOUTPUTCODE; + +typedef struct +{ + HANDLE ConsoleHandle; + HANDLE OutputHandle; + COORD WriteCoord; CODE_TYPE CodeType; union @@ -512,10 +493,7 @@ WORD Attribute; } Code; // Either a character or an attribute. - COORD Coord; - ULONG Length; - - ULONG NrCharactersWritten; // FIXME: Only for chars, is it removable ? + ULONG NumCodes; } CONSOLE_FILLOUTPUTCODE, *PCONSOLE_FILLOUTPUTCODE; typedef struct Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Jul 29 00:00:21 2014 @@ -891,7 +891,7 @@ OUT PVOID StringBuffer, IN ULONG NumCodesToRead, IN PCOORD ReadCoord, - OUT PCOORD EndCoord, + // OUT PCOORD EndCoord, OUT PULONG CodesRead) { SHORT Xpos, Ypos; @@ -901,7 +901,7 @@ PCHAR_INFO Ptr; if (Console == NULL || Buffer == NULL || - ReadCoord == NULL || EndCoord == NULL || CodesRead == NULL) + ReadCoord == NULL || /* EndCoord == NULL || */ CodesRead == NULL) { return STATUS_INVALID_PARAMETER; } @@ -997,8 +997,8 @@ // break; // } - EndCoord->X = Xpos; - EndCoord->Y = (Ypos - Buffer->VirtualY + Buffer->ScreenBufferSize.Y) % Buffer->ScreenBufferSize.Y; + // EndCoord->X = Xpos; + // EndCoord->Y = (Ypos - Buffer->VirtualY + Buffer->ScreenBufferSize.Y) % Buffer->ScreenBufferSize.Y; *CodesRead = (ULONG)((ULONG_PTR)ReadBuffer - (ULONG_PTR)StringBuffer) / CodeSize; // <= NumCodesToRead Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Tue Jul 29 00:00:21 2014 @@ -383,7 +383,7 @@ * Adjust the internal pointer, because its old value points to * the static buffer in the original ApiMessage structure. */ - // GetInputRequest->RecordBufPtr = &GetInputRequest->RecordStaticBuffer; + // GetInputRequest->RecordBufPtr = GetInputRequest->RecordStaticBuffer; } else { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Jul 29 00:00:21 2014 @@ -524,7 +524,7 @@ OUT PVOID StringBuffer, IN ULONG NumCodesToRead, IN PCOORD ReadCoord, - OUT PCOORD EndCoord, + // OUT PCOORD EndCoord, OUT PULONG CodesRead); CSR_API(SrvReadConsoleOutputString) { @@ -532,6 +532,8 @@ PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ReadOutputCodeRequest; PTEXTMODE_SCREEN_BUFFER Buffer; ULONG CodeSize; + + PVOID pCode; DPRINT("SrvReadConsoleOutputString\n"); @@ -553,12 +555,32 @@ return STATUS_INVALID_PARAMETER; } - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&ReadOutputCodeRequest->pCode.pCode, - ReadOutputCodeRequest->NumCodesToRead, - CodeSize)) - { - return STATUS_INVALID_PARAMETER; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are read. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (ReadOutputCodeRequest->NumCodes * CodeSize <= sizeof(ReadOutputCodeRequest->CodeStaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // ReadOutputCodeRequest->pCode.pCode = ReadOutputCodeRequest->CodeStaticBuffer; + pCode = ReadOutputCodeRequest->CodeStaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&ReadOutputCodeRequest->pCode.pCode, + ReadOutputCodeRequest->NumCodes, + CodeSize)) + { + return STATUS_INVALID_PARAMETER; + } + + pCode = ReadOutputCodeRequest->pCode.pCode; } Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), @@ -569,11 +591,11 @@ Status = ConDrvReadConsoleOutputString(Buffer->Header.Console, Buffer, ReadOutputCodeRequest->CodeType, - ReadOutputCodeRequest->pCode.pCode, - ReadOutputCodeRequest->NumCodesToRead, - &ReadOutputCodeRequest->ReadCoord, - &ReadOutputCodeRequest->EndCoord, - &ReadOutputCodeRequest->CodesRead); + pCode, + ReadOutputCodeRequest->NumCodes, + &ReadOutputCodeRequest->Coord, + // &ReadOutputCodeRequest->EndCoord, + &ReadOutputCodeRequest->NumCodes); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; @@ -595,6 +617,8 @@ PTEXTMODE_SCREEN_BUFFER Buffer; ULONG CodeSize; + PVOID pCode; + DPRINT("SrvWriteConsoleOutputString\n"); switch (WriteOutputCodeRequest->CodeType) @@ -615,12 +639,32 @@ return STATUS_INVALID_PARAMETER; } - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&WriteOutputCodeRequest->pCode.pCode, - WriteOutputCodeRequest->Length, - CodeSize)) - { - return STATUS_INVALID_PARAMETER; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than eighty + * bytes are written. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (WriteOutputCodeRequest->NumCodes * CodeSize <= sizeof(WriteOutputCodeRequest->CodeStaticBuffer)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // WriteOutputCodeRequest->pCode.pCode = WriteOutputCodeRequest->CodeStaticBuffer; + pCode = WriteOutputCodeRequest->CodeStaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&WriteOutputCodeRequest->pCode.pCode, + WriteOutputCodeRequest->NumCodes, + CodeSize)) + { + return STATUS_INVALID_PARAMETER; + } + + pCode = WriteOutputCodeRequest->pCode.pCode; } Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), @@ -631,9 +675,9 @@ Status = ConDrvWriteConsoleOutputString(Buffer->Header.Console, Buffer, WriteOutputCodeRequest->CodeType, - WriteOutputCodeRequest->pCode.pCode, - WriteOutputCodeRequest->Length, // NumCodesToWrite, - &WriteOutputCodeRequest->Coord /*, // WriteCoord, + pCode, + WriteOutputCodeRequest->NumCodes, + &WriteOutputCodeRequest->Coord /*, &WriteOutputCodeRequest->EndCoord, &WriteOutputCodeRequest->NrCharactersWritten */); @@ -676,8 +720,8 @@ Buffer, CodeType, &FillOutputRequest->Code, - FillOutputRequest->Length, // NumCodesToWrite, - &FillOutputRequest->Coord /*, // WriteCoord, + FillOutputRequest->NumCodes, + &FillOutputRequest->WriteCoord /*, &FillOutputRequest->NrCharactersWritten */); // FillOutputRequest->NrCharactersWritten = Written;

10 years, 2 months

[hbelusca] 63754: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 28 21:20:36 2014 New Revision: 63754 URL: http://svn.reactos.org/svn/reactos?rev=63754&view=rev Log: [KERNEL32][CONSRV] - Make kernel32 / winsrv console CSR structures Win2k3-compliant for Read/WriteConsoleInput functions. - Really fix some ASSERTS from r63108. Part 6/X CORE-7931 Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Mon Jul 28 21:20:36 2014 @@ -127,39 +127,62 @@ { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETINPUT GetInputRequest = &ApiMessage.Data.GetInputRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; - ULONG Size; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; if (lpBuffer == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_ACCESS); return FALSE; } - Size = nLength * sizeof(INPUT_RECORD); - - DPRINT("IntGetConsoleInput: %lx %p\n", Size, lpNumberOfEventsRead); - - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + if (!IsConsoleHandle(hConsoleInput)) + { + SetLastError(ERROR_INVALID_HANDLE); + + if (lpNumberOfEventsRead != NULL) + *lpNumberOfEventsRead = 0; + return FALSE; } - /* Allocate space in the Buffer */ - CsrAllocateMessagePointer(CaptureBuffer, - Size, - (PVOID*)&GetInputRequest->InputRecord); + DPRINT("IntGetConsoleInput: %lx %p\n", nLength, lpNumberOfEventsRead); /* Set up the data to send to the Console Server */ - GetInputRequest->InputHandle = hConsoleInput; - GetInputRequest->InputsRead = 0; - GetInputRequest->Length = nLength; - GetInputRequest->wFlags = wFlags; - GetInputRequest->Unicode = bUnicode; + GetInputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetInputRequest->InputHandle = hConsoleInput; + GetInputRequest->NumRecords = nLength; + GetInputRequest->Flags = wFlags; + GetInputRequest->Unicode = bUnicode; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than five + * input records are read. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (nLength <= sizeof(GetInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD)) + { + GetInputRequest->RecordBufPtr = GetInputRequest->RecordStaticBuffer; + // CaptureBuffer = NULL; + } + else + { + ULONG Size = nLength * sizeof(INPUT_RECORD); + + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Allocate space in the Buffer */ + CsrAllocateMessagePointer(CaptureBuffer, + Size, + (PVOID*)&GetInputRequest->RecordBufPtr); + } /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -171,16 +194,15 @@ if (NT_SUCCESS(ApiMessage.Status)) { /* Return the number of events read */ - DPRINT("Events read: %lx\n", GetInputRequest->InputsRead); + DPRINT("Events read: %lx\n", GetInputRequest->NumRecords); if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = GetInputRequest->InputsRead; + *lpNumberOfEventsRead = GetInputRequest->NumRecords; /* Copy into the buffer */ - DPRINT("Copying to buffer\n"); RtlCopyMemory(lpBuffer, - GetInputRequest->InputRecord, - sizeof(INPUT_RECORD) * GetInputRequest->InputsRead); + GetInputRequest->RecordBufPtr, + GetInputRequest->NumRecords * sizeof(INPUT_RECORD)); } else { @@ -191,12 +213,11 @@ BaseSetLastNTError(ApiMessage.Status); } - /* Release the capture buffer */ - CsrFreeCaptureBuffer(CaptureBuffer); + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ - return (GetInputRequest->InputsRead > 0); - // return NT_SUCCESS(ApiMessage.Status); + return NT_SUCCESS(ApiMessage.Status); } @@ -216,7 +237,7 @@ if (lpBuffer == NULL) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_ACCESS); return FALSE; } @@ -454,38 +475,62 @@ PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsWritten, - BOOL bUnicode, - BOOL bAppendToEnd) + BOOLEAN bUnicode, + BOOLEAN bAppendToEnd) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEINPUT WriteInputRequest = &ApiMessage.Data.WriteInputRequest; - PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD Size; - - Size = nLength * sizeof(INPUT_RECORD); - - DPRINT("IntWriteConsoleInput: %lx %p\n", Size, lpNumberOfEventsWritten); - - /* Allocate a Capture Buffer */ - CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed!\n"); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + + if (lpBuffer == NULL) + { + SetLastError(ERROR_INVALID_ACCESS); return FALSE; } - /* Capture the user buffer */ - CsrCaptureMessageBuffer(CaptureBuffer, - lpBuffer, - Size, - (PVOID*)&WriteInputRequest->InputRecord); + DPRINT("IntWriteConsoleInput: %lx %p\n", nLength, lpNumberOfEventsWritten); /* Set up the data to send to the Console Server */ - WriteInputRequest->InputHandle = hConsoleInput; - WriteInputRequest->Length = nLength; - WriteInputRequest->Unicode = bUnicode; - WriteInputRequest->AppendToEnd = bAppendToEnd; + WriteInputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + WriteInputRequest->InputHandle = hConsoleInput; + WriteInputRequest->NumRecords = nLength; + WriteInputRequest->Unicode = bUnicode; + WriteInputRequest->AppendToEnd = bAppendToEnd; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than five + * input records are written. Otherwise a new buffer is allocated. + * This behaviour is also expected in the server-side. + */ + if (nLength <= sizeof(WriteInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD)) + { + WriteInputRequest->RecordBufPtr = WriteInputRequest->RecordStaticBuffer; + // CaptureBuffer = NULL; + + RtlCopyMemory(WriteInputRequest->RecordBufPtr, + lpBuffer, + nLength * sizeof(INPUT_RECORD)); + } + else + { + ULONG Size = nLength * sizeof(INPUT_RECORD); + + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Capture the user buffer */ + CsrCaptureMessageBuffer(CaptureBuffer, + lpBuffer, + Size, + (PVOID*)&WriteInputRequest->RecordBufPtr); + } /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -493,14 +538,17 @@ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleInput), sizeof(*WriteInputRequest)); + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) { - /* Return the number of events read */ - DPRINT("Events read: %lx\n", WriteInputRequest->Length); + /* Return the number of events written */ + DPRINT("Events written: %lx\n", WriteInputRequest->NumRecords); if (lpNumberOfEventsWritten != NULL) - *lpNumberOfEventsWritten = WriteInputRequest->Length; + *lpNumberOfEventsWritten = WriteInputRequest->NumRecords; } else { @@ -510,9 +558,6 @@ /* Error out */ BaseSetLastNTError(ApiMessage.Status); } - - /* Release the capture buffer */ - CsrFreeCaptureBuffer(CaptureBuffer); /* Return TRUE or FALSE */ return NT_SUCCESS(ApiMessage.Status); @@ -535,7 +580,7 @@ if ((lpBuffer == NULL) || (lpWriteRegion == NULL)) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_ACCESS); return FALSE; } /* Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Jul 28 21:20:36 2014 @@ -520,13 +520,25 @@ typedef struct { - HANDLE InputHandle; - ULONG InputsRead; - PINPUT_RECORD InputRecord; - ULONG Length; - WORD wFlags; - BOOLEAN Unicode; + HANDLE ConsoleHandle; + HANDLE InputHandle; + INPUT_RECORD RecordStaticBuffer[5]; + PINPUT_RECORD RecordBufPtr; + ULONG NumRecords; + WORD Flags; + BOOLEAN Unicode; } CONSOLE_GETINPUT, *PCONSOLE_GETINPUT; + +typedef struct +{ + HANDLE ConsoleHandle; + HANDLE InputHandle; + INPUT_RECORD RecordStaticBuffer[5]; + PINPUT_RECORD RecordBufPtr; + ULONG NumRecords; + BOOLEAN Unicode; + BOOLEAN AppendToEnd; +} CONSOLE_WRITEINPUT, *PCONSOLE_WRITEINPUT; typedef struct { @@ -541,18 +553,9 @@ typedef struct { + HANDLE ConsoleHandle; HANDLE InputHandle; - DWORD Length; - INPUT_RECORD* InputRecord; - BOOL Unicode; - BOOL AppendToEnd; -} CONSOLE_WRITEINPUT, *PCONSOLE_WRITEINPUT; - -typedef struct -{ - HANDLE ConsoleHandle; - HANDLE InputHandle; - DWORD NumberOfEvents; + ULONG NumberOfEvents; } CONSOLE_GETNUMINPUTEVENTS, *PCONSOLE_GETNUMINPUTEVENTS; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Mon Jul 28 21:20:36 2014 @@ -170,8 +170,7 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); - ASSERT( (Buffer != NULL && NumCharsToRead > 0) || - (Buffer == NULL && NumCharsToRead == 0) ); + ASSERT((Buffer != NULL) || (Buffer == NULL && NumCharsToRead == 0)); /* We haven't read anything (yet) */ @@ -316,11 +315,9 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); - ASSERT( (InputRecord != NULL && NumEventsToRead > 0) || - (InputRecord == NULL && NumEventsToRead == 0) ); - - // Do NOT do that !! Use the existing number of events already read, if any... - // if (NumEventsRead) *NumEventsRead = 0; + ASSERT((InputRecord != NULL) || (InputRecord == NULL && NumEventsToRead == 0)); + + if (NumEventsRead) *NumEventsRead = 0; if (IsListEmpty(&InputBuffer->InputEvents)) { @@ -333,8 +330,7 @@ /* Only get input if there is any */ CurrentInput = InputBuffer->InputEvents.Flink; - if (NumEventsRead) i = *NumEventsRead; // We will read the remaining events... - + i = 0; while ((CurrentInput != &InputBuffer->InputEvents) && (i < NumEventsToRead)) { Input = CONTAINING_RECORD(CurrentInput, ConsoleInput, ListEntry); @@ -386,12 +382,10 @@ /* Validity checks */ ASSERT(Console == InputBuffer->Header.Console); - ASSERT( (InputRecord != NULL && NumEventsToWrite > 0) || - (InputRecord == NULL && NumEventsToWrite == 0) ); + ASSERT((InputRecord != NULL) || (InputRecord == NULL && NumEventsToWrite == 0)); // if (NumEventsWritten) *NumEventsWritten = 0; - - /// Status = ConioAddInputEvents(Console, InputRecord, NumEventsToWrite, NumEventsWritten, AppendToEnd); + // Status = ConioAddInputEvents(Console, InputRecord, NumEventsToWrite, NumEventsWritten, AppendToEnd); for (i = 0; i < NumEventsToWrite && NT_SUCCESS(Status); ++i) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Jul 28 21:20:36 2014 @@ -829,8 +829,7 @@ /* Validity checks */ ASSERT(Console == ScreenBuffer->Header.Console); - ASSERT( (StringBuffer != NULL && NumCharsToWrite > 0) || - (StringBuffer == NULL && NumCharsToWrite == 0) ); + ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCharsToWrite == 0)); // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) if (Console->PauseFlags && Console->UnpauseEvent != NULL) @@ -909,8 +908,7 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); - ASSERT( (StringBuffer != NULL && NumCodesToRead > 0) || - (StringBuffer == NULL && NumCodesToRead == 0) ); + ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToRead == 0)); switch (CodeType) { @@ -1033,8 +1031,7 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); - ASSERT( (StringBuffer != NULL && NumCodesToWrite > 0) || - (StringBuffer == NULL && NumCodesToWrite == 0) ); + ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToWrite == 0)); switch (CodeType) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Mon Jul 28 21:20:36 2014 @@ -260,17 +260,39 @@ NTSTATUS Status; PCONSOLE_GETINPUT GetInputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetInputRequest; PCONSOLE_INPUT_BUFFER InputBuffer = InputInfo->InputBuffer; - - // GetInputRequest->InputsRead = 0; - + ULONG NumEventsRead; + + PINPUT_RECORD InputRecord; + + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than five + * input records are read. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (GetInputRequest->NumRecords <= sizeof(GetInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // GetInputRequest->RecordBufPtr = GetInputRequest->RecordStaticBuffer; + InputRecord = GetInputRequest->RecordStaticBuffer; + } + else + { + InputRecord = GetInputRequest->RecordBufPtr; + } + + NumEventsRead = 0; Status = ConDrvGetConsoleInput(InputBuffer->Header.Console, InputBuffer, - (GetInputRequest->wFlags & CONSOLE_READ_KEEPEVENT) != 0, - (GetInputRequest->wFlags & CONSOLE_READ_CONTINUE ) == 0, + (GetInputRequest->Flags & CONSOLE_READ_KEEPEVENT) != 0, + (GetInputRequest->Flags & CONSOLE_READ_CONTINUE ) == 0, GetInputRequest->Unicode, - GetInputRequest->InputRecord, - GetInputRequest->Length, - &GetInputRequest->InputsRead); + InputRecord, + GetInputRequest->NumRecords, + &NumEventsRead); if (Status == STATUS_PENDING) { @@ -283,6 +305,7 @@ else { /* We read all what we wanted, we return the error code we were given */ + GetInputRequest->NumRecords = NumEventsRead; return Status; // return STATUS_SUCCESS; } @@ -345,21 +368,36 @@ DPRINT("SrvGetConsoleInput\n"); - if (GetInputRequest->wFlags & ~(CONSOLE_READ_KEEPEVENT | CONSOLE_READ_CONTINUE)) + if (GetInputRequest->Flags & ~(CONSOLE_READ_KEEPEVENT | CONSOLE_READ_CONTINUE)) return STATUS_INVALID_PARAMETER; - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&GetInputRequest->InputRecord, - GetInputRequest->Length, - sizeof(INPUT_RECORD))) - { - return STATUS_INVALID_PARAMETER; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than five + * input records are read. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (GetInputRequest->NumRecords <= sizeof(GetInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // GetInputRequest->RecordBufPtr = &GetInputRequest->RecordStaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&GetInputRequest->RecordBufPtr, + GetInputRequest->NumRecords, + sizeof(INPUT_RECORD))) + { + return STATUS_INVALID_PARAMETER; + } } Status = ConSrvGetInputBufferAndHandleEntry(ProcessData, GetInputRequest->InputHandle, &InputBuffer, &HandleEntry, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; - - GetInputRequest->InputsRead = 0; InputInfo.CallingThread = CsrGetClientThread(); InputInfo.HandleEntry = HandleEntry; @@ -389,14 +427,36 @@ PCONSOLE_INPUT_BUFFER InputBuffer; ULONG NumEventsWritten; + PINPUT_RECORD InputRecord; + DPRINT("SrvWriteConsoleInput\n"); - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&WriteInputRequest->InputRecord, - WriteInputRequest->Length, - sizeof(INPUT_RECORD))) - { - return STATUS_INVALID_PARAMETER; + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than five + * input records are written. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (WriteInputRequest->NumRecords <= sizeof(WriteInputRequest->RecordStaticBuffer)/sizeof(INPUT_RECORD)) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // WriteInputRequest->RecordBufPtr = WriteInputRequest->RecordStaticBuffer; + InputRecord = WriteInputRequest->RecordStaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&WriteInputRequest->RecordBufPtr, + WriteInputRequest->NumRecords, + sizeof(INPUT_RECORD))) + { + return STATUS_INVALID_PARAMETER; + } + + InputRecord = WriteInputRequest->RecordBufPtr; } Status = ConSrvGetInputBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), @@ -409,10 +469,10 @@ InputBuffer, WriteInputRequest->Unicode, WriteInputRequest->AppendToEnd, - WriteInputRequest->InputRecord, - WriteInputRequest->Length, + InputRecord, + WriteInputRequest->NumRecords, &NumEventsWritten); - WriteInputRequest->Length = NumEventsWritten; + WriteInputRequest->NumRecords = NumEventsWritten; ConSrvReleaseInputBuffer(InputBuffer, TRUE); return Status;

10 years, 2 months

[hbelusca] 63753: [KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 28 13:37:54 2014 New Revision: 63753 URL: http://svn.reactos.org/svn/reactos?rev=63753&view=rev Log: [KERNEL32] - No need to use another NTSTATUS variable, since all of the information is already contained in ApiMessage.Status. - Do not hardcode the type of the request variables in the sizeofs used in the CsrClientCallServer calls. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Mon Jul 28 13:37:54 2014 @@ -33,7 +33,6 @@ PCONSOLE_READCONSOLE_CONTROL pInputControl, BOOL bUnicode) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READCONSOLE ReadConsoleRequest = &ApiMessage.Data.ReadConsoleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; @@ -79,13 +78,13 @@ } /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsole), - sizeof(CONSOLE_READCONSOLE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsole), + sizeof(*ReadConsoleRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { memcpy(lpBuffer, ReadConsoleRequest->Buffer, @@ -105,7 +104,7 @@ *lpNumberOfCharsRead = 0; /* Error out */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); } CsrFreeCaptureBuffer(CaptureBuffer); @@ -113,7 +112,7 @@ /* Return TRUE or FALSE */ // return TRUE; return (ReadConsoleRequest->NrCharactersRead > 0); - // return NT_SUCCESS(Status); + // return NT_SUCCESS(ApiMessage.Status); } @@ -126,7 +125,6 @@ WORD wFlags, BOOLEAN bUnicode) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETINPUT GetInputRequest = &ApiMessage.Data.GetInputRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; @@ -164,14 +162,13 @@ GetInputRequest->Unicode = bUnicode; /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleInput), - sizeof(CONSOLE_GETINPUT)); - DPRINT("Server returned: %x\n", Status); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetConsoleInput), + sizeof(*GetInputRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { /* Return the number of events read */ DPRINT("Events read: %lx\n", GetInputRequest->InputsRead); @@ -191,7 +188,7 @@ *lpNumberOfEventsRead = 0; /* Error out */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); } /* Release the capture buffer */ @@ -199,7 +196,7 @@ /* Return TRUE or FALSE */ return (GetInputRequest->InputsRead > 0); - // return NT_SUCCESS(Status); + // return NT_SUCCESS(ApiMessage.Status); } @@ -252,8 +249,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutput), - sizeof(CONSOLE_READOUTPUT)); - DPRINT("Server returned: %x\n", ApiMessage.Status); + sizeof(*ReadOutputRequest)); /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) @@ -295,7 +291,6 @@ COORD dwReadCoord, LPDWORD lpNumberOfCodesRead) { - NTSTATUS Status; BOOL bRet = TRUE; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &ApiMessage.Data.ReadOutputCodeRequest; @@ -346,13 +341,13 @@ ReadOutputCodeRequest->NumCodesToRead = nLength; /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutputString), - sizeof(CONSOLE_READOUTPUTCODE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepReadConsoleOutputString), + sizeof(*ReadOutputCodeRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { CodesRead = ReadOutputCodeRequest->CodesRead; memcpy(pCode, ReadOutputCodeRequest->pCode.pCode, CodesRead * CodeSize); @@ -370,7 +365,7 @@ *lpNumberOfCodesRead = 0; /* Error out */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); bRet = FALSE; } @@ -393,7 +388,6 @@ LPVOID lpReserved, BOOL bUnicode) { - NTSTATUS Status; BOOL bRet = TRUE; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITECONSOLE WriteConsoleRequest = &ApiMessage.Data.WriteConsoleRequest; @@ -425,13 +419,13 @@ WriteConsoleRequest->Unicode = bUnicode; /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsole), - sizeof(CONSOLE_WRITECONSOLE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsole), + sizeof(*WriteConsoleRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { if (lpNumberOfCharsWritten != NULL) *lpNumberOfCharsWritten = WriteConsoleRequest->NrCharactersWritten; @@ -444,7 +438,7 @@ *lpNumberOfCharsWritten = 0; /* Error out */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); bRet = FALSE; } @@ -497,8 +491,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleInput), - sizeof(CONSOLE_WRITEINPUT)); - DPRINT("Server returned: %x\n", ApiMessage.Status); + sizeof(*WriteInputRequest)); /* Check for success */ if (NT_SUCCESS(ApiMessage.Status)) @@ -583,8 +576,7 @@ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, CaptureBuffer, CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutput), - sizeof(CONSOLE_WRITEOUTPUT)); - DPRINT("Server returned: %x\n", ApiMessage.Status); + sizeof(*WriteOutputRequest)); /* Check for success */ if (!NT_SUCCESS(ApiMessage.Status)) @@ -614,7 +606,6 @@ COORD dwWriteCoord, LPDWORD lpNumberOfCodesWritten) { - NTSTATUS Status; BOOL bRet = TRUE; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &ApiMessage.Data.WriteOutputCodeRequest; @@ -665,13 +656,13 @@ WriteOutputCodeRequest->Length = (USHORT)nLength; /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutputString), - sizeof(CONSOLE_WRITEOUTPUTCODE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutputString), + sizeof(*WriteOutputCodeRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { // WriteOutputCodeRequest->Coord = WriteOutputCodeRequest->EndCoord; @@ -687,7 +678,7 @@ *lpNumberOfCodesWritten = 0; /* Error out */ - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); bRet = FALSE; } @@ -706,7 +697,6 @@ COORD dwWriteCoord, LPDWORD lpNumberOfCodesWritten) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest; @@ -737,13 +727,13 @@ FillOutputRequest->Length = nLength; /* Call the server */ - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFillConsoleOutput), - sizeof(CONSOLE_FILLOUTPUTCODE)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFillConsoleOutput), + sizeof(*FillOutputRequest)); /* Check for success */ - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(ApiMessage.Status)) { if (lpNumberOfCodesWritten != NULL) *lpNumberOfCodesWritten = FillOutputRequest->Length; @@ -756,7 +746,7 @@ if (lpNumberOfCodesWritten != NULL) *lpNumberOfCodesWritten = 0; - BaseSetLastNTError(Status); + BaseSetLastNTError(ApiMessage.Status); return FALSE; } }

10 years, 2 months

[dquintana] 63752: [STOBJECT] * Nothing happened. No files were missing. Look elsewhere.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jul 28 13:24:56 2014 New Revision: 63752 URL: http://svn.reactos.org/svn/reactos?rev=63752&view=rev Log: [STOBJECT] * Nothing happened. No files were missing. Look elsewhere. Added: branches/shell-experiments/dll/win32/stobject/volume.cpp (with props) Added: branches/shell-experiments/dll/win32/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/sto… ============================================================================== --- branches/shell-experiments/dll/win32/stobject/volume.cpp (added) +++ branches/shell-experiments/dll/win32/stobject/volume.cpp [iso-8859-1] Mon Jul 28 13:24:56 2014 @@ -0,0 +1,230 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll\win32\stobject\volume.cpp + * PURPOSE: Systray shell service object + * PROGRAMMERS: Robert Naumann + David Quintana <gigaherz(a)gmail.com> + */ + +#include "precomp.h" + +#include <mmsystem.h> +#include <mmddk.h> + +HICON g_hIconVolume; +HICON g_hIconMute; + +HMIXER g_hMixer; +UINT g_mixerId; +DWORD g_mixerLineID; +DWORD g_muteControlID; + +UINT g_mmDeviceChange; + +BOOL g_IsMute = FALSE; + +static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) +{ + MMRESULT result; + UINT mixerId = 0; + DWORD waveOutId = 0; + DWORD param2 = 0; + + DbgPrint("Volume_FindDefaultMixerID\n"); + + result = waveOutMessage((HWAVEOUT) WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD) &waveOutId, (DWORD) &param2); + if (result) + return E_FAIL; + + if (waveOutId == (DWORD)-1) + { + DbgPrint("WARNING: waveOut has no default device, trying with first available device...\n", waveOutId); + + mixerId = 0; + } + else + { + DbgPrint("waveOut default device is %d\n", waveOutId); + + result = mixerGetID((HMIXEROBJ) waveOutId, &mixerId, MIXER_OBJECTF_WAVEOUT); + if (result) + return E_FAIL; + + DbgPrint("mixerId for waveOut default device is %d\n", mixerId); + } + + g_mixerId = mixerId; + return S_OK; + + MIXERCAPS mixerCaps; + MIXERLINE mixerLine; + MIXERCONTROL mixerControl; + MIXERLINECONTROLS mixerLineControls; + + g_mixerLineID = -1; + g_muteControlID = -1; + + if (mixerGetDevCapsW(g_mixerId, &mixerCaps, sizeof(mixerCaps))) + return E_FAIL; + + if (mixerCaps.cDestinations == 0) + return S_FALSE; + + DbgPrint("mixerCaps.cDestinations %d\n", mixerCaps.cDestinations); + + DWORD idx; + for (idx = 0; idx < mixerCaps.cDestinations; idx++) + { + mixerLine.cbStruct = sizeof(mixerLine); + mixerLine.dwDestination = idx; + if (!mixerGetLineInfoW((HMIXEROBJ) g_mixerId, &mixerLine, 0)) + { + if (mixerLine.dwComponentType >= MIXERLINE_COMPONENTTYPE_DST_SPEAKERS && + mixerLine.dwComponentType <= MIXERLINE_COMPONENTTYPE_DST_HEADPHONES) + break; + DbgPrint("Destination %d was not speakers or headphones.\n"); + } + } + + if (idx >= mixerCaps.cDestinations) + return E_FAIL; + + DbgPrint("Valid destination %d found.\n"); + + g_mixerLineID = mixerLine.dwLineID; + + mixerLineControls.cbStruct = sizeof(mixerLineControls); + mixerLineControls.dwLineID = mixerLine.dwLineID; + mixerLineControls.cControls = 1; + mixerLineControls.dwControlType = MIXERCONTROL_CONTROLTYPE_MUTE; + mixerLineControls.pamxctrl = &mixerControl; + mixerLineControls.cbmxctrl = sizeof(mixerControl); + + if (mixerGetLineControlsW((HMIXEROBJ) g_mixerId, &mixerLineControls, MIXER_GETLINECONTROLSF_ONEBYTYPE)) + return E_FAIL; + + DbgPrint("Found control id %d for mute: %d\n", mixerControl.dwControlID); + + g_muteControlID = mixerControl.dwControlID; + + return S_OK; +} + +HRESULT Volume_IsMute() +{ + MIXERCONTROLDETAILS mixerControlDetails; + + if (g_mixerId != (UINT)-1 && g_muteControlID != (DWORD)-1) + { + BOOL detailsResult = 0; + mixerControlDetails.cbStruct = sizeof(mixerControlDetails); + mixerControlDetails.hwndOwner = 0; + mixerControlDetails.dwControlID = g_muteControlID; + mixerControlDetails.cChannels = 1; + mixerControlDetails.paDetails = &detailsResult; + mixerControlDetails.cbDetails = sizeof(detailsResult); + if (mixerGetControlDetailsW((HMIXEROBJ) g_mixerId, &mixerControlDetails, 0)) + return E_FAIL; + + DbgPrint("Obtained mute status %d\n", detailsResult); + + g_IsMute = detailsResult != 0; + } + + return S_OK; +} + +HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray) +{ + HRESULT hr; + + DbgPrint("Volume_Init\n"); + + if (!g_hMixer) + { + hr = Volume_FindMixerControl(pSysTray); + if (FAILED(hr)) + return hr; + + g_mmDeviceChange = RegisterWindowMessageW(L"winmm_devicechange"); + } + + g_hIconVolume = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_VOLUME)); + g_hIconMute = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_VOLMUTE)); + + Volume_IsMute(); + + HICON icon; + if (g_IsMute) + icon = g_hIconMute; + else + icon = g_hIconVolume; + + pSysTray->NotifyIcon(NIM_ADD, ID_ICON_VOLUME, icon, L"Placeholder"); + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, L"Placeholder"); +} + +HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray) +{ + DbgPrint("Volume_Update\n"); + + Volume_IsMute(); + + HICON icon; + if (g_IsMute) + icon = g_hIconMute; + else + icon = g_hIconVolume; + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_VOLUME, icon, L"Placeholder"); +} + +HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray) +{ + DbgPrint("Volume_Shutdown\n"); + + return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_VOLUME, NULL, NULL); +} + +HRESULT Volume_OnDeviceChange(_In_ CSysTray * pSysTray, WPARAM wParam, LPARAM lParam) +{ + return Volume_FindMixerControl(pSysTray); +} + +HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == g_mmDeviceChange) + return Volume_OnDeviceChange(pSysTray, wParam, lParam); + + if (uMsg != ID_ICON_VOLUME) + return S_FALSE; + + DbgPrint("Volume_Message\n"); + + DbgPrint("Calling update...\n"); + Volume_Update(pSysTray); + + switch (lParam) + { + case WM_LBUTTONDOWN: + break; + case WM_LBUTTONUP: + DbgPrint("TODO: display volume slider\n"); + break; + case WM_LBUTTONDBLCLK: + // FIXME: ensure we are loading the right one + ShellExecute(NULL, NULL, L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); + break; + case WM_RBUTTONDOWN: + break; + case WM_RBUTTONUP: + break; + case WM_RBUTTONDBLCLK: + break; + case WM_MOUSEMOVE: + break; + } + + return S_OK; +} Propchange: branches/shell-experiments/dll/win32/stobject/volume.cpp ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 2 months

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2014