[ros-diffs] [cfinck] 51064: Merge 51058, 51062-51063

cfinck at svn.reactos.org cfinck at svn.reactos.org
Wed Mar 16 14:08:31 UTC 2011 

Author: cfinck
Date: Wed Mar 16 14:08:30 2011
New Revision: 51064

URL: http://svn.reactos.org/svn/reactos?rev=51064&view=rev
Log:
Merge 51058, 51062-51063

Modified:
    branches/ros-branch-0_3_13/reactos/   (props changed)
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt
    branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt
    branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c
    branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c

Propchange: branches/ros-branch-0_3_13/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 16 14:08:30 2011
@@ -3,4 +3,4 @@
 /branches/reactx/reactos:49994-49995
 /branches/ros-amd64-bringup:36852
 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
-/trunk/reactos:51043-51044,51046-51048
+/trunk/reactos:51043-51044,51046-51048,51058,51062-51063

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,45 +8,37 @@
 Size = 5.8M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe
+URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe
 CDPath = none
 
 [Section.0405]
 Description = Nejpopulárnější a jeden z nejlepších svobodných webových prohlížečů.
 URLSite = http://www.mozilla-europe.org/cs/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/cs/Firefox%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/2.0.0.20/win32/fr/Firefox%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe
 
 [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%20Setup%202.0.0.20.exe

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,52 +8,44 @@
 Size = 7.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/en-US/Firefox%20Setup%203.0.19.exe
+URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%203.0.19.exe
 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 = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/cs/Firefox%20Setup%203.0.19.exe
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/de/Firefox%20Setup%203.0.19.exe
 
 [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 = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/es-ES/Firefox%20Setup%203.0.19.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/fr/Firefox%20Setup%203.0.19.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 7.0M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/nb-NO/Firefox%20Setup%203.0.19.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ
darek internetowych.
 Size = 7.9M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/pl/Firefox%20Setup%203.0.19.exe
 
 [Section.0419]
 Description = Один из самыÑ
 популярныÑ
 и лучшиÑ
 бесплатныÑ
 браузеров.
 Size = 7.8M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/ru/Firefox%20Setup%203.0.19.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращиÑ
 безплатниÑ
 веб-браузерів.
 Size = 7.4M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.0.19-real-real/win32/uk/Firefox%20Setup%203.0.19.exe

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,47 +8,47 @@
 Size = 8.2M
 Category = 5
 URLSite = http://www.mozilla.com/en-US/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/en-US/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/en-US/Firefox%20Setup%203.6.15.exe
 CDPath = none
 
 [Section.0407]
 Description = Der populärste und einer der besten freien Webbrowser.
 Size = 8.1M
 URLSite = http://www.mozilla-europe.org/de/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/de/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/de/Firefox%20Setup%203.6.15.exe
 
 [Section.040a]
 Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
 Size = 8.1M
 URLSite = http://www.mozilla-europe.org/es/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/es-ES/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/es-ES/Firefox%20Setup%203.6.15.exe
 
 [Section.040c]
 Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs.
 Size = 8.1M
 URLSite = http://www.mozilla-europe.org/fr/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/fr/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/fr/Firefox%20Setup%203.6.15.exe
 
 [Section.0414]
 Description = Mest populære og best også gratis nettleserene der ute.
 Size = 8.1M
 URLSite = http://www.mozilla-europe.org/no/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/nb-NO/Firefox%20Setup%203.6.15.exe
 
 [Section.0415]
 Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄ
darek internetowych.
 Size = 8.9M
 URLSite = http://www.mozilla-europe.org/pl/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/pl/Firefox%20Setup%203.6.15.exe
 
 [Section.0419]
 Description = Один из самыÑ
 популярныÑ
 и лучшиÑ
 бесплатныÑ
 браузеров.
 Size = 8.5M
 URLSite = http://www.mozilla-europe.org/ru/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/ru/Firefox%20Setup%203.6.15.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращиÑ
 безплатниÑ
 веб-браузерів.
 Size = 8.5M
 URLSite = http://www.mozilla-europe.org/uk/
-URLDownload = ftp://ftp.mozilla.org/pub/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%203.6.15.exe
+URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.15/win32/uk/Firefox%20Setup%203.6.15.exe

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,36 +8,36 @@
 Size = 127MB
 Category = 6
 URLSite = http://www.openoffice.org/
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/OOo_2.4.3_Win32Intel_install_en-US.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/stable/2.4.3/OOo_2.4.3_Win32Intel_install_en-US.exe
 CDPath = none
 
 [Section.0407]
 Description = DIE Open Source Office Suite.
 URLSite = http://de.openoffice.org/
 Size = 114.2MB
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/de/2.4.3/OOo_2.4.3_Win32Intel_install_de.exe
 
 [Section.040a]
 Description = La suite de ofimática de código abierto.
 URLSite = http://es.openoffice.org/
 Size = 113.9MB
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/es/2.4.3/OOo_2.4.3_Win32Intel_install_es.exe
 
 [Section.040c]
 Version = 2.4.2
 Description = LA suite bureautique open source.
 URLSite = http://fr.openoffice.org/
 Size = 113.9MB
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2.4.2/OOo_2.4.2_Win32Intel_install_fr.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/fr/2.4.2/OOo_2.4.2_Win32Intel_install_fr.exe
 
 [Section.0415]
 URLSite = http://pl.openoffice.org/
 Description = Otwarty pakiet biurowy.
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/2.4.2/OOo_2.4.2_Win32Intel_install_pl.exe
 Size = 113.9M
 
 [Section.0422]
 URLSite = http://ua.openoffice.org/
 Description = Відкритий офісний пакет.
-URLDownload = ftp://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2.4.3/OOo_2.4.3_Win32Intel_install_ru.exe
+URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/ru/2.4.3/OOo_2.4.3_Win32Intel_install_ru.exe
 Size = 114.8M

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,30 +8,30 @@
 Size = 10.2MB
 Category = 5
 URLSite = http://www.seamonkey-project.org/
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/en-US/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/en-US/SeaMonkey%20Setup%202.0.12.exe
 CDPath = none
 
 [Section.0407]
 Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benötigen.
 Size = 10.1MB
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/de/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/de/SeaMonkey%20Setup%202.0.12.exe
 
 [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.1MB
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/es-ES/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/es-ES/SeaMonkey%20Setup%202.0.12.exe
 
 [Section.040c]
 Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin.
 Size = 10.1MB
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/fr/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/fr/SeaMonkey%20Setup%202.0.12.exe
 
 [Section.0415]
 Description = Pakiet Mozilla żyje. W zestawie: przeglÄ
darka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz.
 Size = 11.0MB
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/pl/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/pl/SeaMonkey%20Setup%202.0.12.exe
 
 [Section.0419]
 Description = Продолжение Mozilla Suite. Включает браузер, почтовый клиент, IRC-клиент и HTML-редактор.
 Size = 10.5MB
-URLDownload = ftp://ftp.mozilla.org/pub/seamonkey/releases/2.0.12/win32/ru/SeaMonkey%20Setup%202.0.12.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.12/win32/ru/SeaMonkey%20Setup%202.0.12.exe

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,41 +8,41 @@
 Size = 9.0M
 Category = 5
 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/
-URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/en-US/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/en-US/Thunderbird%20Setup%203.1.9.exe
 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 = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/de/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/de/Thunderbird%20Setup%203.1.9.exe
 
 [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 = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/es-ES/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/es-ES/Thunderbird%20Setup%203.1.9.exe
 
 [Section.040c]
 Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible.
 Size = 8.8M
 URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/
-URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/fr/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/fr/Thunderbird%20Setup%203.1.9.exe
 
 [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 = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/pl/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/pl/Thunderbird%20Setup%203.1.9.exe
 
 [Section.0419]
 Description = Один из самыÑ
 популярныÑ
 и лучшиÑ
 бесплатныÑ
 почтовыÑ
 клиентов.
 Size = 9.2M
 URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/
-URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/ru/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/ru/Thunderbird%20Setup%203.1.9.exe
 
 [Section.0422]
 Description = Найпопулярніший та один з кращиÑ
 поштовиÑ
 клієнтів.
 Size = 9.2M
 URLSite = http://www.mozillamessaging.com/uk/thunderbird/
-URLDownload = ftp://ftp.mozilla.org/pub/thunderbird/releases/3.1.9/win32/uk/Thunderbird%20Setup%203.1.9.exe
+URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.9/win32/uk/Thunderbird%20Setup%203.1.9.exe

Modified: branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -8,7 +8,7 @@
 Size = 5.9MB
 Category = 4
 URLSite = http://www.gnu.org/software/xboard/
-URLDownload = ftp://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe
+URLDownload = http://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe
 CDPath = none
 
 [Section.0407]

Modified: branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -16,13 +16,6 @@
 #ifdef _UNICODE
 # define streamout wstreamout
 # define format_float format_floatw
-# define _flsbuf _flswbuf
-int __cdecl _flswbuf(int ch, FILE *stream);
-#endif
-
-#ifdef _LIBCNT_
-# undef _flsbuf
-# define _flsbuf(chr, stream) _TEOF
 #endif
 
 #define MB_CUR_MAX 10
@@ -234,25 +227,19 @@
 int
 streamout_char(FILE *stream, int chr)
 {
+#if defined(_USER32_WSPRINTF) || defined(_LIBCNT_)
     /* Check if the buffer is full */
     if (stream->_cnt < sizeof(TCHAR))
-    {
-#ifdef _USER32_WSPRINTF
-        return _TEOF;
-#else
-        /* Strings are done now */
-        if (stream->_flag & _IOSTRG) return _TEOF;
-
-        /* Flush buffer for files */
-        return _flsbuf(chr, stream) != _TEOF;
-#endif
-    }
+        return 0;
 
     *(TCHAR*)stream->_ptr = chr;
     stream->_ptr += sizeof(TCHAR);
     stream->_cnt -= sizeof(TCHAR);
 
     return 1;
+#else
+    return _fputtc((TCHAR)chr, stream) != _TEOF;
+#endif
 }
 
 static

Modified: branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c?rev=51064&r1=51063&r2=51064&view=diff
==============================================================================
--- branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_13/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed Mar 16 14:08:30 2011
@@ -2175,12 +2175,33 @@
 /*********************************************************************
  *		fputwc (MSVCRT.@)
  */
-wint_t CDECL fputwc(wint_t wc, FILE* file)
-{
-  wchar_t mwc=wc;
-  if (fwrite( &mwc, sizeof(mwc), 1, file) != 1)
-    return WEOF;
-  return wc;
+wint_t CDECL fputwc(wchar_t c, FILE* stream)
+{
+    /* If this is a real file stream (and not some temporary one for
+       sprintf-like functions), check whether it is opened in text mode.
+       In this case, we have to perform an implicit conversion to ANSI. */
+    if (!(stream->_flag & _IOSTRG) && fdesc[stream->_file].wxflag & WX_TEXT)
+    {
+        /* Convert to multibyte in text mode */
+        char mbc[MB_LEN_MAX];
+        int mb_return;
+
+        mb_return = wctomb(mbc, c);
+
+        if(mb_return == -1)
+            return WEOF;
+
+        /* Output all characters */
+        if (fwrite(mbc, mb_return, 1, stream) != 1)
+            return WEOF;
+    }
+    else
+    {
+        if (fwrite(&c, sizeof(c), 1, stream) != 1)
+            return WEOF;
+    }
+
+    return c;
 }
 
 /*********************************************************************

More information about the Ros-diffs mailing list