Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 51036: 0.3.13, here we go (again)
by cfinck＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: cfinck Date: Sun Mar 13 14:04:23 2011 New Revision: 51036 URL: http://svn.reactos.org/svn/reactos?rev=51036&view=rev Log: 0.3.13, here we go (again) Added: branches/ros-branch-0_3_13/ - copied from r51035, trunk/

1 0

[cfinck] 51035: Remove the old 0.3.13 branch for rebranching
by cfinck＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: cfinck Date: Sun Mar 13 14:01:58 2011 New Revision: 51035 URL: http://svn.reactos.org/svn/reactos?rev=51035&view=rev Log: Remove the old 0.3.13 branch for rebranching Removed: branches/ros-branch-0_3_13/

1 0

[cfinck] 51034: [RAPPS] Rafal Harabien (rafalh1992@o2.pl) - Fix links and descriptions in the Rapps database, also update some application versions I took the last patch in the bug report and appli...
by cfinck＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: cfinck Date: Sun Mar 13 12:49:37 2011 New Revision: 51034 URL: http://svn.reactos.org/svn/reactos?rev=51034&view=rev Log: [RAPPS] Rafal Harabien (rafalh1992(a)o2.pl) - Fix links and descriptions in the Rapps database, also update some application versions I took the last patch in the bug report and applied the changes to remood.txt manually (due to mixed encoding within the same file). See issue #5999 for more details. Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Sun Mar 13 12:49:37 2011 @@ -8,29 +8,40 @@ Size = 5.8M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/en-US/Firefox%20S… CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. -Size = 5.5M URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/w… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setu… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. +URLSite = http://www.mozilla-europe.org/de/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/de/Firefox%20Setu… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. +URLSite = http://www.mozilla-europe.org/es/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20S… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. +URLSite = http://www.mozilla-europe.org/no/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20S… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. +URLSite = http://www.mozilla-europe.org/pl/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setu… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². +URLSite = http://www.mozilla-europe.org/ru/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setu… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². +URLSite = http://www.mozilla-europe.org/uk/ +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/uk/Firefox%20Setu… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Sun Mar 13 12:49:37 2011 @@ -8,47 +8,47 @@ Size = 7.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/en-US/Fir… CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. Size = 7.0M URLSite = http://www.mozilla-europe.org/cs/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/cs/Firefo… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 7.0M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/de/Firefo… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 7.0M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/es-ES/Fir… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 7.0M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/nb-NO/Fir… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 7.8M +Size = 7.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/pl/Firefo… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 7.4M +Size = 7.8M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/ru/Firefo… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 7.3M +Size = 7.4M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.19-real-re… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/uk/Firefo… 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] Sun Mar 13 12:49:37 2011 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.13 +Version = 3.6.15 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 8.1M +Size = 8.2M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/e… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/en-US/Firefox%20Set… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/d… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/de/Firefox%20Setup%… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/e… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/es-ES/Firefox%20Set… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/n… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Set… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 8.8M +Size = 8.9M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/p… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 8.4M +Size = 8.5M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/r… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 8.4M +Size = 8.5M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.13/win32/u… +URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%… 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] Sun Mar 13 12:49:37 2011 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.3.0 +Version = 3.3.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 215.0MB +Size = 213.4MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.3.0/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.3.1/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] Sun Mar 13 12:49:37 2011 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.9.16 +Version = 0.9.17 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.0MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.16-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.9.17-unicode.exe CDPath = none [Section.0407] 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] Sun Mar 13 12:49:37 2011 @@ -5,10 +5,10 @@ Version = 7.17 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). -Size = 2.0M +Size = 1.9M Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/mirc717.exe +URLDownload = http://download.mirc.com/mirc719.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Sun Mar 13 12:49:37 2011 @@ -1,10 +1,10 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = ReMooD Version = 0.8a Licence = GPL -Description = ReMooD is a source port of Doom Legacy. It aims to provide the classic Legacy Experience with new features and more stability. This supports Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x and higher; and Linux (x86 and x86_64). +Description = ReMooD is a source port of Doom Legacy. It aims to provide the classic Legacy Experience with new features and more stability. Size = 1.2M Category = 4 URLSite = http://remood.sourceforge.net/ @@ -12,10 +12,10 @@ CDPath = none [Section.0407] -Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. Unterstützt werden Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x und höher; und Linux (x86 und x86_64). +Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr StabilitÃ¤t zu bieten. [Section.0415] -Description = ¯ród³owy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami, i lepsz¹ stabilnoci¹. Obs³uguje Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x i wy¿sze; i Linux (x86 i x86_64). +Description = Å¹rÃ³dÅowy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami i lepszÄ stabilnoÅciÄ. [Section.0422] -Description = ReMooD Ñ ÐÐ¾ÑÑÐ¾Ð¼ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ² Doom Legacy. ÐÐ¾Ð³Ð¾ Ð¼ÐµÑÐ¾Ñ Ñ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÑÐ° ÑÑÐ°Ð±ÑÐ»ÑÐ½ÑÑÑÑ Ð´Ð¾ Ð´Ð¾ÑÐ²ÑÐ´Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¾Ð³Ð¾ Legacy. ÐÑÐ½ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Windows 98/98SE/ME/NT/2000/XP/2003/ Vista/2008/7/XP 64-bit/2003 64-bit/Vista 64-bit/2008 64-bit/7 64-bit; ReactOS 0.3.x ÑÐ° Ð½Ð¾Ð²ÑÑÑ; Ð° ÑÐ°ÐºÐ¾Ð¶ Linux (x86 ÑÐ° x86_64). +Description = ReMooD Ñ ÐÐ¾ÑÑÐ¾Ð¼ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ² Doom Legacy. ÐÐ¾Ð³Ð¾ Ð¼ÐµÑÐ¾Ñ Ñ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÑÐ° ÑÑÐ°Ð±ÑÐ»ÑÐ½ÑÑÑÑ Ð´Ð¾ Ð´Ð¾ÑÐ²ÑÐ´Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¾Ð³Ð¾ Legacy. 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] Sun Mar 13 12:49:37 2011 @@ -2,31 +2,31 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.0.11 +Version = 2.0.12 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 = 10.1MB +Size = 10.2MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… +URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/en-US/SeaMonkey%2… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… +Size = 10.1MB +URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/de/SeaMonkey%20Se… [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 = 10.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… +Size = 10.1MB +URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/es-ES/SeaMonkey%2… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 10.8MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… +Size = 11.0MB +URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/pl/SeaMonkey%20Se… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 10.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.11/win32… +Size = 10.5MB +URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/ru/SeaMonkey%20Se… 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] Sun Mar 13 12:49:37 2011 @@ -2,41 +2,41 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.7 +Version = 3.1.9 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.0M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/en-US/Thunderbir… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.8M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/de/Thunderbird%2… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.8M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/es-ES/Thunderbir… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.7M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/pl/Thunderbird%2… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.2M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/ru/Thunderbird%2… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.2M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.7/win3… +URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/uk/Thunderbird%2… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Sun Mar 13 12:49:37 2011 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 2.2 +Version = 2.2.1 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 385K +Size = 390K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/2.2/utorrent.exe +URLDownload = http://download.utorrent.com/2.2.1/utorrent.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Sun Mar 13 12:49:37 2011 @@ -18,7 +18,7 @@ Description = Tablero de ajedrez para Windows/ReactOS que puede ser utilizado como interfaz para GNU Chess, Crafty, y otros motores de ajedrez, para servidores de ajedrez en internet, y para partidas por correo electrÃ³nico. [Section.0415] -Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych(w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych. +Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych (w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych. [Section.0422] Description = ÐÑÐ°ÑÑÑÐ½Ð° ÑÐ°ÑÐ¼Ð°ÑÐ½Ð° Ð´Ð¾ÑÐºÐ° Ð´Ð»Ñ Windows/ReactOS, ÑÐ¾ Ð¼Ð¾Ð¶Ðµ ÑÐ»ÑÐ³ÑÐ²Ð°ÑÐ¸ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¼ ÑÐ½ÑÐµÑÑÐµÐ¹ÑÐ¾Ð¼ Ð´Ð»Ñ GNU Chess, Crafty, ÑÐ° ÑÐ½ÑÐ¸Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¸Ñ Ð´Ð²Ð¸Ð³ÑÐ½ÑÐ², Ð´Ð»Ñ ÑÐµÑÐ²ÐµÑÑÐ² ÑÐ½ÑÐµÑÐ½ÐµÑ-ÑÐ°ÑÐ¼Ð°Ñ ÑÐ° Ð´Ð»Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¾Ñ Ð¿ÐµÑÐµÐ¿Ð¸ÑÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¼ÐµÐ¹Ð».

1 0

[cfinck] 51033: [RAPPS] Fix a bug while testing Rapps under Windows. If you had an application with no registered DisplayName installed, Rapps used to consider every application with no RegName in ...
by cfinck＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: cfinck Date: Sun Mar 13 12:44:58 2011 New Revision: 51033 URL: http://svn.reactos.org/svn/reactos?rev=51033&view=rev Log: [RAPPS] Fix a bug while testing Rapps under Windows. If you had an application with no registered DisplayName installed, Rapps used to consider every application with no RegName in its database (= currently all Rapps applications) installed. Therefore the list of available applications has always been empty. Now an application is always added to the ListView if no RegName is set for it. Modified: trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sun Mar 13 12:44:58 2011 @@ -144,8 +144,11 @@ PAPPLICATION_INFO ItemInfo; INT Index; - if (!IsInstalledApplication(Info.szRegName, FALSE) && - !IsInstalledApplication(Info.szRegName, TRUE)) + /* Only add a ListView entry if... + - no RegName was supplied (so we cannot determine whether the application is installed or not) or + - a RegName was supplied and the application is not installed + */ + if (!*Info.szRegName || (!IsInstalledApplication(Info.szRegName, FALSE) && !IsInstalledApplication(Info.szRegName, TRUE))) { ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(APPLICATION_INFO)); if (!ItemInfo) return FALSE;

1 0

[pschweitzer] 51032: [RAPPS] Fix french translation file encoding
by pschweitzer＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: pschweitzer Date: Sun Mar 13 12:10:41 2011 New Revision: 51032 URL: http://svn.reactos.org/svn/reactos?rev=51032&view=rev Log: [RAPPS] Fix french translation file encoding Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Sun Mar 13 12:10:41 2011 @@ -11,17 +11,17 @@ POPUP "&Programmes" BEGIN MENUITEM "&Installer", ID_INSTALL - MENUITEM "&DÃ©sinstaller",ID_UNINSTALL + MENUITEM "&Désinstaller",ID_UNINSTALL MENUITEM "&Modifier", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&Supprimer du registre", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&RafraÃ®chir", ID_REFRESH + MENUITEM "&Rafraîchir", ID_REFRESH END POPUP "Aide" BEGIN MENUITEM "Aide", ID_HELP, GRAYED - MENUITEM "Ã propos", ID_ABOUT + MENUITEM "À propos", ID_ABOUT END END @@ -39,12 +39,12 @@ POPUP "popup" BEGIN MENUITEM "&Installer", ID_INSTALL - MENUITEM "&DÃ©sinstaller", ID_UNINSTALL + MENUITEM "&Désinstaller", ID_UNINSTALL MENUITEM "&Modifier", ID_MODIFY MENUITEM SEPARATOR MENUITEM "&Supprimer du registre", ID_REGREMOVE MENUITEM SEPARATOR - MENUITEM "&RafraÃ®chir", ID_REFRESH + MENUITEM "&Rafraîchir", ID_REFRESH END END @@ -53,18 +53,18 @@ CAPTION "Configuration" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "GÃ©nÃ©ral", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Enregistrer la position de la fenÃªtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Mettre Ã jour la liste des programmes accessibles au dÃ©marage", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + GROUPBOX "Général", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Enregistrer la position de la fenêtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Mettre à jour la liste des programmes accessibles au démarage", IDC_UPDATE_AVLIST, 15, 29, 219, 12 AUTOCHECKBOX "&Journal de l'installation de la suppression des programmes", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "TÃ©lÃ©chargement", -1, 4, 65, 240, 51 - LTEXT "Fichier des tÃ©lÃ©chargements :", -1, 16, 75, 100, 9 + GROUPBOX "Téléchargement", -1, 4, 65, 240, 51 + LTEXT "Fichier des téléchargements :", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&SÃ©lectionner", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Supprimer l'installateur du programme aprÃ¨s l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "&Sélectionner", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "&Supprimer l'installateur du programme après l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14 PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14 END @@ -76,8 +76,8 @@ BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Installer Ã partir d'un disque (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&TÃ©lÃ©charger et installer", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "&Installer à partir d'un disque (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Télécharger et installer", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP PUSHBUTTON "Accepter", IDOK, 86, 78, 60, 14 PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 @@ -85,7 +85,7 @@ IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "TÃ©lÃ©charger..." +CAPTION "Télécharger..." FONT 8, "MS Shell Dlg" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 @@ -95,7 +95,7 @@ IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME -CAPTION "Ã propos" +CAPTION "À propos" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 @@ -106,10 +106,10 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TOOLTIP_INSTALL "Installer" - IDS_TOOLTIP_UNINSTALL "DÃ©sinstaller" + IDS_TOOLTIP_UNINSTALL "Désinstaller" IDS_TOOLTIP_MODIFY "Modifier" IDS_TOOLTIP_SETTINGS "Configuration" - IDS_TOOLTIP_REFRESH "RafraÃ®chir" + IDS_TOOLTIP_REFRESH "Rafraîchir" IDS_TOOLTIP_EXIT "Sortir" END @@ -126,18 +126,18 @@ IDS_INFO_DESCRIPTION "\nDescription : " IDS_INFO_PUBLISHER "\nAuteur : " IDS_INFO_HELPLINK "\nLien d'aide : " - IDS_INFO_HELPPHONE "\nTÃ©lÃ©phone d'aide : " + IDS_INFO_HELPPHONE "\nTéléphone d'aide : " IDS_INFO_README "\nLisez-moi : " - IDS_INFO_REGOWNER "\nUtilisateur enregistrÃ© : " + IDS_INFO_REGOWNER "\nUtilisateur enregistré : " IDS_INFO_PRODUCTID "\nID du produit : " IDS_INFO_CONTACT "\nContact : " - IDS_INFO_UPDATEINFO "\nInformation de mise Ã jour : " - IDS_INFO_INFOABOUT "\nInformation Ã propos : " + IDS_INFO_UPDATEINFO "\nInformation de mise à jour : " + IDS_INFO_INFOABOUT "\nInformation à propos : " IDS_INFO_COMMENTS "\nCommentaires : " IDS_INFO_INSTLOCATION "\Emplacement de l'installation : " IDS_INFO_INSTALLSRC "\nSource de l'installation : " - IDS_INFO_UNINSTALLSTR "\nCommande de dÃ©sinstallation : " - IDS_INFO_MODIFYPATH "\nModifier le chemin d'accÃ¨s : " + IDS_INFO_UNINSTALLSTR "\nCommande de désinstallation : " + IDS_INFO_MODIFYPATH "\nModifier le chemin d'accès : " IDS_INFO_INSTALLDATE "\nDate d'installation : " END @@ -153,20 +153,20 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAT_AUDIO "Audio" - IDS_CAT_DEVEL "DÃ©veloppement" + IDS_CAT_DEVEL "Développement" IDS_CAT_DRIVERS "Pilotes" - IDS_CAT_EDU "Ãducation" - IDS_CAT_ENGINEER "IngÃ©nierie" + IDS_CAT_EDU "Éducation" + IDS_CAT_ENGINEER "Ingénierie" IDS_CAT_FINANCE "Finance" - IDS_CAT_GAMES "Jeux & dÃ©tente" + IDS_CAT_GAMES "Jeux & détente" IDS_CAT_GRAPHICS "Graphismes" - IDS_CAT_INTERNET "Internet & rÃ©saux" - IDS_CAT_LIBS "BibliothÃ¨ques" + IDS_CAT_INTERNET "Internet & résaux" + IDS_CAT_LIBS "Bibliothèques" IDS_CAT_OFFICE "Bureautique" IDS_CAT_OTHER "Autres" IDS_CAT_SCIENCE "Sciences" IDS_CAT_TOOLS "Outils" - IDS_CAT_VIDEO "VidÃ©o" + IDS_CAT_VIDEO "Vidéo" END STRINGTABLE DISCARDABLE @@ -174,20 +174,20 @@ IDS_APPTITLE "ReactOS Applications Manager" IDS_SEARCH_TEXT "Chercher..." IDS_INSTALL "Installer" - IDS_UNINSTALL "DÃ©sinstaller" + IDS_UNINSTALL "Désinstaller" IDS_MODIFY "Modifier" IDS_APPS_COUNT "Nombre d'applications : %d" - IDS_WELCOME_TITLE "Bienvenue Ã ReactOS Applications Manager!\n\n" - IDS_WELCOME_TEXT "Choisisez une catÃ©gorie Ã gauche, ensuite choisisez une application Ã installer ou dÃ©sinstaller.\nSite internet de ReactOS : " + IDS_WELCOME_TITLE "Bienvenue à ReactOS Applications Manager!\n\n" + IDS_WELCOME_TEXT "Choisisez une catégorie à gauche, ensuite choisisez une application à installer ou désinstaller.\nSite internet de ReactOS : " IDS_WELCOME_URL "http://www.reactos.org" - IDS_INSTALLED "InstallÃ©" + IDS_INSTALLED "Installé" IDS_AVAILABLEFORINST "Disponible pour installation" - IDS_UPDATES "Mises Ã jour" + IDS_UPDATES "Mises à jour" IDS_APPLICATIONS "Applications" - IDS_CHOOSE_FOLDER_TEXT "Choisisez un dossier dans lequel seront tÃ©lÃ©chargÃ©s les programmes :" - IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spÃ©cifiÃ© n'existe pas. Le crÃ©er ?" - IDS_USER_NOT_ADMIN "Vous devez Ãªtre un administrateur pour dÃ©marrer ""ReactOS Applications Manager""!" - IDS_APP_REG_REMOVE "Etes-vous sÃ»r de vouloir supprimer les donnÃ©es du programme installÃ© du registre ?" + IDS_CHOOSE_FOLDER_TEXT "Choisisez un dossier dans lequel seront téléchargés les programmes :" + IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spécifié n'existe pas. Le créer ?" + IDS_USER_NOT_ADMIN "Vous devez être un administrateur pour démarrer ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Etes-vous sûr de vouloir supprimer les données du programme installé du registre ?" IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Impossible de supprimer les donnÃ©es du programme du registre !" + IDS_UNABLE_TO_REMOVE "Impossible de supprimer les données du programme du registre !" END

1 0

[gadamopoulos] 51031: [win32] - Rafal Harabien: - Always call IntKeyboardInput and co_MsqPostKeyboardMessage while holding the user lock - Simplify cleaning up sent messages See issue #5580 for mor...
by gadamopoulos＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: gadamopoulos Date: Sun Mar 13 11:22:18 2011 New Revision: 51031 URL: http://svn.reactos.org/svn/reactos?rev=51031&view=rev Log: [win32] - Rafal Harabien: - Always call IntKeyboardInput and co_MsqPostKeyboardMessage while holding the user lock - Simplify cleaning up sent messages See issue #5580 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Sun Mar 13 11:22:18 2011 @@ -708,6 +708,7 @@ if (ModifierState == 0) { + UserEnterExclusive(); if (fsModifiers == MOD_WIN) IntKeyboardSendWinKeyMsg(); else if (fsModifiers == MOD_ALT) @@ -723,6 +724,7 @@ } co_IntKeyboardSendAltKeyMsg(); } + UserLeave(); continue; } @@ -730,6 +732,8 @@ } } } + + UserEnterExclusive(); for (;NumKeys;memcpy(&KeyInput, &NextKeyInput, sizeof(KeyInput)), NumKeys--) @@ -860,6 +864,8 @@ */ co_MsqPostKeyboardMessage(msg.message,msg.wParam,msg.lParam); } + + UserLeave(); } KeyboardEscape: @@ -1243,17 +1249,11 @@ LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; WORD flags, wVkStripped, wVkL, wVkR, wVk = ki->wVk, vk_hook = ki->wVk; - BOOLEAN Entered = FALSE; Msg.lParam = 0; - // Condition may arise when calling MsqPostMessage and waiting for an event. - if (!UserIsEntered()) - { - // Fixme: Not sure ATM if this thread is locked. - UserEnterExclusive(); - Entered = TRUE; - } + // Condition may arise when calling MsqPostMessage and waiting for an event. + ASSERT (UserIsEntered()); wVk = LOBYTE(wVk); Msg.wParam = wVk; @@ -1352,7 +1352,7 @@ { DPRINT1("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, vk_hook, Msg.lParam); - if (Entered) UserLeave(); + return FALSE; } @@ -1380,7 +1380,7 @@ if (FocusMessageQueue == NULL) { DPRINT("No focus message queue\n"); - if (Entered) UserLeave(); + return FALSE; } @@ -1400,8 +1400,6 @@ { DPRINT("Invalid focus window handle\n"); } - - if (Entered) UserLeave(); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Mar 13 11:22:18 2011 @@ -1447,7 +1447,7 @@ if(!(Message = ExAllocatePoolWithTag(NonPagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); - return STATUS_INSUFFICIENT_RESOURCES; + RETURN( FALSE); } Message->Msg.hwnd = hWnd; @@ -1459,19 +1459,21 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. + IntReferenceMessageQueue(Win32Thread->MessageQueue); Message->CallBackSenderQueue = Win32Thread->MessageQueue; - - IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; - Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; + Message->HookMessage = MSQ_NORMAL; // | MSQ_SENTNOWAIT Message->HasPackedLParam = (lParamBufferSize > 0); - + Message->DispatchingListEntry.Flink = NULL; Message->QS_Flags = QS_SENDMESSAGE; + + IntReferenceMessageQueue(Window->head.pti->MessageQueue); + MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); - IntDereferenceMessageQueue(Window->head.pti->MessageQueue); + //IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sun Mar 13 11:22:18 2011 @@ -279,18 +279,12 @@ MSG Msg; LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; - BOOLEAN Entered = FALSE; DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", uMsg, wParam, lParam); // Condition may arise when calling MsqPostMessage and waiting for an event. - if (!UserIsEntered()) - { - // Fixme: Not sure ATM if this thread is locked. - UserEnterExclusive(); - Entered = TRUE; - } + ASSERT(UserIsEntered()); FocusMessageQueue = IntGetFocusMessageQueue(); @@ -320,14 +314,12 @@ { DPRINT1("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", Msg.message, Msg.wParam, Msg.lParam); - if (Entered) UserLeave(); return; } if (FocusMessageQueue == NULL) { DPRINT("No focus message queue\n"); - if (Entered) UserLeave(); return; } @@ -346,7 +338,6 @@ DPRINT("Invalid focus window handle\n"); } - if (Entered) UserLeave(); return; } @@ -415,6 +406,42 @@ ExFreeToPagedLookasideList(&MessageLookasideList, Message); } +VOID FASTCALL +MsqDestroySentMessage(PUSER_MESSAGE_QUEUE MessageQueue, PUSER_SENT_MESSAGE SentMessage) +{ + /* remove the message from the dispatching list if needed */ + if (SentMessage->DispatchingListEntry.Flink != NULL) + { + RemoveEntryList(&SentMessage->DispatchingListEntry); + } + + /* wake the sender's thread */ + if (SentMessage->CompletionEvent != NULL) + { + KeSetEvent(SentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); + } + + /* dereference message queues */ + IntDereferenceMessageQueue(MessageQueue); + if (SentMessage->SenderQueue) + { + IntDereferenceMessageQueue(SentMessage->SenderQueue); + } + if (SentMessage->CallBackSenderQueue) + { + IntDereferenceMessageQueue(SentMessage->CallBackSenderQueue); + } + + /* free lParam if needed */ + if (SentMessage->HasPackedLParam == TRUE && SentMessage->Msg.lParam) + { + ExFreePool((PVOID)SentMessage->Msg.lParam); + } + + /* free the message */ + ExFreePoolWithTag(SentMessage, TAG_USRMSG); +} + BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue) { @@ -478,13 +505,10 @@ RemoveEntryList(&Message->ListEntry); /* remove the message from the dispatching list if needed, so lock the sender's message queue */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) - { - if (Message->DispatchingListEntry.Flink != NULL) - { - /* only remove it from the dispatching list if not already removed by a timeout */ - RemoveEntryList(&Message->DispatchingListEntry); - } + if (Message->DispatchingListEntry.Flink != NULL) + { + RemoveEntryList(&Message->DispatchingListEntry); + Message->DispatchingListEntry.Flink = NULL; } /* still keep the sender's message queue locked, so the sender can't exit the MsqSendMessage() function (if timed out) */ @@ -500,16 +524,11 @@ *Message->Result = Result; } - if (Message->HasPackedLParam == TRUE) - { - if (Message->Msg.lParam) - ExFreePool((PVOID)Message->Msg.lParam); - } - /* Notify the sender. */ if (Message->CompletionEvent != NULL) { KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); + Message->CompletionEvent = NULL; /* prevent MsqDestroySentMessage from setting this event again */ } /* Call the callback if the message was sent with SendMessageCallback */ @@ -522,15 +541,7 @@ Result); } - /* Only if it is not a no wait message */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) - { - IntDereferenceMessageQueue(Message->SenderQueue); - IntDereferenceMessageQueue(MessageQueue); - } - - /* free the message */ - ExFreePoolWithTag(Message, TAG_USRMSG); + MsqDestroySentMessage(MessageQueue, Message); /* do not hangup on the user if this is reentering */ if (!SaveMsg) pti->pcti->CTI_flags &= ~CTI_INSENDMESSAGE; @@ -560,16 +571,14 @@ { PostedMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); + /* set CurrentEntry to next before destroying message */ + CurrentEntry = CurrentEntry->Flink; + if (PostedMessage->Msg.hwnd == Window->head.h) { RemoveEntryList(&PostedMessage->ListEntry); ClearMsgBitsMask(MessageQueue, PostedMessage->QS_Flags); MsqDestroyMessage(PostedMessage); - CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; } } @@ -580,6 +589,9 @@ { SentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + /* set CurrentEntry to next before destroying message */ + CurrentEntry = CurrentEntry->Flink; + if(SentMessage->Msg.hwnd == Window->head.h) { DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); @@ -587,41 +599,7 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); - /* remove the message from the dispatching list if neede */ - if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) - && (SentMessage->DispatchingListEntry.Flink != NULL)) - { - RemoveEntryList(&SentMessage->DispatchingListEntry); - } - - /* wake the sender's thread */ - if (SentMessage->CompletionEvent != NULL) - { - KeSetEvent(SentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); - } - - if (SentMessage->HasPackedLParam == TRUE) - { - if (SentMessage->Msg.lParam) - ExFreePool((PVOID)SentMessage->Msg.lParam); - } - - /* Only if it is not a no wait message */ - if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) - { - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(SentMessage->SenderQueue); - } - - /* free the message */ - ExFreePoolWithTag(SentMessage, TAG_USRMSG); - - CurrentEntry = MessageQueue->SentMessagesListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; + MsqDestroySentMessage(MessageQueue, SentMessage); } } } @@ -655,7 +633,7 @@ Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; - /* FIXME - increase reference counter of sender's message queue here */ + /* FIXME - increase reference counter of sender's message queue here - isn't it done? */ Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; @@ -665,9 +643,9 @@ Message->Result = &Result; Message->lResult = 0; Message->QS_Flags = 0; + IntReferenceMessageQueue(ThreadQueue); Message->SenderQueue = ThreadQueue; Message->CallBackSenderQueue = NULL; - IntReferenceMessageQueue(ThreadQueue); Message->CompletionCallback = NULL; Message->CompletionCallbackContext = 0; Message->HookMessage = HookMessage; @@ -1436,35 +1414,7 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* remove the message from the dispatching list if needed */ - if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) - && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) - { - RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); - } - - /* wake the sender's thread */ - if (CurrentSentMessage->CompletionEvent != NULL) - { - KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); - } - - if (CurrentSentMessage->HasPackedLParam == TRUE) - { - if (CurrentSentMessage->Msg.lParam) - ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); - } - - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) - { - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); - } - - /* free the message */ - ExFreePool(CurrentSentMessage); + MsqDestroySentMessage(MessageQueue, CurrentSentMessage); } /* notify senders of dispatching messages. This needs to be cleaned up if e.g. @@ -1475,36 +1425,9 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); - /* remove the message from the dispatching list */ - if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) - { - RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); - } - DPRINT("Notify the sender, the thread has been terminated while dispatching a message!\n"); - /* wake the sender's thread */ - if (CurrentSentMessage->CompletionEvent != NULL) - { - KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); - } - - if (CurrentSentMessage->HasPackedLParam == TRUE) - { - if (CurrentSentMessage->Msg.lParam) - ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); - } - - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) - { - /* dereference our and the sender's message queue */ - IntDereferenceMessageQueue(MessageQueue); - IntDereferenceMessageQueue(CurrentSentMessage->SenderQueue); - } - - /* free the message */ - ExFreePool(CurrentSentMessage); + MsqDestroySentMessage(MessageQueue, CurrentSentMessage); } /* tell other threads not to bother returning any info to us */ @@ -1515,6 +1438,7 @@ DispatchingListEntry); CurrentSentMessage->CompletionEvent = NULL; CurrentSentMessage->Result = NULL; + CurrentSentMessage->DispatchingListEntry.Flink = NULL; // yeah! /* do NOT dereference our message queue as it might get attempted to be locked later */

1 0

[pschweitzer] 51030: [RAPPS] French translation by Jason Toscano <JasonGenie at gmail dot com> Corrections/adjustements by me See issue #5993 for more details.
by pschweitzer＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: pschweitzer Date: Sun Mar 13 10:43:38 2011 New Revision: 51030 URL: http://svn.reactos.org/svn/reactos?rev=51030&view=rev Log: [RAPPS] French translation by Jason Toscano <JasonGenie at gmail dot com> Corrections/adjustements by me See issue #5993 for more details. Added: trunk/reactos/base/applications/rapps/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/rapps/rsrc.rc Added: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Sun Mar 13 10:43:38 2011 @@ -1,0 +1,193 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_MAINMENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Configuration", ID_SETTINGS + MENUITEM SEPARATOR + MENUITEM "S&ortir", ID_EXIT + END + POPUP "&Programmes" + BEGIN + MENUITEM "&Installer", ID_INSTALL + MENUITEM "&DÃ©sinstaller",ID_UNINSTALL + MENUITEM "&Modifier", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Supprimer du registre", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "&RafraÃ®chir", ID_REFRESH + END + POPUP "Aide" + BEGIN + MENUITEM "Aide", ID_HELP, GRAYED + MENUITEM "Ã propos", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Ouvrir le lien dans un navigateur", ID_OPEN_LINK + MENUITEM "&Copier le lien dans le presse-papier", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Installer", ID_INSTALL + MENUITEM "&DÃ©sinstaller", ID_UNINSTALL + MENUITEM "&Modifier", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Supprimer du registre", ID_REGREMOVE + MENUITEM SEPARATOR + MENUITEM "&RafraÃ®chir", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Configuration" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "GÃ©nÃ©ral", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Enregistrer la position de la fenÃªtre", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Mettre Ã jour la liste des programmes accessibles au dÃ©marage", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "&Journal de l'installation de la suppression des programmes", IDC_LOG_ENABLED, 15, 46, 219, 12 + + GROUPBOX "TÃ©lÃ©chargement", -1, 4, 65, 240, 51 + LTEXT "Fichier des tÃ©lÃ©chargements :", -1, 16, 75, 100, 9 + EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&SÃ©lectionner", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "&Supprimer l'installateur du programme aprÃ¨s l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + + PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de programme" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 + + AUTORADIOBUTTON "&Installer Ã partir d'un disque (CD ou DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&TÃ©lÃ©charger et installer", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + + PUSHBUTTON "Accepter", IDOK, 86, 78, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 150, 78, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "TÃ©lÃ©charger..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Annuler", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Ã propos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\npar Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Fermer", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Installer" + IDS_TOOLTIP_UNINSTALL "DÃ©sinstaller" + IDS_TOOLTIP_MODIFY "Modifier" + IDS_TOOLTIP_SETTINGS "Configuration" + IDS_TOOLTIP_REFRESH "RafraÃ®chir" + IDS_TOOLTIP_EXIT "Sortir" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Nom" + IDS_APP_INST_VERSION "Version" + IDS_APP_DESCRIPTION "Description" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVersion : " + IDS_INFO_DESCRIPTION "\nDescription : " + IDS_INFO_PUBLISHER "\nAuteur : " + IDS_INFO_HELPLINK "\nLien d'aide : " + IDS_INFO_HELPPHONE "\nTÃ©lÃ©phone d'aide : " + IDS_INFO_README "\nLisez-moi : " + IDS_INFO_REGOWNER "\nUtilisateur enregistrÃ© : " + IDS_INFO_PRODUCTID "\nID du produit : " + IDS_INFO_CONTACT "\nContact : " + IDS_INFO_UPDATEINFO "\nInformation de mise Ã jour : " + IDS_INFO_INFOABOUT "\nInformation Ã propos : " + IDS_INFO_COMMENTS "\nCommentaires : " + IDS_INFO_INSTLOCATION "\Emplacement de l'installation : " + IDS_INFO_INSTALLSRC "\nSource de l'installation : " + IDS_INFO_UNINSTALLSTR "\nCommande de dÃ©sinstallation : " + IDS_INFO_MODIFYPATH "\nModifier le chemin d'accÃ¨s : " + IDS_INFO_INSTALLDATE "\nDate d'installation : " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVersion : " + IDS_AINFO_DESCRIPTION "\nDescription : " + IDS_AINFO_SIZE "\nTaille : " + IDS_AINFO_URLSITE "\nSite internet : " + IDS_AINFO_LICENCE "\nLicence : " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Audio" + IDS_CAT_DEVEL "DÃ©veloppement" + IDS_CAT_DRIVERS "Pilotes" + IDS_CAT_EDU "Ãducation" + IDS_CAT_ENGINEER "IngÃ©nierie" + IDS_CAT_FINANCE "Finance" + IDS_CAT_GAMES "Jeux & dÃ©tente" + IDS_CAT_GRAPHICS "Graphismes" + IDS_CAT_INTERNET "Internet & rÃ©saux" + IDS_CAT_LIBS "BibliothÃ¨ques" + IDS_CAT_OFFICE "Bureautique" + IDS_CAT_OTHER "Autres" + IDS_CAT_SCIENCE "Sciences" + IDS_CAT_TOOLS "Outils" + IDS_CAT_VIDEO "VidÃ©o" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Applications Manager" + IDS_SEARCH_TEXT "Chercher..." + IDS_INSTALL "Installer" + IDS_UNINSTALL "DÃ©sinstaller" + IDS_MODIFY "Modifier" + IDS_APPS_COUNT "Nombre d'applications : %d" + IDS_WELCOME_TITLE "Bienvenue Ã ReactOS Applications Manager!\n\n" + IDS_WELCOME_TEXT "Choisisez une catÃ©gorie Ã gauche, ensuite choisisez une application Ã installer ou dÃ©sinstaller.\nSite internet de ReactOS : " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "InstallÃ©" + IDS_AVAILABLEFORINST "Disponible pour installation" + IDS_UPDATES "Mises Ã jour" + IDS_APPLICATIONS "Applications" + IDS_CHOOSE_FOLDER_TEXT "Choisisez un dossier dans lequel seront tÃ©lÃ©chargÃ©s les programmes :" + IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spÃ©cifiÃ© n'existe pas. Le crÃ©er ?" + IDS_USER_NOT_ADMIN "Vous devez Ãªtre un administrateur pour dÃ©marrer ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "Etes-vous sÃ»r de vouloir supprimer les donnÃ©es du programme installÃ© du registre ?" + IDS_INFORMATION "Information" + IDS_UNABLE_TO_REMOVE "Impossible de supprimer les donnÃ©es du programme du registre !" +END Propchange: trunk/reactos/base/applications/rapps/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sun Mar 13 10:43:38 2011 @@ -3,6 +3,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc"

1 0

[fireball] 51029: [USER32] - Rafal Harabien: Add some missing bitmaps to user32. They are copied from Wine. Change "old" cursors identifiers to defines from winuser.h (OCR_*). See issue #6000 for m...
by fireball＠svn.reactos.org 13 Mar '11

13 Mar '11

Author: fireball Date: Sun Mar 13 09:56:01 2011 New Revision: 51029 URL: http://svn.reactos.org/svn/reactos?rev=51029&view=rev Log: [USER32] - Rafal Harabien: Add some missing bitmaps to user32. They are copied from Wine. Change "old" cursors identifiers to defines from winuser.h (OCR_*). See issue #6000 for more details. Added: trunk/reactos/dll/win32/user32/resources/obm_btncorners.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_btsize.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_check.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_dnarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_lfarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_close.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_reduce.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_restore.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_old_zoom.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_reduce.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_reduced.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_restore.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_restored.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_rgarrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_size.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_trtype.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_uparrow.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_uparrowd.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_uparrowi.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_zoom.bmp (with props) trunk/reactos/dll/win32/user32/resources/obm_zoomd.bmp (with props) Modified: trunk/reactos/dll/win32/user32/user32.rc trunk/reactos/include/psdk/winuser.h Added: trunk/reactos/dll/win32/user32/resources/obm_btncorners.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_btncorners.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_btsize.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_btsize.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_check.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_check.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_dnarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_dnarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_lfarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_lfarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_close.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_close.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_reduce.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_reduce.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_restore.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_restore.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_old_zoom.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_old_zoom.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_reduce.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_reduce.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_reduced.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_reduced.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_restore.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_restore.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_restored.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_restored.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_rgarrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_rgarrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_size.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_size.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_trtype.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_trtype.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_uparrow.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_uparrow.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_uparrowd.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_uparrowd.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_uparrowi.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_uparrowi.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_zoom.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_zoom.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/user32/resources/obm_zoomd.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/resources… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/user32/resources/obm_zoomd.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rc [iso-8859-1] Sun Mar 13 09:56:01 2011 @@ -38,34 +38,34 @@ 116 CURSOR "resources/ocr_cdautostart.cur" /* Compatible cursor resources (will be removed) */ -32512 CURSOR "resources/ocr_normal.cur" -32513 CURSOR "resources/ocr_ibeam.cur" -32514 CURSOR "resources/ocr_wait.cur" -32515 CURSOR "resources/ocr_cross.cur" -32516 CURSOR "resources/ocr_up.cur" -32642 CURSOR "resources/ocr_sizenwse.cur" -32643 CURSOR "resources/ocr_sizenesw.cur" -32644 CURSOR "resources/ocr_sizewe.cur" -32645 CURSOR "resources/ocr_sizens.cur" -32646 CURSOR "resources/ocr_sizeall.cur" -32648 CURSOR "resources/ocr_no.cur" -32650 CURSOR "resources/ocr_appstarting.cur" -32651 CURSOR "resources/ocr_help.cur" -32640 CURSOR "resources/ocr_size.cur" -32641 CURSOR "resources/ocr_icon.cur" -32649 CURSOR "resources/ocr_hand.cur" +OCR_NORMAL CURSOR "resources/ocr_normal.cur" +OCR_IBEAM CURSOR "resources/ocr_ibeam.cur" +OCR_WAIT CURSOR "resources/ocr_wait.cur" +OCR_CROSS CURSOR "resources/ocr_cross.cur" +OCR_UP CURSOR "resources/ocr_up.cur" +OCR_SIZENWSE CURSOR "resources/ocr_sizenwse.cur" +OCR_SIZENESW CURSOR "resources/ocr_sizenesw.cur" +OCR_SIZEWE CURSOR "resources/ocr_sizewe.cur" +OCR_SIZENS CURSOR "resources/ocr_sizens.cur" +OCR_SIZEALL CURSOR "resources/ocr_sizeall.cur" +OCR_NO CURSOR "resources/ocr_no.cur" +OCR_APPSTARTING CURSOR "resources/ocr_appstarting.cur" +OCR_HELP CURSOR "resources/ocr_help.cur" +OCR_SIZE CURSOR "resources/ocr_size.cur" +OCR_ICON CURSOR "resources/ocr_icon.cur" +OCR_HAND CURSOR "resources/ocr_hand.cur" ///////////////////////////////////////////////////////////////////////////// // // Icons // -32512 ICON "resources/oic_sample.ico" -32513 ICON "resources/oic_hand.ico" -32514 ICON "resources/oic_ques.ico" -32515 ICON "resources/oic_bang.ico" -32516 ICON "resources/oic_note.ico" -32517 ICON "resources/oic_reactos.ico" +OIC_SAMPLE ICON "resources/oic_sample.ico" +OIC_HAND ICON "resources/oic_hand.ico" +OIC_QUES ICON "resources/oic_ques.ico" +OIC_BANG ICON "resources/oic_bang.ico" +OIC_NOTE ICON "resources/oic_note.ico" +OIC_WINLOGO ICON "resources/oic_reactos.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -76,6 +76,37 @@ OBM_CLOSE BITMAP "resources/obm_close.bmp" OBM_COMBO BITMAP "resources/obm_combo.bmp" OBM_MNARROW BITMAP "resources/obm_mnarrow.bmp" +OBM_TRTYPE BITMAP "resources/obm_trtype.bmp" +OBM_LFARROWI BITMAP "resources/obm_lfarrowi.bmp" +OBM_RGARROWI BITMAP "resources/obm_rgarrowi.bmp" +OBM_DNARROWI BITMAP "resources/obm_dnarrowi.bmp" +OBM_UPARROWI BITMAP "resources/obm_uparrowi.bmp" +OBM_LFARROWD BITMAP "resources/obm_lfarrowd.bmp" +OBM_RGARROWD BITMAP "resources/obm_rgarrowd.bmp" +OBM_DNARROWD BITMAP "resources/obm_dnarrowd.bmp" +OBM_UPARROWD BITMAP "resources/obm_uparrowd.bmp" +OBM_RESTORED BITMAP "resources/obm_restored.bmp" +OBM_ZOOMD BITMAP "resources/obm_zoomd.bmp" +OBM_REDUCED BITMAP "resources/obm_reduced.bmp" +OBM_RESTORE BITMAP "resources/obm_restore.bmp" +OBM_ZOOM BITMAP "resources/obm_zoom.bmp" +OBM_REDUCE BITMAP "resources/obm_reduce.bmp" +OBM_LFARROW BITMAP "resources/obm_lfarrow.bmp" +OBM_RGARROW BITMAP "resources/obm_rgarrow.bmp" +OBM_DNARROW BITMAP "resources/obm_dnarrow.bmp" +OBM_UPARROW BITMAP "resources/obm_uparrow.bmp" +OBM_OLD_RESTORE BITMAP "resources/obm_old_restore.bmp" +OBM_OLD_ZOOM BITMAP "resources/obm_old_zoom.bmp" +OBM_OLD_REDUCE BITMAP "resources/obm_old_reduce.bmp" +OBM_BTNCORNERS BITMAP "resources/obm_btncorners.bmp" +OBM_CHECK BITMAP "resources/obm_check.bmp" +OBM_BTSIZE BITMAP "resources/obm_btsize.bmp" +OBM_OLD_LFARROW BITMAP "resources/obm_old_lfarrow.bmp" +OBM_OLD_RGARROW BITMAP "resources/obm_old_rgarrow.bmp" +OBM_OLD_DNARROW BITMAP "resources/obm_old_dnarrow.bmp" +OBM_OLD_UPARROW BITMAP "resources/obm_old_uparrow.bmp" +OBM_SIZE BITMAP "resources/obm_size.bmp" +OBM_OLD_CLOSE BITMAP "resources/obm_old_close.bmp" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Mar 13 09:56:01 2011 @@ -1067,40 +1067,41 @@ #define KEYEVENTF_UNICODE 0x00000004 #define KEYEVENTF_SCANCODE 0x00000008 #endif -#define OBM_BTNCORNERS 32758 -#define OBM_BTSIZE 32761 -#define OBM_CHECK 32760 -#define OBM_CHECKBOXES 32759 -#define OBM_CLOSE 32754 +#define OBM_TRTYPE 32732 +#define OBM_LFARROWI 32734 +#define OBM_RGARROWI 32735 +#define OBM_DNARROWI 32736 +#define OBM_UPARROWI 32737 #define OBM_COMBO 32738 -#define OBM_DNARROW 32752 +#define OBM_MNARROW 32739 +#define OBM_LFARROWD 32740 +#define OBM_RGARROWD 32741 #define OBM_DNARROWD 32742 -#define OBM_DNARROWI 32736 -#define OBM_LFARROW 32750 -#define OBM_LFARROWI 32734 -#define OBM_LFARROWD 32740 -#define OBM_MNARROW 32739 -#define OBM_OLD_CLOSE 32767 -#define OBM_OLD_DNARROW 32764 -#define OBM_OLD_LFARROW 32762 -#define OBM_OLD_REDUCE 32757 -#define OBM_OLD_RESTORE 32755 -#define OBM_OLD_RGARROW 32763 -#define OBM_OLD_UPARROW 32765 -#define OBM_OLD_ZOOM 32756 -#define OBM_REDUCE 32749 +#define OBM_UPARROWD 32743 +#define OBM_RESTORED 32744 +#define OBM_ZOOMD 32745 #define OBM_REDUCED 32746 #define OBM_RESTORE 32747 -#define OBM_RESTORED 32744 +#define OBM_ZOOM 32748 +#define OBM_REDUCE 32749 +#define OBM_LFARROW 32750 #define OBM_RGARROW 32751 -#define OBM_RGARROWD 32741 -#define OBM_RGARROWI 32735 +#define OBM_DNARROW 32752 +#define OBM_UPARROW 32753 +#define OBM_CLOSE 32754 +#define OBM_OLD_RESTORE 32755 +#define OBM_OLD_ZOOM 32756 +#define OBM_OLD_REDUCE 32757 +#define OBM_BTNCORNERS 32758 +#define OBM_CHECKBOXES 32759 +#define OBM_CHECK 32760 +#define OBM_BTSIZE 32761 +#define OBM_OLD_LFARROW 32762 +#define OBM_OLD_RGARROW 32763 +#define OBM_OLD_DNARROW 32764 +#define OBM_OLD_UPARROW 32765 #define OBM_SIZE 32766 -#define OBM_UPARROW 32753 -#define OBM_UPARROWD 32743 -#define OBM_UPARROWI 32737 -#define OBM_ZOOM 32748 -#define OBM_ZOOMD 32745 +#define OBM_OLD_CLOSE 32767 #define OCR_NORMAL 32512 #define OCR_IBEAM 32513 #define OCR_WAIT 32514 @@ -1114,7 +1115,9 @@ #define OCR_SIZENS 32645 #define OCR_SIZEALL 32646 #define OCR_NO 32648 +#define OCR_HAND 32649 #define OCR_APPSTARTING 32650 +#define OCR_HELP 32651 #define OIC_SAMPLE 32512 #define OIC_HAND 32513 #define OIC_QUES 32514

1 0

[rmessiant] 51028: [FTP] - FTP has been a really, really naughty app.. Fix up function prototypes and definitions after () -> (void) change. Fixes build.. if I'm lucky.
by rmessiant＠svn.reactos.org 12 Mar '11

12 Mar '11

Author: rmessiant Date: Sat Mar 12 23:39:18 2011 New Revision: 51028 URL: http://svn.reactos.org/svn/reactos?rev=51028&view=rev Log: [FTP] - FTP has been a really, really naughty app.. Fix up function prototypes and definitions after () -> (void) change. Fixes build.. if I'm lucky. Modified: trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/domacro.c trunk/reactos/base/applications/network/ftp/fake.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/applications/network/ftp/main.c trunk/reactos/base/applications/network/ftp/prototypes.h Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/cmds.c [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -47,14 +47,15 @@ extern char *globerr; extern char home[]; -extern char *remglob(); +static const char *remglob(const char *argv[], int doswitch); extern int allbinary; extern off_t restart_point; extern char reply_string[]; const char *mname; jmp_buf jabort; -const char *dotrans(), *domap(); +const char *dotrans(const char *name); +const char *domap(const char *name); extern short portnum; extern char *hostname; @@ -169,8 +170,7 @@ /* * Set transfer type. */ -void settype(argc, argv) - const char *argv[]; +void settype(int argc, const char *argv[]) { register struct types *p; int comret; @@ -225,7 +225,7 @@ * Set binary transfer type. */ /*VARARGS*/ -void setbinary() +void setbinary(int argc, const char *argv[]) { stype[1] = "binary"; settype(2, stype); @@ -235,7 +235,7 @@ * Set ascii transfer type. */ /*VARARGS*/ -void setascii() +void setascii(int argc, const char *argv[]) { stype[1] = "ascii"; settype(2, stype); @@ -245,7 +245,7 @@ * Set tenex transfer type. */ /*VARARGS*/ -void settenex() +void settenex(int argc, const char *argv[]) { stype[1] = "tenex"; settype(2, stype); @@ -266,8 +266,7 @@ */ /*ARGSUSED*/ -void fsetmode(argc, argv) - char *argv[]; +void fsetmode(int argc, const char *argv[]) { printf("We only support %s mode, sorry.\n", modename); @@ -280,8 +279,7 @@ * Set file transfer format. */ /*ARGSUSED*/ -void setform(argc, argv) - char *argv[]; +void setform(int argc, const char *argv[]) { printf("We only support %s format, sorry.\n", formname); @@ -293,8 +291,7 @@ * Set file transfer structure. */ /*ARGSUSED*/ -void setstruct(argc, argv) - char *argv[]; +void setstruct(int argc, const char *argv[]) { printf("We only support %s structure, sorry.\n", structname); @@ -305,9 +302,7 @@ /* * Send a single file. */ -void put(argc, argv) - int argc; - const char *argv[]; +void put(int argc, const char *argv[]) { const char *cmd; int loc = 0; @@ -372,8 +367,7 @@ /* * Send multiple files. */ -void mput(argc, argv) - const char *argv[]; +void mput(int argc, const char *argv[]) { register int i; int ointer; @@ -400,7 +394,8 @@ // oldintr = signal(SIGINT, mabort); (void) setjmp(jabort); if (proxy) { - char *cp, *tp2, tmpbuf[MAXPATHLEN]; + const char *cp; + char *tp2, tmpbuf[MAXPATHLEN]; while ((cp = remglob(argv,0)) != NULL) { if (*cp == 0) { @@ -503,14 +498,12 @@ mflag = 0; } -void reget(argc, argv) - const char *argv[]; +void reget(int argc, const char *argv[]) { (void) getit(argc, argv, 1, "r+w"); } -void get(argc, argv) - const char *argv[]; +void get(int argc, const char *argv[]) { (void) getit(argc, argv, 0, restart_point ? "r+w" : "w" ); } @@ -518,9 +511,7 @@ /* * Receive one file. */ -int getit(argc, argv, restartit, mode) - const char *argv[]; - const char *mode; +int getit(int argc, const char *argv[], int restartit, const char *mode) { int loc = 0; const char *oldargv1, *oldargv2; @@ -674,8 +665,7 @@ /* * Get multiple files. */ -void mget(argc, argv) - const char *argv[]; +void mget(int argc, const char *argv[]) { const char *cp, *tp; char *tp2, tmpbuf[MAXPATHLEN]; @@ -747,18 +737,17 @@ mflag = 0; } -char * -remglob(argv,doswitch) - char *argv[]; - int doswitch; +const char * +remglob(const char *argv[], int doswitch) { char temp[16]; static char buf[MAXPATHLEN]; static FILE *ftemp = NULL; - static char **args; + static const char **args; int oldverbose, oldhash; - char *cp; + const char *cp; const char *mode; + char *terminator; if (!mflag) { if (!doglob) { @@ -805,16 +794,14 @@ (void) fclose(ftemp), ftemp = NULL; return (NULL); } - if ((cp = index(buf, '\n')) != NULL) - *cp = '\0'; + if ((terminator = index(buf, '\n')) != NULL) + *terminator = '\0'; return (buf); } static const char * -onoff(bool) - int bool; -{ - +onoff(int bool) +{ return (bool ? "on" : "off"); } @@ -822,8 +809,7 @@ * Show status. */ /*ARGSUSED*/ -void status(argc, argv) - char *argv[]; +void status(int argc, const char *argv[]) { int i; @@ -877,7 +863,7 @@ * Set beep on cmd completed mode. */ /*VARARGS*/ -void setbell() +void setbell(int argc, const char *argv[]) { bell = !bell; @@ -890,7 +876,7 @@ * Turn on packet tracing. */ /*VARARGS*/ -void settrace() +void settrace(int argc, const char *argv[]) { trace = !trace; @@ -903,7 +889,7 @@ * Toggle hash mark printing during transfers. */ /*VARARGS*/ -void sethash() +void sethash(int argc, const char *argv[]) { hash = !hash; @@ -919,7 +905,7 @@ * Turn on printing of server echo's. */ /*VARARGS*/ -void setverbose() +void setverbose(int argc, const char *argv[]) { verbose = !verbose; @@ -932,7 +918,7 @@ * Toggle PORT cmd use before each data connection. */ /*VARARGS*/ -void setport() +void setport(int argc, const char *argv[]) { sendport = !sendport; @@ -946,7 +932,7 @@ * during mget, mput, and mdelete. */ /*VARARGS*/ -void setprompt() +void setprompt(int argc, const char *argv[]) { interactive = !interactive; @@ -960,7 +946,7 @@ * on local file names. */ /*VARARGS*/ -void setglob() +void setglob(int argc, const char *argv[]) { doglob = !doglob; @@ -974,8 +960,7 @@ * set level of debugging. */ /*VARARGS*/ -void setdebug(argc, argv) - char *argv[]; +void setdebug(int argc, const char *argv[]) { int val; @@ -1003,8 +988,7 @@ * Set current working directory * on remote machine. */ -void cd(argc, argv) - const char *argv[]; +void cd(int argc, const char *argv[]) { if (argc < 2) { @@ -1035,8 +1019,7 @@ * Set current working directory * on local machine. */ -void lcd(argc, argv) - const char *argv[]; +void lcd(int argc, const char *argv[]) { char buf[MAXPATHLEN]; @@ -1065,8 +1048,7 @@ /* * Delete a single file. */ -void delete(argc, argv) - const char *argv[]; +void delete(int argc, const char *argv[]) { if (argc < 2) { @@ -1090,10 +1072,9 @@ /* * Delete multiple files. */ -void mdelete(argc, argv) - const char *argv[]; -{ - char *cp; +void mdelete(int argc, const char *argv[]) +{ + const char *cp; int ointer; extern jmp_buf jabort; @@ -1140,8 +1121,7 @@ /* * Rename a remote file. */ -void renamefile(argc, argv) - const char *argv[]; +void renamefile(int argc, const char *argv[]) { if (argc < 2) { @@ -1179,8 +1159,7 @@ * Get a directory listing * of remote files. */ -void ls(argc, argv) - const char *argv[]; +void ls(int argc, const char *argv[]) { const char *cmd; @@ -1212,8 +1191,7 @@ * Get a directory listing * of multiple remote files. */ -void mls(argc, argv) - const char *argv[]; +void mls(int argc, const char *argv[]) { const char *cmd, *dest; char mode[1]; @@ -1276,8 +1254,7 @@ * Do a shell escape */ /*ARGSUSED*/ -void shell(argc, argv) - char *argv[]; +void shell(int argc, const char *argv[]) { #if 0 int pid; @@ -1396,9 +1373,7 @@ /* * Send new user information (re-login) */ -void user(argc, argv) - int argc; - const char **argv; +void user(int argc, const char *argv[]) { char acct[80], *getpass(); int n, aflag = 0; @@ -1449,7 +1424,7 @@ * Print working directory. */ /*VARARGS*/ -void pwd() +void pwd(int argc, const char *argv[]) { int oldverbose = verbose; @@ -1468,8 +1443,7 @@ /* * Make a directory. */ -void makedir(argc, argv) - const char *argv[]; +void makedir(int argc, const char *argv[]) { if (argc < 2) { @@ -1499,8 +1473,7 @@ /* * Remove a directory. */ -void removedir(argc, argv) - const char *argv[]; +void removedir(int argc, const char *argv[]) { if (argc < 2) { @@ -1530,8 +1503,7 @@ /* * Send a line, verbatim, to the remote machine. */ -void quote(argc, argv) - const char *argv[]; +void quote(int argc, const char *argv[]) { int i; char buf[BUFSIZ]; @@ -1566,9 +1538,7 @@ * is sent almost verbatim to the remote machine, the * first argument is changed to SITE. */ - -void site(argc, argv) - const char *argv[]; +void site(int argc, const char *argv[]) { int i; char buf[BUFSIZ]; @@ -1599,8 +1569,7 @@ } } -void do_chmod(argc, argv) - const char *argv[]; +void do_chmod(int argc, const char *argv[]) { if (argc == 2) { printf("usage: %s mode file-name\n", argv[0]); @@ -1626,8 +1595,7 @@ (void)command("SITE CHMOD %s %s", argv[1], argv[2]); } -void do_umask(argc, argv) - char *argv[]; +void do_umask(int argc, const char *argv[]) { int oldverbose = verbose; @@ -1636,8 +1604,7 @@ verbose = oldverbose; } -void idle(argc, argv) - char *argv[]; +void idle(int argc, const char *argv[]) { int oldverbose = verbose; @@ -1649,8 +1616,7 @@ /* * Ask the other side for help. */ -void rmthelp(argc, argv) - char *argv[]; +void rmthelp(int argc, const char *argv[]) { int oldverbose = verbose; @@ -1663,14 +1629,13 @@ * Terminate session and exit. */ /*VARARGS*/ -void quit() -{ - +void quit(int argc, const char *argv[]) +{ if (connected) - disconnect(); + disconnect(0, NULL); pswitch(1); if (connected) { - disconnect(); + disconnect(0, NULL); } exit(0); } @@ -1678,7 +1643,7 @@ /* * Terminate session, but don't exit. */ -void disconnect() +void disconnect(int argc, const char *argv[]) { extern int cout; extern int data; @@ -1694,8 +1659,7 @@ } } -int confirm(cmd, file) - const char *cmd, *file; +int confirm(const char *cmd, const char *file) { char line[BUFSIZ]; @@ -1708,8 +1672,7 @@ } #if 0 -static void fatal(msg) - char *msg; +static void fatal(const char *msg) { fprintf(stderr, "ftp: %s\n", msg); @@ -1723,8 +1686,7 @@ * Can't control multiple values being expanded * from the expression, we return only the first. */ -int globulize(cpp) - const char **cpp; +int globulize(const char **cpp) { char **globbed; @@ -1751,9 +1713,7 @@ return (1); } -void account(argc,argv) - int argc; - char **argv; +void account(int argc, const char *argv[]) { char acct[50], *getpass(), *ap; @@ -1797,9 +1757,7 @@ } #endif -void doproxy(argc,argv) - int argc; - const char *argv[]; +void doproxy(int argc, const char *argv[]) { register struct cmd *c; struct cmd *getcmd(); @@ -1865,7 +1823,7 @@ // (void) signal(SIGINT, oldintr); } -void setcase() +void setcase(int argc, const char *argv[]) { mcase = !mcase; printf("Case mapping %s.\n", onoff(mcase)); @@ -1873,7 +1831,7 @@ code = mcase; } -void setcr() +void setcr(int argc, const char *argv[]) { crflag = !crflag; printf("Carriage Return stripping %s.\n", onoff(crflag)); @@ -1881,9 +1839,7 @@ code = crflag; } -void setntrans(argc,argv) - int argc; - char *argv[]; +void setntrans(int argc, const char *argv[]) { if (argc == 1) { ntflag = 0; @@ -1905,8 +1861,7 @@ } const char * -dotrans(name) - const char *name; +dotrans(const char *name) { static char new[MAXPATHLEN]; const char *cp1; @@ -1933,11 +1888,7 @@ return(new); } - -void -setpassive(argc, argv) - int argc; - char *argv[]; +void setpassive(int argc, const char *argv[]) { passivemode = !passivemode; printf("Passive mode %s.\n", onoff(passivemode)); @@ -1945,9 +1896,7 @@ code = passivemode; } -void setnmap(argc, argv) - int argc; - const char *argv[]; +void setnmap(int argc, const char *argv[]) { char *cp; @@ -1988,8 +1937,7 @@ } const char * -domap(name) - const char *name; +domap(const char *name) { static char new[MAXPATHLEN]; const char *cp1 = name; @@ -2161,7 +2109,7 @@ return(new); } -void setsunique() +void setsunique(int argc, const char *argv[]) { sunique = !sunique; printf("Store unique %s.\n", onoff(sunique)); @@ -2169,7 +2117,7 @@ code = sunique; } -void setrunique() +void setrunique(int argc, const char *argv[]) { runique = !runique; printf("Receive unique %s.\n", onoff(runique)); @@ -2178,7 +2126,7 @@ } /* change directory to perent directory */ -void cdup() +void cdup(int argc, const char *argv[]) { if (command("CDUP") == ERROR && code == 500) { if (verbose) { @@ -2190,9 +2138,7 @@ } /* restart transfer at specific point */ -void restart(argc, argv) - int argc; - char *argv[]; +void restart(int argc, const char *argv[]) { if (argc != 2) printf("restart: offset not specified\n"); @@ -2205,14 +2151,12 @@ } /* show remote system type */ -void syst() +void syst(int argc, const char *argv[]) { (void) command("SYST"); } -void macdef(argc, argv) - int argc; - const char *argv[]; +void macdef(int argc, const char *argv[]) { char *tmp; int c; @@ -2287,8 +2231,7 @@ /* * get size of file on remote machine */ -void sizecmd(argc, argv) - const char *argv[]; +void sizecmd(int argc, const char *argv[]) { if (argc < 2) { @@ -2312,8 +2255,7 @@ /* * get last modification time of file on remote machine */ -void modtime(argc, argv) - const char *argv[]; +void modtime(int argc, const char *argv[]) { int overbose; @@ -2351,8 +2293,7 @@ /* * show status on reomte machine */ -void rmtstatus(argc, argv) - const char *argv[]; +void rmtstatus(int argc, const char *argv[]) { (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]); } @@ -2360,8 +2301,7 @@ /* * get file if modtime is more recent than current file */ -void newer(argc, argv) - const char *argv[]; +void newer(int argc, const char *argv[]) { if (getit(argc, argv, -1, "w")) { printf("Local file \"%s\" is newer than remote file \"%s\"\n", Modified: trunk/reactos/base/applications/network/ftp/domacro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/domacro.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/domacro.c [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -28,9 +28,7 @@ #include <ctype.h> //#include <sys/ttychars.h> -void domacro(argc, argv) - int argc; - const char *argv[]; +void domacro(int argc, const char *argv[]) { int i, j; const char *cp1; Modified: trunk/reactos/base/applications/network/ftp/fake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/fake.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/fake.c [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -35,7 +35,7 @@ free(*av++); } -char **glob(register char *v) +char **glob(const char *v) { return NULL; } Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.c [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -110,7 +110,7 @@ void psabort(int sig); -char *hookup(char *host, int port) +char *hookup(const char *host, int port) { register struct hostent *hp = 0; int len; @@ -837,7 +837,7 @@ oldverbose = verbose; if (!debug) verbose = 0; - setascii(); + setascii(0, NULL); verbose = oldverbose; } } else if (restart_point) { @@ -852,13 +852,13 @@ verbose = 0; switch (oldtype) { case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } verbose = oldverbose; @@ -873,13 +873,13 @@ verbose = 0; switch (oldtype) { case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } verbose = oldverbose; @@ -1044,13 +1044,13 @@ verbose = 0; switch (oldtype) { case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } verbose = oldverbose; @@ -1069,13 +1069,13 @@ verbose = 0; switch (oldtype) { case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } verbose = oldverbose; @@ -1463,16 +1463,16 @@ oldtype = type; switch (tmptype) { case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } } @@ -1481,16 +1481,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } pswitch(1); @@ -1505,16 +1505,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } pswitch(1); @@ -1534,16 +1534,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } pswitch(1); @@ -1565,16 +1565,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } if (cpend) { @@ -1636,16 +1636,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } if (cpend) { @@ -1720,16 +1720,16 @@ case 0: break; case TYPE_A: - setascii(); + setascii(0, NULL); break; case TYPE_I: - setbinary(); + setbinary(0, NULL); break; case TYPE_E: setebcdic(); break; case TYPE_L: - settenex(); + settenex(0, NULL); break; } pswitch(1); @@ -1738,7 +1738,7 @@ null();// (void) signal(SIGINT, oldintr); } -void reset() +void reset(int argc, const char *argv[]) { // struct fd_set mask; Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -141,7 +141,7 @@ char c_bell; /* give bell when command completes */ char c_conn; /* must be connected to use command */ char c_proxy; /* proxy server may execute */ - void (*c_handler)(void); /* function to call */ + void (*c_handler)(int argc, const char *argv[]); /* function to call */ }; struct macel { Modified: trunk/reactos/base/applications/network/ftp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/main.c [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -53,10 +53,10 @@ typedef int uid_t; #endif -uid_t getuid(); -void intr(); -void lostpeer(); -char *getlogin(); +uid_t getuid(void); +void intr(void); +void lostpeer(void); +char *getlogin(void); short portnum; @@ -262,10 +262,8 @@ } } -void -intr() -{ - +void intr(void) +{ longjmp(toplevel, 1); } @@ -299,8 +297,7 @@ } /*char * -tail(filename) - char *filename; +tail(char *filename) { register char *s; @@ -318,8 +315,7 @@ /* * Command parser. */ -void cmdscanner(top) - int top; +void cmdscanner(int top) { register struct cmd *c; @@ -333,7 +329,7 @@ } if (gets(line) == 0) { if (feof(stdin) || ferror(stdin)) - quit(); + quit(0, NULL); break; } if (line[0] == 0) @@ -367,8 +363,7 @@ } struct cmd * -getcmd(name) - const char *name; +getcmd(const char *name) { extern struct cmd cmdtab[]; const char *p, *q; @@ -402,7 +397,7 @@ int slrflag; -void makeargv() +void makeargv(void) { const char **argp; @@ -421,7 +416,7 @@ * handle quoting and strings */ static const char * -slurpstring() +slurpstring(void) { int got_one = 0; register char *sb = stringbase; @@ -544,9 +539,7 @@ * Help command. * Call each command handler with argc == 0 and argv[0] == name. */ -void help(argc, argv) - int argc; - char *argv[]; +void help(int argc, const char *argv[]) { extern struct cmd cmdtab[]; struct cmd *c; @@ -594,7 +587,7 @@ return; } while (--argc > 0) { - register char *arg; + const char *arg; arg = *++argv; c = getcmd(arg); if (c == (struct cmd *)-1) Modified: trunk/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Sat Mar 12 23:39:18 2011 @@ -8,8 +8,8 @@ int fputSocket(int s, char *putChar, int len); char *fgetsSocket(int s, char *string); -char *hookup(void); -char **glob(void); +char *hookup(const char *host, int port); +char **glob(const char *s); int herror(char *s); int getreply(int expecteof); @@ -20,18 +20,18 @@ void proxtrans(const char *cmd, const char *local, const char *remote); int null(void); int initconn(void); -void disconnect(void); +void disconnect(int argc, const char *argv[]); void ptransfer(const char *direction, long bytes, struct timeval *t0, struct timeval *t1); -void setascii(void); -void setbinary(void); +void setascii(int argc, const char *argv[]); +void setbinary(int argc, const char *argv[]); void setebcdic(void); -void settenex(void); +void settenex(int argc, const char *argv[]); void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0); -void setpassive(int argc, char *argv[]); +void setpassive(int argc, const char *argv[]); void setpeer(int argc, const char *argv[]); void cmdscanner(int top); void pswitch(int flag); -void quit(void); +void quit(int argc, const char *argv[]); int login(const char *host); int command(const char *fmt, ...); int globulize(const char **cpp); @@ -44,21 +44,58 @@ int sleep(int time); char *tail(void); -void setbell(void), setdebug(void); -void setglob(void), sethash(void), setport(void); -void setprompt(void); -void settrace(void), setverbose(void); -void settype(void), setform(void), setstruct(void); -void restart(void), syst(void); -void cd(void), lcd(void), delete(void), mdelete(void); -void ls(void), mls(void), get(void), mget(void), help(void), append(void), put(void), mput(void), reget(void); -void status(void); -void renamefile(void); -void quote(void), rmthelp(void), site(void); -void pwd(void), makedir(void), removedir(void), setcr(void); -void account(void), doproxy(void), reset(void), setcase(void), setntrans(void), setnmap(void); -void setsunique(void), setrunique(void), cdup(void), macdef(void); -void sizecmd(void), modtime(void), newer(void), rmtstatus(void); -void do_chmod(void), do_umask(void), idle(void); -void shell(void), user(void), fsetmode(void); -struct cmd *getcmd(void); +void setbell(int argc, const char *argv[]); +void setdebug(int argc, const char *argv[]); +void setglob(int argc, const char *argv[]); +void sethash(int argc, const char *argv[]); +void setport(int argc, const char *argv[]); +void setprompt(int argc, const char *argv[]); +void settrace(int argc, const char *argv[]); +void setverbose(int argc, const char *argv[]); +void settype(int argc, const char *argv[]); +void setform(int argc, const char *argv[]); +void setstruct(int argc, const char *argv[]); +void restart(int argc, const char *argv[]); +void syst(int argc, const char *argv[]); +void cd(int argc, const char *argv[]); +void lcd(int argc, const char *argv[]); +void delete(int argc, const char *argv[]); +void mdelete(int argc, const char *argv[]); +void ls(int argc, const char *argv[]); +void mls(int argc, const char *argv[]); +void get(int argc, const char *argv[]); +void mget(int argc, const char *argv[]); +void help(int argc, const char *argv[]); +void put(int argc, const char *argv[]); +void mput(int argc, const char *argv[]); +void reget(int argc, const char *argv[]); +void status(int argc, const char *argv[]); +void renamefile(int argc, const char *argv[]); +void quote(int argc, const char *argv[]); +void rmthelp(int argc, const char *argv[]); +void site(int argc, const char *argv[]); +void pwd(int argc, const char *argv[]); +void makedir(int argc, const char *argv[]); +void removedir(int argc, const char *argv[]); +void setcr(int argc, const char *argv[]); +void account(int argc, const char *argv[]); +void doproxy(int argc, const char *argv[]); +void reset(int argc, const char *argv[]); +void setcase(int argc, const char *argv[]); +void setntrans(int argc, const char *argv[]); +void setnmap(int argc, const char *argv[]); +void setsunique(int argc, const char *argv[]); +void setrunique(int argc, const char *argv[]); +void cdup(int argc, const char *argv[]); +void macdef(int argc, const char *argv[]); +void sizecmd(int argc, const char *argv[]); +void modtime(int argc, const char *argv[]); +void newer(int argc, const char *argv[]); +void rmtstatus(int argc, const char *argv[]); +void do_chmod(int argc, const char *argv[]); +void do_umask(int argc, const char *argv[]); +void idle(int argc, const char *argv[]); +void shell(int argc, const char *argv[]); +void user(int argc, const char *argv[]); +void fsetmode(int argc, const char *argv[]); +struct cmd *getcmd(const char *name);

1 0

[rmessiant] 51027: [APPLICATIONS] - Change all C function prototype declarations with an empty argument list to use void, or the list specified in the function definition. According to the C langua...
by rmessiant＠svn.reactos.org 12 Mar '11

12 Mar '11

Author: rmessiant Date: Sat Mar 12 19:03:27 2011 New Revision: 51027 URL: http://svn.reactos.org/svn/reactos?rev=51027&view=rev Log: [APPLICATIONS] - Change all C function prototype declarations with an empty argument list to use void, or the list specified in the function definition. According to the C language specification, such a declaration means "no information about the number or types of the parameters is supplied". This can expose cases where gcc allows us to pass an excessive amount of arguments to functions in certain cases. Thanks to Thomas Faber for informing us about this. Modified: trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/games/solitaire/solitaire.h trunk/reactos/base/applications/games/spider/spider.h trunk/reactos/base/applications/magnify/magnifier.h trunk/reactos/base/applications/network/ftp/ftp_var.h trunk/reactos/base/applications/network/ftp/prototypes.h trunk/reactos/base/applications/network/net/net.h trunk/reactos/base/applications/paint/dialogs.h trunk/reactos/base/applications/paint/history.h trunk/reactos/base/applications/paint/mouse.h Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -43,10 +43,10 @@ INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* DirectDraw tests */ -VOID DDTests(); +VOID DDTests(VOID); /* Direct3D tests */ -VOID D3DTests(); +VOID D3DTests(VOID); /* DirectSound initialization */ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext); Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -16,7 +16,7 @@ extern DWORD dwOptions; -void CreateSol(); +void CreateSol(void); void NewGame(void); #define NUM_ROW_STACKS 7 Modified: trunk/reactos/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spider.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -25,7 +25,7 @@ extern TCHAR MsgDeal[]; extern TCHAR MsgWin[]; -void CreateSpider(); +void CreateSpider(void); void NewGame(void); bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards); Modified: trunk/reactos/base/applications/magnify/magnifier.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -32,5 +32,5 @@ extern BOOL bStartMinimized; extern BOOL bShowMagnifier; -void LoadSettings(); -void SaveSettings(); +void LoadSettings(void); +void SaveSettings(void); Modified: trunk/reactos/base/applications/network/ftp/ftp_var.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp_var.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -141,7 +141,7 @@ char c_bell; /* give bell when command completes */ char c_conn; /* must be connected to use command */ char c_proxy; /* proxy server may execute */ - void (*c_handler)(); /* function to call */ + void (*c_handler)(void); /* function to call */ }; struct macel { Modified: trunk/reactos/base/applications/network/ftp/prototypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/prototypes.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -8,8 +8,8 @@ int fputSocket(int s, char *putChar, int len); char *fgetsSocket(int s, char *string); -char *hookup(); -char **glob(); +char *hookup(void); +char **glob(void); int herror(char *s); int getreply(int expecteof); @@ -43,22 +43,22 @@ int getit(int argc, const char *argv[], int restartit, const char *mode); int sleep(int time); -char *tail(); -void setbell(), setdebug(); -void setglob(), sethash(), setport(); -void setprompt(); -void settrace(), setverbose(); -void settype(), setform(), setstruct(); -void restart(), syst(); -void cd(), lcd(), delete(), mdelete(); -void ls(), mls(), get(), mget(), help(), append(), put(), mput(), reget(); -void status(); -void renamefile(); -void quote(), rmthelp(), site(); -void pwd(), makedir(), removedir(), setcr(); -void account(), doproxy(), reset(), setcase(), setntrans(), setnmap(); -void setsunique(), setrunique(), cdup(), macdef(); -void sizecmd(), modtime(), newer(), rmtstatus(); -void do_chmod(), do_umask(), idle(); -void shell(), user(), fsetmode(); -struct cmd *getcmd(); +char *tail(void); +void setbell(void), setdebug(void); +void setglob(void), sethash(void), setport(void); +void setprompt(void); +void settrace(void), setverbose(void); +void settype(void), setform(void), setstruct(void); +void restart(void), syst(void); +void cd(void), lcd(void), delete(void), mdelete(void); +void ls(void), mls(void), get(void), mget(void), help(void), append(void), put(void), mput(void), reget(void); +void status(void); +void renamefile(void); +void quote(void), rmthelp(void), site(void); +void pwd(void), makedir(void), removedir(void), setcr(void); +void account(void), doproxy(void), reset(void), setcase(void), setntrans(void), setnmap(void); +void setsunique(void), setrunique(void), cdup(void), macdef(void); +void sizecmd(void), modtime(void), newer(void), rmtstatus(void); +void do_chmod(void), do_umask(void), idle(void); +void shell(void), user(void), fsetmode(void); +struct cmd *getcmd(void); Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -13,8 +13,8 @@ #include <stdlib.h> #include <windows.h> -void help(); -int unimplemented(); +void help(void); +int unimplemented(void); INT cmdHelp(INT argc, CHAR **argv); Modified: trunk/reactos/base/applications/paint/dialogs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dialogs.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dialogs.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -6,8 +6,8 @@ * PROGRAMMERS: Benedikt Freisen */ -int mirrorRotateDlg(); +int mirrorRotateDlg(void); -int attributesDlg(); +int attributesDlg(void); int changeSizeDlg(); Modified: trunk/reactos/base/applications/paint/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/hi… ============================================================================== --- trunk/reactos/base/applications/paint/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/history.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -6,16 +6,16 @@ * PROGRAMMERS: Benedikt Freisen */ -void newReversible(); +void newReversible(void); -void undo(); +void undo(void); -void redo(); +void redo(void); -void resetToU1(); +void resetToU1(void); -void clearHistory(); +void clearHistory(void); -void insertReversible(); +void insertReversible(HBITMAP hbm); void cropReversible(int width, int height, int xOffset, int yOffset); Modified: trunk/reactos/base/applications/paint/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/mo… ============================================================================== --- trunk/reactos/base/applications/paint/mouse.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/mouse.h [iso-8859-1] Sat Mar 12 19:03:27 2011 @@ -6,7 +6,7 @@ * PROGRAMMERS: Benedikt Freisen */ -void placeSelWin(); +void placeSelWin(void); void startPaintingL(HDC hdc, short x, short y, int fg, int bg);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs