Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 24 10:33:06 2012 New Revision: 55838 URL: http://svn.reactos.org/svn/reactos?rev=55838&view=rev Log: Update for rapps Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.26 +Version = 3.6.27 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 8.22MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 8.06MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 8.05MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 8.28MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 8.06MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 8.9MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.46MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 8.53MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 8.44MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 10 -Version = 10.0 +Version = 10.0.2 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 15.06MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/en-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 14.92MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/de/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 14.88MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/es-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/e… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 15.18MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/fr/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/f… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 14.91MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/nb-… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 15.76MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/pl/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/p… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 15.33MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/ru/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/r… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 15.57MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/sk/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/s… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 15.32MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0/win32/uk/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/10.0.2/win32/u… 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] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.4.5 +Version = 3.5.0 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 190.74MB +Size = 201.3MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.4.5/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.5.0/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.42 +Version = 0.9.44 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.1MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.42-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.44-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment -Version = 1.5.1.1 +Version = 2.0 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 13.76MB +Size = 17.8MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://ovh.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/1.5.1/RosB… +URLDownload = http://heanet.dl.sourceforge.net/project/reactos/RosBE-Windows/i386/2.0/Ros… CDPath = none [Section.0405] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,41 +2,41 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.7 +Version = 2.7.2 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 17.59MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/en-US/SeaMonkey%2… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/en-US/SeaMonkey… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 17.56MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/de/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/de/SeaMonkey%20… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 17.49MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/es-ES/SeaMonkey%2… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/es-ES/SeaMonkey… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 17.79MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/fr/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/fr/SeaMonkey%20… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 18.38MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/pl/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/pl/SeaMonkey%20… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/ru/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7/win32/ru/SeaMonkey%20Se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.7.2/win32/ru/SeaMonkey%20… 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] Fri Feb 24 10:33:06 2012 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.18 +Version = 3.1.19 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.06MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.91MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.88MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 9.13MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.73MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.29MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.29MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.18/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.19/win… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -1,48 +1,48 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Thunderbird 9 -Version = 9.0.1 +Name = Mozilla Thunderbird 10 +Version = 10.0.2 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 16.22MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 15.1MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 15.0MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 15.4MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 15.9MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 15.5MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 15.5MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/9.0.1/win3… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/10.0.2/win… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = UltraVNC -Version = 1.0.9.6.1 +Version = 1.0.9.6.2 Licence = GPL Description = Open-source VNC client/server. Size = 2.19MB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://support1.uvnc.com/download/10961/UltraVNC_1.0.9.6.1_Setup.exe +URLDownload = http://www.uvnc.eu/download/10962/UltraVNC_1.0.9.6.2_Setup.exe CDPath = none [Section.040a] 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] Fri Feb 24 10:33:06 2012 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.1.11 +Version = 2.0.0 Licence = GPL Description = A media player. -Size = 20.1MB +Size = 21.1MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://kent.dl.sourceforge.net/project/vlc/1.1.11/win32/vlc-1.1.11-win32.exe +URLDownload = http://kent.dl.sourceforge.net/project/vlc/2.0.0/win32/vlc-2.0.0-win32.exe CDPath = none [Section.0407]

12 years, 8 months

[arty] 55837: [NEWCC] Update used page table entry counts when mapping pages in cache sections.

by arty＠svn.reactos.org

Author: arty Date: Fri Feb 24 10:05:06 2012 New Revision: 55837 URL: http://svn.reactos.org/svn/reactos?rev=55837&view=rev Log: [NEWCC] Update used page table entry counts when mapping pages in cache sections. Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Feb 24 10:05:06 2012 @@ -49,6 +49,7 @@ #include "../newcc.h" #define NDEBUG #include <debug.h> +#include "../mm/ARM3/miarm.h" #define DPRINTC DPRINT @@ -56,6 +57,7 @@ extern KEVENT MpwThreadEvent; extern KSPIN_LOCK MiSectionPageTableLock; +extern PMMWSL MmWorkingSetList; /* GLOBALS *******************************************************************/ @@ -137,9 +139,18 @@ { MmSetPageEntrySectionSegment(Segment, &FileOffset, MAKE_PFN_SSE(Page)); Address = ((PCHAR)MemoryArea->StartingAddress) + FileOffset.QuadPart - FirstMapped.QuadPart; + MmReferencePage(Page); MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); MmInsertRmap(Page, NULL, Address); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif } else MmReleasePageMemoryConsumer(MC_CACHE, Page); Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Fri Feb 24 10:05:06 2012 @@ -49,10 +49,12 @@ #include "newmm.h" #define NDEBUG #include <debug.h> +#include "../mm/ARM3/miarm.h" #define DPRINTC DPRINT extern KEVENT MmWaitPageEvent; +extern PMMWSL MmWorkingSetList; NTSTATUS NTAPI @@ -140,6 +142,14 @@ { DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Required->Page[0], Process, Address); @@ -164,6 +174,14 @@ MmReferencePage(Page); Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, 1); +#if (_MI_PAGING_LEVELS == 2) + /* Reference Page Directory Entry */ + if(Address < MmSystemRangeStart) + { + MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } +#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Page, Process, Address);

12 years, 8 months

[cgutman] 55836: [USBOHCI] - Try to fix some real hardware OHCI initialization hangs

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Feb 24 07:26:43 2012 New Revision: 55836 URL: http://svn.reactos.org/svn/reactos?rev=55836&view=rev Log: [USBOHCI] - Try to fix some real hardware OHCI initialization hangs Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 07:26:43 2012 @@ -533,7 +533,10 @@ // get frame interval // FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; DPRINT1("FrameInterval %x\n", FrameInterval); @@ -1101,11 +1104,6 @@ if ((Reset & OHCI_HOST_CONTROLLER_RESET) == 0) { // - // restore the frame interval register - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); - - // // controller completed reset // return STATUS_SUCCESS;

12 years, 8 months

[dgorbachev] 55835: [FREELDR][NTOSKRNL] Update linker scripts.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Feb 23 18:59:24 2012 New Revision: 55835 URL: http://svn.reactos.org/svn/reactos?rev=55835&view=rev Log: [FREELDR][NTOSKRNL] Update linker scripts. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] Thu Feb 23 18:59:24 2012 @@ -23,6 +23,15 @@ __bss_end__ = . ; } + .stab BLOCK(__section_alignment__) (NOLOAD) : + { + *(.stab) + } + .stabstr BLOCK(__section_alignment__) (NOLOAD) : + { + *(.stabstr) + } + /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section. Unlike other targets that fake this by putting the @@ -43,7 +52,7 @@ /* DWARF 2. */ .debug_info BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_info) *(.gnu.linkonce.wi.*) + *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : { @@ -98,7 +107,7 @@ /* DWARF 4. */ .debug_types BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_types) *(.gnu.linkonce.wt.*) + *(.debug_types .gnu.linkonce.wt.*) } /DISCARD/ : Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] Thu Feb 23 18:59:24 2012 @@ -1,105 +1,150 @@ -OUTPUT_FORMAT(pei-i386) -ENTRY(_mainCRTStartup) SECTIONS { - .text __image_base__ + __section_alignment__ : + .text __image_base__ + __section_alignment__ : { - __text_start__ = .; - *(.init) *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) + *(SORT(.text*)) } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : + + .data BLOCK(__section_alignment__) : { - __data_start__ = . ; *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) + *(SORT(.data*)) } + .rdata BLOCK(__section_alignment__) : { *(.rdata) - *(SORT(.rdata$*)) + *(SORT(.rdata*)) *(.eh_frame) } + .edata BLOCK(__section_alignment__) : { *(.edata) } + /DISCARD/ : { - *(.debug$S) - *(.debug$T) - *(.debug$F) *(.drectve) + *(.gnu.lto_*) } .idata BLOCK(__section_alignment__) : { /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ + See pe.em:sort_sections. */ SORT(*)(.idata$2) SORT(*)(.idata$3) /* These zeroes mark the end of the import list. */ LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) + SORT(*)(.idata$4) SORT(*)(.idata$5) SORT(*)(.idata$6) SORT(*)(.idata$7) } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } + .rsrc BLOCK(__section_alignment__) : - { + { *(.rsrc) *(SORT(.rsrc$*)) } + .bss BLOCK(__section_alignment__) : { - __bss_start__ = . ; *(.bss) *(COMMON) - __bss_end__ = . ; } + .reloc BLOCK(__section_alignment__) : - { + { *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); } + .stab BLOCK(__section_alignment__) (NOLOAD) : { - [ .stab ] + *(.stab) } .stabstr BLOCK(__section_alignment__) (NOLOAD) : { - [ .stabstr ] + *(.stabstr) } - INIT BLOCK(__section_alignment__) : + + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section. Unlike other targets that fake this by putting the + section VMA at 0, the PE format will not allow it. */ + /* DWARF 1.1 and DWARF 2. */ + .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : { - __init_start__ = . ; - *(INIT) - __init_end__ = . ; + *(.debug_aranges) + } + .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubnames) + } + .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubtypes) + } + /* DWARF 2. */ + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_info .gnu.linkonce.wi.*) + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_abbrev) + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_line) + } + .debug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_frame*) + } + .debug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_str) + } + .debug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_loc) + } + .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macinfo) + } + /* SGI/MIPS DWARF 2 extensions. */ + .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_weaknames) + } + .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_funcnames) + } + .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_typenames) + } + .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_varnames) + } + .debug_macro BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macro) + } + /* DWARF 3. */ + .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_ranges) + } + /* DWARF 4. */ + .debug_types BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_types .gnu.linkonce.wt.*) } } -

12 years, 8 months

[sginsberg] 55834: [CMAKE] - Specify C4700 (uninitialized variable usage) to cause an error on compile as this is very likely to result in broken code. [NTDLL] - Disable ASSERT in LdrpSearchPath th...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Feb 23 13:06:11 2012 New Revision: 55834 URL: http://svn.reactos.org/svn/reactos?rev=55834&view=rev Log: [CMAKE] - Specify C4700 (uninitialized variable usage) to cause an error on compile as this is very likely to result in broken code. [NTDLL] - Disable ASSERT in LdrpSearchPath that could be reading an uninitialized variable. The routine is not fully implemented so this should likely be re-enabled once it is. [BROWSEUI] - Add missing call to BuildRebarBandInfo, or we would end up with an unitialized variable sent to SendMessage. [PCIX] - Fix broken ASSERT - Fix usage of wrong (and uninitialized) variable in the Unicode case for PciGetDescriptionMessage. [DDK] - Prepend "_" to local variable of NdisChainBufferAtBack. Fixes code in ndisuio that called this using the same name as the macro's variable (which resulted in NdisChainBufferAtBack assigning the variable to itself). [WIN32K] - Fix WinPosShowIconTitle that checked if a variable was NULL before assigning it to anything. Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/browseui/bandsite.cpp trunk/reactos/drivers/bus/pcix/pci/id.c trunk/reactos/include/ddk/ndis.h trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55834… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -20,6 +20,9 @@ add_definitions(/Dinline=__inline /D__STDC__=1) add_compile_flags("/X /GR- /GS- /Zl /W3") + +# C4700 is almost always likely to result in broken code, so mark it as an error +add_compile_flags("/we4700") # Debugging if(${CMAKE_BUILD_TYPE} MATCHES Debug) 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] Thu Feb 23 13:06:11 2012 @@ -1860,7 +1860,9 @@ /* Sanity check */ TestName.Length = (USHORT)ALIGN_DOWN((BufEnd - Buffer), WCHAR); +#if 0 ASSERT(TestName.Length < TestName.MaximumLength); +#endif /* Check if the file exists */ #if 0 Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -409,6 +409,7 @@ WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); /* Remove the band from the ReBar control */ + BuildRebarBandInfo(NewBand, &rbi); uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); if (uBand != (UINT)-1) { Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -51,7 +51,7 @@ /* Validate valid message length, ending with a newline character */ ASSERT(TextLength > 1); - ASSERT(Description[TextLength / sizeof(WCHAR) == L'\n']); + ASSERT(Description[TextLength / sizeof(WCHAR)] == L'\n'); /* Allocate the buffer to hold the message string */ Buffer = ExAllocatePoolWithTag(PagedPool, TextLength, 'BicP'); @@ -61,8 +61,8 @@ RtlCopyMemory(Buffer, Entry->Text, TextLength - 1); Buffer[TextLength / sizeof(WCHAR)] = UNICODE_NULL; - /* Return the length to the caller */ - if (Length) *Length = UnicodeString.Length; + /* Return the length to the caller, minus the terminating NULL */ + if (Length) *Length = TextLength - 1; } else { Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=558… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -3101,19 +3101,19 @@ #define NdisChainBufferAtBack(Packet, \ Buffer) \ { \ - PNDIS_BUFFER NdisBuffer = (Buffer); \ + PNDIS_BUFFER _NdisBuffer = (Buffer); \ \ - while (NdisBuffer->Next != NULL) \ - NdisBuffer = NdisBuffer->Next; \ + while (_NdisBuffer->Next != NULL) \ + _NdisBuffer = _NdisBuffer->Next; \ \ - NdisBuffer->Next = NULL; \ + _NdisBuffer->Next = NULL; \ \ if ((Packet)->Private.Head != NULL) \ (Packet)->Private.Tail->Next = (Buffer); \ else \ (Packet)->Private.Head = (Buffer); \ \ - (Packet)->Private.Tail = NdisBuffer; \ + (Packet)->Private.Tail = _NdisBuffer; \ (Packet)->Private.ValidCounts = FALSE; \ } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -134,7 +134,7 @@ { HICON hIcon; if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return FALSE; - if (!hIcon) hIcon = pWnd->pcls->hIconSm; + hIcon = pWnd->pcls->hIconSm; if (!hIcon) hIcon = pWnd->pcls->hIcon; if (!hIcon) return FALSE;

12 years, 8 months

[akhaldi] 55833: [NEWCC] A reintegration checkpoint for the NewCC branch, brought to you by Team NewCC. Differences with current ReactOS trunk: * A new memory area type, MEMORY_AREA_CACHE, is added...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 23 12:03:06 2012 New Revision: 55833 URL: http://svn.reactos.org/svn/reactos?rev=55833&view=rev Log: [NEWCC] A reintegration checkpoint for the NewCC branch, brought to you by Team NewCC. Differences with current ReactOS trunk: * A new memory area type, MEMORY_AREA_CACHE, is added, which represents a mapped region of a file. In NEWCC mode, user sections are MEMORY_AREA_CACHE type as well, and obey new semantics. In non-NEWCC mode, they aren't used. * A way of claiming a page entry for a specific thread's work is added. Placing the special SWAPENTRY value MM_WAIT_ENTRY in a page table, or in a section page table should indicate that memory management code is intended to wait for another thread to make some status change before checking the state of the page entry again. In code that uses this convention, a return value of STATUS_SUCCESS + 1 is used to indicate that the caller should use the MiWaitForPageEvent macro to wait until somebody has change the state of a wait entry before checking again. This is a lighter weight mechanism than PAGEOPs. * A way of asking the caller to perform some blocking operation without locks held is provided. This replaces some spaghettified code in which locks are repeatedly taken and broken by code that performs various blocking operations. Using this mechanism, it is possible to do a small amount of non-blocking work, fill in a request, then return STATUS_MORE_PROCESSING_REQUIRED to request that locks be dropped and the blocking operation be carried out. A MM_REQUIRED_RESOURCES structure is provided to consumers of this contract to use to accumulate state across many blocking operations. Several functions wrapping blocking operations are provided in ntoskrnl/cache/reqtools.c. * Image section pages are no longer direct mapped. This is done to simplify consolidation of ownership of pages under the data section system. At a later time, it may be possible to make data pages directly available to image sections for the same file. This is likely the only direct performance impact this code makes on non-NEWCC mode. RMAPs: * A new type of RMAP entry is introduced, distinguished by RMAP_IS_SEGMENT(Address) of the rmap entry. This kind of entry contains a pointer to a section page table node in the Process pointer, which in turn links back to the MM_SECTION_SEGMENT it belongs to. Therefore, a page belonging only to a segment (that is, a segment page that isn't mapped) can exist and be evicted using the normal page eviction mechanism in balance.c. Each of the rmap function has been modified to deal with segment rmaps. * The low 8 bits of the Address field in a segment rmap denote the entry number in the generic table node pointed to by Process that points to the page the rmap belongs to. By combining them, you can determine the file offset the page belongs to. * In NEWCC mode, MmSharePageEntry/UnsharePageEntry are not used, and instead the page reference count is used to keep track of the number of mappings of a page, allowing the last reference expiring to allow the page to be recycled without much intervention. These are still used in non-NEWCC mode. One change has been made, the count fields have been narrowed by 1 bit to make room for a dirty bit in SSE entries, needed when a page is present but unmapped. Section page tables: * The section page tables are now implemented using RtlGenericTables. This enables a fairly compact representation of section page tables without having the existence of a section object imply 4k of fake PDEs. In addition, each node in the generic table has a wide file offset that is a multiple of 256 pages, or 1 megabyte total. Besides needing wide file offsets, the only other visible change caused by the switch to generic tables for section page tables is the need to lock the section segment before interacting with the section page table. Eviction: * Page eviction in cache sections is accomplished by MmpPageOutPhysicalAddress. In the case of a shared page, it tries to remove all mappings of the indicated page. If this process fails at any point, the page will simply be drawn back into the target address spaces. After succeeding at this, if TRUE has been accumulated into the page's dirty bit in the section page table, it is written back, and then permanently removed. NewCC mode: * NEWCC mode is introduced, which rewrites the file cache to a set of cache stripes actively mapped, along with unmapped section data. * NewCC is more authentic in its interpretation of the external interface to the windows cache than the current cache manager, implementing each of the cache manager functions according to the documented interface with no preconceived ideas about how anything should be implemented internally. Cache stripes are implemented on top of section objects, using the same memory manager paths, and therefore economizing code and complexity. This replaces a rather complicated system in which pages can be owned by the cache manager and the memory manager simultaneously and they must cooperate in a fairly sophisticated way to manage them. Since they're quite interdependent in the current code, modifying either is very difficult. In NEWCC, they have a clear division of labor and thus can be worked on independently. * Several third party filesystems that use the kernel Cc interface work properly using NEWCC, including matt wu's ext3 driver. * In contrast with code that tries to make CcInitializeCacheMap and CcUninitializeCacheMap into a pair that supports reference counting, NEWCC lazily initializes the shared and private cache maps as needed and uses the presence of a PrivateCacheMap on at least one file pointing to the SharedCacheMap as an indication that the FILE_OBJECT reference in the SharedCacheMap should still be held. When the last PrivateCacheMap is discarded, that's the appropriate time to tear down caching for a specific file, as the SharedCacheMap data is allowed to be saved and reused. We honor this by making the SharedCacheMap into a depot for keeping track of the PrivateCacheMap objects associated with views of a file. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/copysup.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/lazyrite.c trunk/reactos/ntoskrnl/cache/logsup.c trunk/reactos/ntoskrnl/cache/mdlsup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/reqtools.c trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/po/poshtdwn.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… Modified: trunk/reactos/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r… Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… Modified: trunk/reactos/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/lazyrite.c?… Modified: trunk/reactos/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/logsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/mdlsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=55833… Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=558… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev…

12 years, 8 months

[cgutman] 55832: [USBUHCI] - Delay for the correct amount of time when performing a global reset and a port reset - Loosen the loop timings a bit to allow for more time for real hardware to complet...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Feb 23 05:27:24 2012 New Revision: 55832 URL: http://svn.reactos.org/svn/reactos?rev=55832&view=rev Log: [USBUHCI] - Delay for the correct amount of time when performing a global reset and a port reset - Loosen the loop timings a bit to allow for more time for real hardware to complete start/stop/reset - Clear only the change bits that were set and handle both bits in the either case - Perform a synchronous callback when the reset completes Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 05:27:24 2012 @@ -499,7 +499,7 @@ // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_RS); - for(Index = 0; Index < 10; Index++) + for(Index = 0; Index < 100; Index++) { // // wait a bit @@ -576,6 +576,8 @@ VOID CUSBHardwareDevice::GlobalReset() { + LARGE_INTEGER Timeout; + // // back up start of modify register // @@ -586,10 +588,25 @@ // perform global reset // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_GRESET); - KeStallExecutionProcessor(20); - - // - // clear global reset bit + + // + // delay is 10 ms + // + Timeout.QuadPart = 10; + DPRINT1("Waiting %d milliseconds for global reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // + // clear command register // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_GRESET); KeStallExecutionProcessor(10); @@ -880,7 +897,7 @@ // // wait a bit // - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); // // get status @@ -893,7 +910,7 @@ // return STATUS_SUCCESS; } - }while(Count++ < 5); + }while(Count++ < 100); DPRINT1("[USBUHCI] Failed to reset controller Status %x\n", Status); return STATUS_UNSUCCESSFUL; @@ -906,6 +923,7 @@ ULONG Port; USHORT Status; ULONG Index; + LARGE_INTEGER Timeout; DPRINT1("[UHCI] ResetPort Id %lu\n", PortIndex); @@ -937,32 +955,43 @@ WriteRegister16(Port, Status | UHCI_PORTSC_RESET); // + // delay is 20 ms for port reset + // + Timeout.QuadPart = 20; + DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // + // re-read status + // + Status = ReadRegister16(Port); + + // + // remove unwanted bits + // + Status &= UHCI_PORTSC_DATAMASK; + + // + // clear reset port + // + WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); + + + // // now wait a bit // - KeStallExecutionProcessor(250); - - // - // re-read status - // - Status = ReadRegister16(Port); - - // - // remove unwanted bits - // - Status &= UHCI_PORTSC_DATAMASK; - - // - // clear reset port - // - WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); - - - // - // now wait a bit - // KeStallExecutionProcessor(10); - for (Index = 0; Index < 10; Index++) + for (Index = 0; Index < 100; Index++) { // read port status Status = ReadRegister16(Port); @@ -994,8 +1023,7 @@ { // port enabled changed or connection status were set. // acknowledge either / both and wait again. - Status &= UHCI_PORTSC_DATAMASK; - WriteRegister16(Port, Status | UHCI_PORTSC_STATCHA | UHCI_PORTSC_ENABCHA); + WriteRegister16(Port, Status); continue; } @@ -1009,6 +1037,16 @@ m_PortResetChange |= (1 << PortIndex); DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + // + // is there a callback + // + if (m_SCECallBack) + { + // + // issue callback + // + m_SCECallBack(m_SCEContext); + } return STATUS_SUCCESS; } @@ -1114,7 +1152,7 @@ // read current status // PortRegister = UHCI_PORTSC1 + PortId * 2; - PortStatus = ReadRegister16(PortRegister) & UHCI_PORTSC_DATAMASK; + PortStatus = ReadRegister16(PortRegister); DPRINT("[UHCI] PortStatus %x\n", PortStatus); if (Feature == C_PORT_RESET) @@ -1124,19 +1162,12 @@ // m_PortResetChange &= ~(1 << PortId); } - else if (Feature == C_PORT_CONNECTION) - { - // - // clear connection status - // - WriteRegister16(PortRegister, PortStatus | UHCI_PORTSC_STATCHA); - } - else if (Feature == C_PORT_ENABLE) - { - // - // enable port - // - WriteRegister16(PortRegister, PortStatus | UHCI_PORTSC_ENABCHA); + else if (Feature == C_PORT_CONNECTION || Feature == C_PORT_ENABLE) + { + // + // clear port status changes + // + WriteRegister16(PortRegister, PortStatus); } return STATUS_SUCCESS;

12 years, 8 months

[janderwald] 55831: [USBUHCI] - Remove left-over assert - Remove dead code - Enable port after reset

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 23 05:07:07 2012 New Revision: 55831 URL: http://svn.reactos.org/svn/reactos?rev=55831&view=rev Log: [USBUHCI] - Remove left-over assert - Remove dead code - Enable port after reset Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 05:07:07 2012 @@ -647,7 +647,6 @@ Value = 0; BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, 0x60, sizeof(UCHAR)); DPRINT1("[USBUHCI] SBRN %x\n", Value); - ASSERT(FALSE); // // perform global reset @@ -925,15 +924,6 @@ // Status = ReadRegister16(Port); - // - // Before port reset, disable the port - // - WriteRegister16(Port, ReadRegister16(Port) & ~UHCI_PORTSC_ENABLED); - while(ReadRegister16(Port) & UHCI_PORTSC_ENABLED) - { - DPRINT1("Port %x Status %x\n", PortIndex, ReadRegister16(Port)); - KeStallExecutionProcessor(5); - } // @@ -949,7 +939,7 @@ // // now wait a bit // - KeStallExecutionProcessor(50); + KeStallExecutionProcessor(250); // // re-read status @@ -966,10 +956,6 @@ // WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); - // - // set enabled bit - // - WriteRegister16(Port, ReadRegister16(Port) | UHCI_PORTSC_ENABLED); // // now wait a bit @@ -978,20 +964,14 @@ for (Index = 0; Index < 10; Index++) { - // // read port status - // Status = ReadRegister16(Port); - // // remove unwanted bits - // Status &= UHCI_PORTSC_DATAMASK; - // // enable port - // - WriteRegister16(Port, Status); + WriteRegister16(Port, Status | UHCI_PORTSC_ENABLED); // // wait a bit @@ -1029,16 +1009,6 @@ m_PortResetChange |= (1 << PortIndex); DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); -#if 0 - if (Status & UHCI_PORTSC_CURSTAT) - { - // - // queue work item - // - DPRINT1("Queueing work item\n"); - ExQueueWorkItem(&m_StatusChangeWorkItem, DelayedWorkQueue); - } -#endif return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Thu Feb 23 05:07:07 2012 @@ -845,7 +845,30 @@ // // FIXME FIXME FIXME FIXME FIXME // - MaxPacketSize = 1280; + if (GetDeviceSpeed() == UsbLowSpeed) + { + // + // low speed use max 8 bytes + // + MaxPacketSize = 8; + } + else + { + if (m_EndpointDescriptor) + { + // + // use endpoint size + // + MaxPacketSize = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; + } + else + { + // + // use max 64 bytes + // + MaxPacketSize = 64; + } + } do {

12 years, 8 months

[janderwald] 55830: [USBUHCI] - Fix initialization bugs in real hardware

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 23 03:22:57 2012 New Revision: 55830 URL: http://svn.reactos.org/svn/reactos?rev=55830&view=rev Log: [USBUHCI] - Fix initialization bugs in real hardware Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 03:22:57 2012 @@ -585,15 +585,13 @@ // // perform global reset // - WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), UHCI_USBCMD_GRESET); - - KeStallExecutionProcessor(100); - - // - // clear command register - // - WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), 0); - + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_GRESET); + KeStallExecutionProcessor(20); + + // + // clear global reset bit + // + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_GRESET); KeStallExecutionProcessor(10); @@ -638,11 +636,18 @@ // // reclaim ownership from BIOS // - Value = PCI_LEGSUP_USBPIRQDEN | PCI_LEGSUP_CLEAR_SMI; + Value = 0; + BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); + DPRINT1("[USBUHCI] LEGSUP %x\n", Value); + + Value = PCI_LEGSUP_USBPIRQDEN; BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); DPRINT1("[USBUHCI] Acquired ownership\n"); - + Value = 0; + BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, 0x60, sizeof(UCHAR)); + DPRINT1("[USBUHCI] SBRN %x\n", Value); + ASSERT(FALSE); // // perform global reset @@ -714,6 +719,7 @@ // m_QueueHead[Index]->PhysicalAddress = Address.LowPart; m_QueueHead[Index]->ElementPhysical = QH_TERMINATE; + m_QueueHead[Index]->LinkPhysical = QH_TERMINATE; if (Index > 0) { @@ -852,6 +858,19 @@ ULONG Count = 0; USHORT Status; + // clear run bit + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_RS); + + // wait for the controller to stop + while((ReadRegister16(UHCI_USBSTS) & UHCI_USBSTS_HCHALT) == 0) + { + DPRINT1("[UHCI] Waiting for the controller to halt\n"); + KeStallExecutionProcessor(10); + } + + // clear configure bit + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_CF); + // // reset controller //

12 years, 8 months

[janderwald] 55829: [HIDCLASS] [USBUHCI] - Silence traces

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 23 01:51:55 2012 New Revision: 55829 URL: http://svn.reactos.org/svn/reactos?rev=55829&view=rev Log: [HIDCLASS] [USBUHCI] - Silence traces Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Thu Feb 23 01:51:55 2012 @@ -496,7 +496,7 @@ IoCompleteRequest(IrpContext->OriginalIrp, IO_NO_INCREMENT); - DPRINT1("StopInProgress %x IsEmpty %x\n", IrpContext->FileOp->StopInProgress, IsEmpty); + DPRINT("StopInProgress %x IsEmpty %x\n", IrpContext->FileOp->StopInProgress, IsEmpty); if (IrpContext->FileOp->StopInProgress && IsEmpty) { // Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Thu Feb 23 01:51:55 2012 @@ -350,7 +350,7 @@ // // descriptor is still active // - DPRINT1("Descriptor %p is active Status %x BufferSize %lu\n", Descriptor, Descriptor->Status, Descriptor->BufferSize); + DPRINT("Descriptor %p is active Status %x BufferSize %lu\n", Descriptor, Descriptor->Status, Descriptor->BufferSize); return FALSE; }

12 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012