Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[dgorbachev] 53970: Add Kazakh language to the registry. Patch by <seven_s*AT*mail*DOT*ru>. Bug #6277.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Oct 3 18:19:45 2011 New Revision: 53970 URL: http://svn.reactos.org/svn/reactos?rev=53970&view=rev Log: Add Kazakh language to the registry. Patch by <seven_s*AT*mail*DOT*ru>. Bug #6277. Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_amd64.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -456,6 +456,7 @@ HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","043F",0x00000000,"kk;Kazakh" HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" Modified: trunk/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_arm.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -460,6 +460,7 @@ HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","043F",0x00000000,"kk;Kazakh" HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -460,6 +460,7 @@ HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","043F",0x00000000,"kk;Kazakh" HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -788,7 +788,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0439",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","083e",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0441",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" @@ -900,7 +900,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000083e",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -544,7 +544,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0439",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","083e",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0441",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" @@ -656,7 +656,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000083e",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Oct 3 18:19:45 2011 @@ -881,7 +881,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0439",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043e",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","083e",0x00000000,"l_intl.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","043f",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0440",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0441",0x00000000,"l_intl.nls" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Language","0443",0x00000000,"l_intl.nls" @@ -993,7 +993,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000439",0x00000000,"f" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043e",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000083e",0x00000000,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","0000043f",0x00000000,"5" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000440",0x00000000,"5" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000441",0x00000000,"1" ;HKLM,"SYSTEM\CurrentControlSet\Control\Nls\Locale","00000443",0x00000000,"6"

13 years, 2 months

[dreimer] 53969: Bye rBuild. Here the new path to use this script with a cmake build.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Oct 3 18:11:43 2011 New Revision: 53969 URL: http://svn.reactos.org/svn/reactos?rev=53969&view=rev Log: Bye rBuild. Here the new path to use this script with a cmake build. Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat Modified: trunk/reactos/base/applications/rapps/CreateCabFile.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/Cr… ============================================================================== --- trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CreateCabFile.bat [iso-8859-1] Mon Oct 3 18:11:43 2011 @@ -1,1 +1,1 @@ -..\..\..\output-i386\tools\cabman\cabman.exe -M raw -S rappmgr.cab rapps\*.txt +..\..\..\output-MinGW-i386\host-tools\tools\cabman\cabman.exe -M raw -S rappmgr.cab rapps\*.txt

13 years, 2 months

[dreimer] 53968: A bunch of Italian Translation Updates by Yurij Vodkin. Version Updates. (FireFox, Thunderbird, Bittorrent, SeaMonkey, SumatraPDF)

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Oct 3 18:05:49 2011 New Revision: 53968 URL: http://svn.reactos.org/svn/reactos?rev=53968&view=rev Log: A bunch of Italian Translation Updates by Yurij Vodkin. Version Updates. (FireFox, Thunderbird, Bittorrent, SeaMonkey, SumatraPDF) Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Ãditeur de texte. +[Section.0410] +Description = Editor di testo. + [Section.0415] Description = Edytor tekstu. Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -2,15 +2,18 @@ [Section] Name = BitTorrent -Version = 7.2.1 +Version = 7.5 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. -Size = 394K +Size = 539K Category = 5 URLSite = http://www.bittorrent.com/ -URLDownload = http://download.bittorrent.com/dl/BitTorrent-7.2.1.exe +URLDownload = http://download.bittorrent.com/dl/BitTorrent-7.5.exe CDPath = none [Section.0407] Licence = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Der Original BitTorrent Client. + +[Section.0410] +Description = L'originale Client BitTorrent Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Diablo 2 Shareware. zeckensack's glide wrapper est requis pour le faire tourner. +[Section.0410] +Description = Diablo 2 Shareware. zeckensack's glide wrappe Ã¨ richiesto per avviarlo. + [Section.0415] Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. 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] Mon Oct 3 18:05:49 2011 @@ -2,59 +2,59 @@ [Section] Name = Mozilla Firefox 3.6 -Version = 3.6.22 +Version = 3.6.23 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 8.2M +Size = 8.3M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/en-US/Firefox… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/de/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/es-ES/Firefox… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/fr/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 8.0M +Size = 8.1M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/nb-NO/Firefox… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 8.9M +Size = 9.0M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/pl/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 8.4M +Size = 8.5M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/ru/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 8,5MB +Size = 8.5MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/sk/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 8.4M +Size = 8.5M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/3.6.22/win32/uk/Firefox%20… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -1,60 +1,60 @@ -; UTF-8 +ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 5 -Version = 5.0.1 +Name = Mozilla Firefox 7 +Version = 7.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 13.1M +Size = 13.4M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/en-US/Firefox%… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 12.9M +Size = 13.2M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/de/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. -Size = 12.9M +Size = 13.2M URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/es-ES/Firefox%… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/es… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. -Size = 13.2M +Size = 13.5M URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/fr/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/fr… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. -Size = 12.9M +Size = 13.2M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/nb-NO/Firefox%… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/nb… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. -Size = 13.7M +Size = 14.0M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/pl/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/pl… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². -Size = 13.3M +Size = 13.6M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/ru/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/ru… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. -Size = 13.6MB +Size = 13.9MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/sk/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/sk… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². -Size = 13.3M +Size = 13.6M URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://mozilla.cdn.leaseweb.com/firefox/releases/5.0.1/win32/uk/Firefox%20S… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/7.0.1/win32/uk… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Compilateur BASIC open source. La syntaxe du BASIC est compatible avec le QBASIC. +[Section.0410] +Description = Compilatore BASIC open source. La sintassi del BASIC Ã¨ compatibile con il QBASIC. + [Section.0415] Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = KDE pour Windows. +[Section.0410] +Description = KDE per Windows. + [Section.0415] Description = KDE dla Windows. 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] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Le client le plus populaire pour l'Internet Relay Chat (IRC). +[Section.0410] +Description = Il famoso client per Internet Relay Chat (IRC). + [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc6.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc6.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Le client le plus populaire pour l'Internet Relay Chat (IRC). +[Section.0410] +Description = Il famoso client per Internet Relay Chat (IRC). + [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -23,6 +23,9 @@ [Section.040c] Description = Le populaire navigateur Opera avec beaucoup de fonctionnalitÃ©s avancÃ©es, incluant un client mail et BitTorrent. +[Section.0410] +Description = Il famoso browser Opera con features avanzate come un client BitTorrent integrato e la gestione delle Mail. + [Section.0415] Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/putty.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Un client SSH, Telnet, rlogin et raw TCP gratuit. +[Section.0410] +Description = Un client SSH, Telnet, rlogin, and raw TCP gratuito. + [Section.0415] Description = Darmowy klient obsÅugujÄcy protokoÅy SSH, Telnet, rlogin oraz bezpoÅrednie TCP. Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -23,6 +23,9 @@ [Section.040c] Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instruction, reportez-vous au wiki ReactOS. +[Section.0410] +Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS. + [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Sam and Max, Day of the Tentacle, etc sur ReactOS. +[Section.0410] +Description = Sam and Max, Day of the Tentacle, etc su ReactOS. + [Section.0415] Description = Program pozwalajÄcy uruchomiÄ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -23,6 +23,9 @@ [Section.040c] Description = NÃ©cessaire pour faire tourner certains jeux open source. Vous aurez besoin de 7-Zip ou d'un outil similaire pour l'extraire. +[Section.0410] +Description = Necessario per il corretto funzionamento di alcuni giochi OpenSource. Necessita di 7-zip o utility simili per essere estratto. + [Section.0415] Description = Biblioteka wymagana przez niektÃ³re gry (zwÅaszcza te o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest 7-Zip lub podobny program. Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -23,6 +23,9 @@ Name = BibliothÃ¨que Simple Direct Media Layer (SDL) Description = NÃ©cessaire pour faire tourner certains jeux open source. Vous aurez besoin de 7-Zip ou d'un outil similaire pour l'extraire. +[Section.0410] +Description = Necessario per il corretto funzionamento di alcuni giochi OpenSource. Necessita di 7-zip o utility simili per essere estratto. + [Section.0415] Name = Biblioteka uruchomieniowa Simple Direct Media Layer (SDL) Description = Wymagana przez wiele gier (gÅÃ³wnie o otwartym ÅºrÃ³dle). Do jej rozpakowania potrzebny jest program 7-Zip lub podobny. 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] Mon Oct 3 18:05:49 2011 @@ -2,41 +2,41 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.3.3 +Version = 2.4.1 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 = 16.3MB +Size = 16.4MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.3.3/win32/en-US/SeaMonkey… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.4.1/win32/en-US/SeaMonkey… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 16.3MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 16.4MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… [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 = 16.2MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 16.3MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… [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 = 16.6MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 16.7MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 17.2MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 17.3MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 16.7MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 16.8MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 16.7MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.3.3/win32/… +Size = 16.8MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.4.1/win32/… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -2,13 +2,13 @@ [Section] Name = SumatraPDF -Version = 1.7 +Version = 1.8 Licence = GPLv3 Description = Sumatra PDF is a slim, free, open-source PDF reader. Portable out of the box. -Size = 4.4MB +Size = 4.5MB Category = 6 URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader.html -URLDownload = http://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-1.7-install.exe +URLDownload = http://kjkpub.s3.amazonaws.com/sumatrapdf/rel/SumatraPDF-1.8-install.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -23,6 +23,9 @@ Licence = Inconnue Description = Package pour la police Tahoma, nÃ©cessaire pour certaines applications (Steam). +[Section.0410] +Description = Il font pack Tahoma Ã¨ richiesto da alcune applicazioni (Steam). Contiene: Tahoma.tff, Tahomabd.ttf. + [Section.0415] Description = Pakiet Czcionki Tahoma wymagany przez niektÃ³re programy (np. Steam). 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] Mon Oct 3 18:05:49 2011 @@ -2,47 +2,47 @@ [Section] Name = Mozilla Thunderbird -Version = 3.1.14 +Version = 3.1.15 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 9.1M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 9.0M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 9.0M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 9.0M URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.8M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.4M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 9.4M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/win… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.15/win… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -1,48 +1,48 @@ -; UTF-8 +ï»¿; UTF-8 [Section] Name = Mozilla Thunderbird 5 -Version = 5.0 +Version = 7.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 13.4M +Size = 13.8M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 13.3M +Size = 13.7M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. -Size = 13.2M +Size = 13.6M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. -Size = 13.5M +Size = 13.9M URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. -Size = 14.1M +Size = 14.5M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 13.7M +Size = 14.1M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². -Size = 13.7M +Size = 14.1M URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/5.0/win32/… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/7.0.1/win3… Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Mon Oct 3 18:05:49 2011 @@ -20,6 +20,9 @@ [Section.040c] Description = Un lecteur media. +[Section.0410] +Description = Un lettore multimediale. + [Section.0415] Description = Odtwarzacz multimediÃ³w.

13 years, 2 months

[tkreuzer] 53967: [FREELDR] - Clean up some headers - Add DPRINT_HEAP debug channel mask - Make ExAllocatePool a function instead of a macro - Add a cleanup function to the new heap code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Oct 3 18:03:18 2011 New Revision: 53967 URL: http://svn.reactos.org/svn/reactos?rev=53967&view=rev Log: [FREELDR] - Clean up some headers - Add DPRINT_HEAP debug channel mask - Make ExAllocatePool a function instead of a macro - Add a cleanup function to the new heap code Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -1,4 +1,28 @@ #ifndef __ASM__ + +typedef enum +{ + BiosMemoryUsable=1, + BiosMemoryReserved, + BiosMemoryAcpiReclaim, + BiosMemoryAcpiNvs +} BIOS_MEMORY_TYPE; + +typedef struct +{ + ULONGLONG BaseAddress; + ULONGLONG Length; + ULONG Type; + ULONG Reserved; +} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; + +/* FIXME: Should be moved to NDK, and respective ACPI header files */ +typedef struct _ACPI_BIOS_DATA +{ + PHYSICAL_ADDRESS RSDTAddress; + ULONGLONG Count; + BIOS_MEMORY_MAP MemoryMap[1]; /* Count of BIOS memory map entries */ +} ACPI_BIOS_DATA, *PACPI_BIOS_DATA; #include <pshpack1.h> typedef struct Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -20,21 +20,23 @@ #ifndef __DEBUG_H #define __DEBUG_H +// OR this with DebugPrintMask to enable ... #define DPRINT_NONE 0x00000000 // No debug print -#define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff -#define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages -#define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages -#define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages -#define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages -#define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages -#define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages -#define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages -#define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages -#define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages -#define DPRINT_HWDETECT 0x00000400 // OR this with DebugPrintMask to enable hardware detection messages -#define DPRINT_WINDOWS 0x00000800 // OR this with DebugPrintMask to enable messages from Windows loader -#define DPRINT_PELOADER 0x00001000 // OR this with DebugPrintMask to enable messages from PE images loader -#define DPRINT_SCSIPORT 0x00002000 // OR this with DebugPrintMask to enable messages from SCSI miniport +#define DPRINT_WARNING 0x00000001 // debugger messages and other misc stuff +#define DPRINT_MEMORY 0x00000002 // memory management messages +#define DPRINT_FILESYSTEM 0x00000004 // file system messages +#define DPRINT_INIFILE 0x00000008 // .ini file messages +#define DPRINT_UI 0x00000010 // user interface messages +#define DPRINT_DISK 0x00000020 // disk messages +#define DPRINT_CACHE 0x00000040 // cache messages +#define DPRINT_REGISTRY 0x00000080 // registry messages +#define DPRINT_REACTOS 0x00000100 // ReactOS messages +#define DPRINT_LINUX 0x00000200 // Linux messages +#define DPRINT_HWDETECT 0x00000400 // hardware detection messages +#define DPRINT_WINDOWS 0x00000800 // messages from Windows loader +#define DPRINT_PELOADER 0x00001000 // messages from PE images loader +#define DPRINT_SCSIPORT 0x00002000 // messages from SCSI miniport +#define DPRINT_HEAP 0x00004000 // messages in a bottle #if DBG && !defined(_M_ARM) Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -96,9 +96,9 @@ /* arch specific includes */ #if defined(_M_IX86) || defined(_M_AMD64) #include <arch/pc/hardware.h> +#include <arch/pc/pcbios.h> #include <arch/pc/machpc.h> #include <arch/pc/x86common.h> -#include <arch/pc/pcbios.h> #include <arch/pc/pxe.h> #endif #if defined(_M_IX86) Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -19,14 +19,6 @@ #pragma once -typedef enum -{ - BiosMemoryUsable=1, - BiosMemoryReserved, - BiosMemoryAcpiReclaim, - BiosMemoryAcpiNvs -} BIOS_MEMORY_TYPE; - typedef struct _FREELDR_MEMORY_DESCRIPTOR { TYPE_OF_MEMORY MemoryType; @@ -34,15 +26,6 @@ PFN_NUMBER PageCount; } FREELDR_MEMORY_DESCRIPTOR, *PFREELDR_MEMORY_DESCRIPTOR; -#include <pshpack1.h> -typedef struct -{ - ULONGLONG BaseAddress; - ULONGLONG Length; - ULONG Type; - ULONG Reserved; -} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; -#include <poppack.h> #if defined(__i386__) || defined(_PPC_) || defined(_MIPS_) || defined(_ARM_) @@ -88,12 +71,10 @@ // #define DUMP_MEM_MAP_ON_VERIFY 0 - - -extern PVOID PageLookupTableAddress; -extern ULONG TotalPagesInLookupTable; -extern ULONG FreePagesInLookupTable; -extern ULONG LastFreePageHint; +extern PVOID PageLookupTableAddress; +extern ULONG TotalPagesInLookupTable; +extern ULONG FreePagesInLookupTable; +extern ULONG LastFreePageHint; #if DBG PCSTR MmGetSystemMemoryMapTypeString(TYPE_OF_MEMORY Type); @@ -127,6 +108,35 @@ PVOID MmHeapAlloc(SIZE_T MemorySize); VOID MmHeapFree(PVOID MemoryPointer); -#define ExAllocatePool(pool, size) MmHeapAlloc(size) -#define ExAllocatePoolWithTag(pool, size, tag) MmHeapAlloc(size) -#define ExFreePool(p) MmHeapFree(p) +/* Heap */ +extern PVOID FrLdrDefaultHeap; +extern PVOID FrLdrTempHeap; + +PVOID +HeapCreate( + ULONG MaximumSize, + TYPE_OF_MEMORY MemoryType); + +VOID +HeapDestroy( + PVOID HeapHandle); + +VOID +HeapRelease( + PVOID HeapHandle); + +VOID +HeapCleanupAll(VOID); + +PVOID +HeapAllocate( + PVOID HeapHandle, + SIZE_T ByteSize, + ULONG Tag); + +VOID +HeapFree( + PVOID HeapHandle, + PVOID Pointer, + ULONG Tag); + Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -32,14 +32,6 @@ // Descriptors #define NUM_GDT 128 // Must be 128 #define NUM_IDT 0x100 // only 16 are used though. Must be 0x100 - -/* FIXME: Should be moved to NDK, and respective ACPI header files */ -typedef struct _ACPI_BIOS_DATA -{ - PHYSICAL_ADDRESS RSDTAddress; - ULONGLONG Count; - BIOS_MEMORY_MAP MemoryMap[1]; /* Count of BIOS memory map entries */ -} ACPI_BIOS_DATA, *PACPI_BIOS_DATA; #include <pshpack1.h> typedef struct /* Root System Descriptor Pointer */ Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -88,6 +88,14 @@ } +PVOID +NTAPI +ExAllocatePool( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes) +{ + return MmHeapAlloc(NumberOfBytes); +} #undef ExAllocatePoolWithTag PVOID Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Mon Oct 3 18:03:18 2011 @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 2011 Timo Kreuzer (timo.kreuzer(a)reactos.orh) + * Copyright (C) 2011 Timo Kreuzer (timo.kreuzer(a)reactos.org) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,9 @@ DBG_DEFAULT_CHANNEL(HEAP); +#define DEFAULT_HEAP_SIZE (1024 * 1024) +#define TEMP_HEAP_SIZE (1024 * 1024) + PVOID FrLdrDefaultHeap; PVOID FrLdrTempHeap; @@ -173,6 +176,32 @@ TRACE("HeapRelease() done, freed %ld pages\n", AllFreePages); } +VOID +HeapCleanupAll(VOID) +{ + PHEAP Heap; + + Heap = FrLdrDefaultHeap; + TRACE("Heap statistics for default heap:\n" + "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" + "NumAllocs=%ld, NumFrees=%ld\n", + Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, + Heap->NumAllocs, Heap->NumFrees); + + /* Release fre pages */ + HeapRelease(FrLdrDefaultHeap); + + Heap = FrLdrTempHeap; + TRACE("Heap statistics for temp heap:\n" + "CurrentAlloc=0x%lx, MaxAlloc=0x%lx, LargestAllocation=0x%lx\n" + "NumAllocs=%ld, NumFrees=%ld\n", + Heap->CurrentAllocBytes, Heap->MaxAllocBytes, Heap->LargestAllocation, + Heap->NumAllocs, Heap->NumFrees); + + /* Destroy the heap */ + HeapDestroy(FrLdrTempHeap); +} + PVOID HeapAllocate( PVOID HeapHandle, @@ -328,22 +357,21 @@ /* Wrapper functions *********************************************************/ -#define HEAP_SIZE_PROCESS_HEAP (1024 * 1024) - VOID MmInitializeHeap(PVOID PageLookupTable) { TRACE("MmInitializeHeap()\n"); - /* Create the process heap */ - FrLdrDefaultHeap = HeapCreate(HEAP_SIZE_PROCESS_HEAP, LoaderOsloaderHeap); - - /* Create the process heap */ - FrLdrTempHeap = HeapCreate(HEAP_SIZE_PROCESS_HEAP, LoaderFirmwareTemporary); - - /* Create the pool heap */ - TRACE("MmInitializeHeap() done\n"); - + /* Create the default heap */ + FrLdrDefaultHeap = HeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap); + ASSERT(FrLdrDefaultHeap); + + /* Create a temporary heap */ + FrLdrTempHeap = HeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary); + ASSERT(FrLdrTempHeap); + + TRACE("MmInitializeHeap() done, default heap %p, temp heap %p\n", + FrLdrDefaultHeap, FrLdrTempHeap); } PVOID @@ -370,6 +398,15 @@ return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); } +PVOID +NTAPI +ExAllocatePool( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes) +{ + return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); +} + #undef ExFreePool VOID NTAPI

13 years, 2 months

[akhaldi] 53966: [KERNEL32_WINETEST] * Sync with Wine 1.3.29.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 17:58:01 2011 New Revision: 53966 URL: http://svn.reactos.org/svn/reactos?rev=53966&view=rev Log: [KERNEL32_WINETEST] * Sync with Wine 1.3.29. Modified: trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/atom.c trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/comm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/directory.c trunk/rostests/winetests/kernel32/drive.c trunk/rostests/winetests/kernel32/environ.c trunk/rostests/winetests/kernel32/fiber.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/mailslot.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/resource.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/toolhelp.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c trunk/rostests/winetests/kernel32/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/atom.c… Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Modified: trunk/rostests/winetests/kernel32/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/comm.c… Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugg… Modified: trunk/rostests/winetests/kernel32/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/direct… Modified: trunk/rostests/winetests/kernel32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/drive.… Modified: trunk/rostests/winetests/kernel32/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/enviro… Modified: trunk/rostests/winetests/kernel32/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/fiber.… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/mailsl… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… Modified: trunk/rostests/winetests/kernel32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/toolhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/toolhe… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua… Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume…

13 years, 2 months

[ekohl] 53965: [SETUPAPI] - Implement CM_Get_DevNode_Custom_Property[_Ex]A/W. - Fix the return value of CM_Open_Class_Key_ExA. - Handle REG_MULTI_SZ values properly in CM_Get_DevNode_Registry_Prope...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Oct 3 16:38:46 2011 New Revision: 53965 URL: http://svn.reactos.org/svn/reactos?rev=53965&view=rev Log: [SETUPAPI] - Implement CM_Get_DevNode_Custom_Property[_Ex]A/W. - Fix the return value of CM_Open_Class_Key_ExA. - Handle REG_MULTI_SZ values properly in CM_Get_DevNode_Registry_Property_ExA. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon Oct 3 16:38:46 2011 @@ -1735,6 +1735,194 @@ /*********************************************************************** + * CM_Get_DevNode_Custom_PropertyA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_DevNode_Custom_PropertyA( + DEVINST dnDevInst, PCSTR pszCustomPropertyName, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%lx %s %p %p %p %lx\n", dnDevInst, pszCustomPropertyName, + pulRegDataType, Buffer, pulLength, ulFlags); + return CM_Get_DevNode_Custom_Property_ExA(dnDevInst, pszCustomPropertyName, + pulRegDataType, Buffer, + pulLength, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_DevNode_Custom_PropertyW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_DevNode_Custom_PropertyW( + DEVINST dnDevInst, PCWSTR pszCustomPropertyName, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%lx %s %p %p %p %lx\n", dnDevInst, debugstr_w(pszCustomPropertyName), + pulRegDataType, Buffer, pulLength, ulFlags); + return CM_Get_DevNode_Custom_Property_ExW(dnDevInst, pszCustomPropertyName, + pulRegDataType, Buffer, + pulLength, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Get_DevNode_Custom_Property_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_DevNode_Custom_Property_ExA( + DEVINST dnDevInst, PCSTR pszCustomPropertyName, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + LPWSTR pszPropertyNameW = NULL; + PVOID BufferW; + ULONG ulLengthW; + ULONG ulDataType = REG_NONE; + CONFIGRET ret; + + TRACE("%lx %s %p %p %p %lx %p\n", dnDevInst, pszCustomPropertyName, + pulRegDataType, Buffer, pulLength, ulFlags, hMachine); + + if (!pulLength) + return CR_INVALID_POINTER; + + ulLengthW = *pulLength * sizeof(WCHAR); + BufferW = HeapAlloc(GetProcessHeap(), 0, ulLengthW); + if (!BufferW) + return CR_OUT_OF_MEMORY; + + pszPropertyNameW = pSetupMultiByteToUnicode(pszCustomPropertyName, + CP_ACP); + if (pszPropertyNameW == NULL) + { + HeapFree(GetProcessHeap(), 0, BufferW); + return CR_OUT_OF_MEMORY; + } + + ret = CM_Get_DevNode_Custom_Property_ExW(dnDevInst, + pszPropertyNameW, + &ulDataType, + BufferW, + &ulLengthW, + ulFlags, + hMachine); + if (ret == CR_SUCCESS) + { + if (ulDataType == REG_SZ || + ulDataType == REG_EXPAND_SZ || + ulDataType == REG_MULTI_SZ) + { + /* Do W->A conversion */ + *pulLength = WideCharToMultiByte(CP_ACP, + 0, + BufferW, + lstrlenW(BufferW) + 1, + Buffer, + *pulLength, + NULL, + NULL); + if (*pulLength == 0) + ret = CR_FAILURE; + } + else + { + /* Directly copy the value */ + if (ulLengthW <= *pulLength) + memcpy(Buffer, BufferW, ulLengthW); + else + { + *pulLength = ulLengthW; + ret = CR_BUFFER_SMALL; + } + } + } + + if (pulRegDataType) + *pulRegDataType = ulDataType; + + HeapFree(GetProcessHeap(), 0, BufferW); + MyFree(pszPropertyNameW); + + return ret; +} + + +/*********************************************************************** + * CM_Get_DevNode_Custom_Property_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_DevNode_Custom_Property_ExW( + DEVINST dnDevInst, PCWSTR pszCustomPropertyName, PULONG pulRegDataType, + PVOID Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + ULONG ulDataType = REG_NONE; + ULONG ulTransferLength; + CONFIGRET ret = CR_SUCCESS; + + TRACE("%lx %s %p %p %p %lx %p\n", dnDevInst, + debugstr_w(pszCustomPropertyName), pulRegDataType, Buffer, + pulLength, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (pszCustomPropertyName == NULL || + pulLength == NULL || + *pulLength == 0) + return CR_INVALID_POINTER; + + if (ulFlags & ~CM_CUSTOMDEVPROP_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ulTransferLength = *pulLength; + + RpcTryExcept + { + ret = PNP_GetCustomDevProp(BindingHandle, + lpDevInst, + (LPWSTR)pszCustomPropertyName, + &ulDataType, + Buffer, + &ulTransferLength, + pulLength, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + if (ret == CR_SUCCESS) + { + if (pulRegDataType != NULL) + *pulRegDataType = ulDataType; + } + + return ret; +} + + +/*********************************************************************** * CM_Get_DevNode_Registry_PropertyA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA( @@ -1775,7 +1963,7 @@ { PVOID BufferW; ULONG LengthW; - ULONG RegDataType = REG_NONE; + ULONG ulDataType = REG_NONE; CONFIGRET ret; TRACE("%lx %lu %p %p %p %lx %lx\n", @@ -1793,7 +1981,7 @@ ret = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, ulProperty, - &RegDataType, + &ulDataType, BufferW, &LengthW, ulFlags, @@ -1801,7 +1989,9 @@ if (ret == CR_SUCCESS) { - if (RegDataType == REG_SZ || RegDataType == REG_EXPAND_SZ) + if (ulDataType == REG_SZ || + ulDataType == REG_EXPAND_SZ || + ulDataType == REG_MULTI_SZ) { /* Do W->A conversion */ *pulLength = WideCharToMultiByte(CP_ACP, @@ -1829,7 +2019,7 @@ } if (pulRegDataType) - *pulRegDataType = RegDataType; + *pulRegDataType = ulDataType; HeapFree(GetProcessHeap(), 0, BufferW); @@ -1848,7 +2038,7 @@ HSTRING_TABLE StringTable = NULL; CONFIGRET ret = CR_SUCCESS; LPWSTR lpDevInst; - ULONG ulDataType = 0; + ULONG ulDataType = REG_NONE; ULONG ulTransferLength = 0; TRACE("%lx %lu %p %p %p %lx %lx\n", @@ -3973,6 +4163,7 @@ HMACHINE hMachine) { LPWSTR pszClassNameW = NULL; + CONFIGRET ret; TRACE("%p %s %lx %lx %p %lx %lx\n", debugstr_guid(pClassGuid), pszClassName, @@ -3984,13 +4175,13 @@ return CR_INVALID_DATA; } - CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired, - Disposition, phkClass, ulFlags, hMachine); + ret = CM_Open_Class_Key_ExW(pClassGuid, pszClassNameW, samDesired, + Disposition, phkClass, ulFlags, hMachine); if (pszClassNameW != NULL) MyFree(pszClassNameW); - return CR_SUCCESS; + return ret; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon Oct 3 16:38:46 2011 @@ -66,10 +66,10 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr ptr long ptr) @ stdcall CM_Get_Depth(ptr long long) @ stdcall CM_Get_Depth_Ex(ptr long long long) -@ stub CM_Get_DevNode_Custom_PropertyA -@ stub CM_Get_DevNode_Custom_PropertyW -@ stub CM_Get_DevNode_Custom_Property_ExA -@ stub CM_Get_DevNode_Custom_Property_ExW +@ stdcall CM_Get_DevNode_Custom_PropertyA(long str ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Custom_PropertyW(long wstr ptr ptr ptr long) +@ stdcall CM_Get_DevNode_Custom_Property_ExA(long str ptr ptr ptr long ptr) +@ stdcall CM_Get_DevNode_Custom_Property_ExW(long wstr ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long long)

13 years, 2 months

[akhaldi] 53964: [IPHLPAPI_WINETEST] * Sync with Wine 1.3.29.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 16:17:33 2011 New Revision: 53964 URL: http://svn.reactos.org/svn/reactos?rev=53964&view=rev Log: [IPHLPAPI_WINETEST] * Sync with Wine 1.3.29. Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpa… ============================================================================== --- trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] Mon Oct 3 16:17:33 2011 @@ -74,6 +74,8 @@ typedef DWORD (WINAPI *GetUdpTableFunc)(PMIB_UDPTABLE,PDWORD,BOOL); typedef DWORD (WINAPI *GetPerAdapterInfoFunc)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); typedef DWORD (WINAPI *GetAdaptersAddressesFunc)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +typedef DWORD (WINAPI *NotifyAddrChangeFunc)(PHANDLE,LPOVERLAPPED); +typedef BOOL (WINAPI *CancelIPChangeNotifyFunc)(LPOVERLAPPED); static GetNumberOfInterfacesFunc gGetNumberOfInterfaces = NULL; static GetIpAddrTableFunc gGetIpAddrTable = NULL; @@ -93,6 +95,8 @@ static GetUdpTableFunc gGetUdpTable = NULL; static GetPerAdapterInfoFunc gGetPerAdapterInfo = NULL; static GetAdaptersAddressesFunc gGetAdaptersAddresses = NULL; +static NotifyAddrChangeFunc gNotifyAddrChange = NULL; +static CancelIPChangeNotifyFunc gCancelIPChangeNotify = NULL; static void loadIPHlpApi(void) { @@ -132,6 +136,10 @@ hLibrary, "GetUdpTable"); gGetPerAdapterInfo = (GetPerAdapterInfoFunc)GetProcAddress(hLibrary, "GetPerAdapterInfo"); gGetAdaptersAddresses = (GetAdaptersAddressesFunc)GetProcAddress(hLibrary, "GetAdaptersAddresses"); + gNotifyAddrChange = (NotifyAddrChangeFunc)GetProcAddress( + hLibrary, "NotifyAddrChange"); + gCancelIPChangeNotify = (CancelIPChangeNotifyFunc)GetProcAddress( + hLibrary, "CancelIPChangeNotify"); } } @@ -154,6 +162,8 @@ gGetUdpStatistics = NULL; gGetTcpTable = NULL; gGetUdpTable = NULL; + gNotifyAddrChange = NULL; + gCancelIPChangeNotify = NULL; FreeLibrary(hLibrary); hLibrary = NULL; } @@ -184,7 +194,7 @@ /* Crashes on Vista */ if (0) { - apiReturn = gGetNumberOfInterfaces(NULL), numInterfaces; + apiReturn = gGetNumberOfInterfaces(NULL); if (apiReturn == ERROR_NOT_SUPPORTED) return; ok(apiReturn == ERROR_INVALID_PARAMETER, @@ -806,6 +816,78 @@ HeapFree( GetProcessHeap(), 0, buffer ); } +static void testNotifyAddrChange(void) +{ + DWORD ret, bytes; + OVERLAPPED overlapped; + HANDLE handle; + BOOL success; + + if (!gNotifyAddrChange) + { + win_skip("NotifyAddrChange not present\n"); + return; + } + if (!gCancelIPChangeNotify) + { + win_skip("CancelIPChangeNotify not present\n"); + return; + } + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + ret = gNotifyAddrChange(&handle, &overlapped); + if (ret == ERROR_NOT_SUPPORTED) + { + win_skip("NotifyAddrChange is not supported\n"); + return; + } + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + ret = GetLastError(); + todo_wine ok(ret == ERROR_IO_PENDING, "GetLastError returned %d, expected ERROR_IO_PENDING\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + ZeroMemory(&overlapped, sizeof(overlapped)); + success = gCancelIPChangeNotify(&overlapped); + ok(success == FALSE, "CancelIPChangeNotify returned TRUE, expected FALSE\n"); + + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); + todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); + success = GetOverlappedResult(handle, &overlapped, &bytes, FALSE); + ok(success == FALSE, "GetOverlappedResult returned TRUE, expected FALSE\n"); + ret = GetLastError(); + ok(ret == ERROR_IO_INCOMPLETE, "GetLastError returned %d, expected ERROR_IO_INCOMPLETE\n", ret); + success = gCancelIPChangeNotify(&overlapped); + todo_wine ok(success == TRUE, "CancelIPChangeNotify returned FALSE, expected TRUE\n"); + + if (winetest_interactive) + { + handle = NULL; + ZeroMemory(&overlapped, sizeof(overlapped)); + overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + trace("Testing asynchronous ipv4 address change notification. Please " + "change the ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(&handle, &overlapped); + ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + success = GetOverlappedResult(handle, &overlapped, &bytes, TRUE); + ok(success == TRUE, "GetOverlappedResult returned FALSE, expected TRUE\n"); + } + + /* test synchronous functionality */ + if (winetest_interactive) + { + trace("Testing synchronous ipv4 address change notification. Please " + "change the ipv4 address of one of your network interfaces\n"); + ret = gNotifyAddrChange(NULL, NULL); + todo_wine ok(ret == NO_ERROR, "NotifyAddrChange returned %d, expected NO_ERROR\n", ret); + } +} + /* still-to-be-tested 2K-onward functions: AddIPAddress @@ -815,20 +897,20 @@ EnableRouter FlushIpNetTable GetAdapterIndex -NotifyAddrChange -NotifyRouteChange +NotifyRouteChange + CancelIPChangeNotify SendARP UnenableRouter */ static void testWin2KFunctions(void) { testGetPerAdapterInfo(); + testNotifyAddrChange(); } static void test_GetAdaptersAddresses(void) { ULONG ret, size; - IP_ADAPTER_ADDRESSES *aa; + IP_ADAPTER_ADDRESSES *aa, *ptr; IP_ADAPTER_UNICAST_ADDRESS *ua; if (!gGetAdaptersAddresses) @@ -840,17 +922,25 @@ ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got %u\n", ret); - size = 0; + /* size should be ignored and overwritten if buffer is NULL */ + size = 0x7fffffff; ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size); ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; - aa = HeapAlloc(GetProcessHeap(), 0, size); - ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, aa, &size); + ptr = HeapAlloc(GetProcessHeap(), 0, size); + ret = gGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); - while (!ret && winetest_debug > 1 && aa) - { + for (aa = ptr; !ret && aa; aa = aa->Next) + { + ok(aa->DnsSuffix != NULL, "DnsSuffix is not a valid pointer\n"); + ok(aa->Description != NULL, "Description is not a valid pointer\n"); + ok(aa->FriendlyName != NULL, "FriendlyName is not a valid pointer\n"); + + if (winetest_debug <= 1) + continue; + trace("Length: %u\n", S(U(*aa)).Length); trace("IfIndex: %u\n", S(U(*aa)).IfIndex); trace("Next: %p\n", aa->Next); @@ -886,9 +976,8 @@ trace("IfType: %u\n", aa->IfType); trace("OperStatus: %u\n", aa->OperStatus); trace("\n"); - aa = aa->Next; - } - HeapFree(GetProcessHeap(), 0, aa); + } + HeapFree(GetProcessHeap(), 0, ptr); } START_TEST(iphlpapi)

13 years, 2 months

[akhaldi] 53963: [BROWSEUI_WINETEST] * Sync with Wine 1.3.29.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 16:04:23 2011 New Revision: 53963 URL: http://svn.reactos.org/svn/reactos?rev=53963&view=rev Log: [BROWSEUI_WINETEST] * Sync with Wine 1.3.29. Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Mon Oct 3 16:04:23 2011 @@ -55,8 +55,8 @@ typedef struct { - IEnumStringVtbl *vtbl; - IACListVtbl *aclVtbl; + IEnumString IEnumString_iface; + IACList IACList_iface; LONG ref; HRESULT expret; INT expcount; @@ -68,17 +68,22 @@ extern IEnumStringVtbl TestACLVtbl; extern IACListVtbl TestACL_ACListVtbl; +static inline TestACL *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, TestACL, IEnumString_iface); +} + static TestACL *impl_from_IACList(IACList *iface) { - return (TestACL *)((char *)iface - FIELD_OFFSET(TestACL, aclVtbl)); + return CONTAINING_RECORD(iface, TestACL, IACList_iface); } static TestACL *TestACL_Constructor(int limit, const char **strings) { TestACL *This = CoTaskMemAlloc(sizeof(TestACL)); ZeroMemory(This, sizeof(*This)); - This->vtbl = &TestACLVtbl; - This->aclVtbl = &TestACL_ACListVtbl; + This->IEnumString_iface.lpVtbl = &TestACLVtbl; + This->IACList_iface.lpVtbl = &TestACL_ACListVtbl; This->ref = 1; This->expret = S_OK; This->limit = limit; @@ -88,14 +93,14 @@ static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); trace("ACL(%p): addref (%d)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); ULONG res; res = InterlockedDecrement(&This->ref); @@ -105,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); *ppvOut = NULL; if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumString)) { @@ -113,7 +118,7 @@ } else if (IsEqualGUID(iid, &IID_IACList)) { - *ppvOut = &This->aclVtbl; + *ppvOut = &This->IACList_iface; } if (*ppvOut) @@ -131,7 +136,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); ULONG i; trace("ACL(%p): read %d item(s)\n", This, celt); @@ -164,7 +169,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); trace("ACL(%p): Reset\n", This); This->pos = 0; return S_OK; @@ -173,7 +178,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) { TestACL *This = impl_from_IACList(iface); - trace("ACL(%p): Expand\n", impl_from_IACList(iface)); + trace("ACL(%p): Expand\n", This); This->expcount++; return This->expret; } @@ -192,17 +197,20 @@ static ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) { - return TestACL_AddRef((IEnumString *)impl_from_IACList(iface)); + TestACL *This = impl_from_IACList(iface); + return TestACL_AddRef(&This->IEnumString_iface); } static ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) { - return TestACL_Release((IEnumString *)impl_from_IACList(iface)); + TestACL *This = impl_from_IACList(iface); + return TestACL_Release(&This->IEnumString_iface); } static HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) { - return TestACL_QueryInterface((IEnumString *)impl_from_IACList(iface), iid, ppvout); + TestACL *This = impl_from_IACList(iface); + return TestACL_QueryInterface(&This->IEnumString_iface, iid, ppvout); } IACListVtbl TestACL_ACListVtbl = @@ -259,8 +267,8 @@ acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl1)); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl2)); + stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl1->IACList_iface)); + stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl2->IACList_iface)); ok(mgr->lpVtbl->Append(mgr, NULL) == E_FAIL, "Unexpected return from Append\n"); expect_str(obj, "a"); expect_str(obj, "c"); @@ -307,7 +315,7 @@ acl2->expret = E_FAIL; ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n"); - stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)acl1)); + stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)&acl1->IACList_iface)); ok(acl1->ref == 1, "acl1 not released\n"); expect_end(obj); obj->lpVtbl->Reset(obj);

13 years, 2 months

[tfaber] 53962: [MSAFD] - Correctly handle an arbitrarily large sockaddr in WSPConnect. Fixes mIRC 7.1x crash on connect See issue #6005 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 3 15:23:51 2011 New Revision: 53962 URL: http://svn.reactos.org/svn/reactos?rev=53962&view=rev Log: [MSAFD] - Correctly handle an arbitrarily large sockaddr in WSPConnect. Fixes mIRC 7.1x crash on connect See issue #6005 for more details. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Oct 3 15:23:51 2011 @@ -1431,16 +1431,16 @@ LPINT lpErrno) { IO_STATUS_BLOCK IOSB; - PAFD_CONNECT_INFO ConnectInfo; - PSOCKET_INFORMATION Socket = NULL; + PAFD_CONNECT_INFO ConnectInfo = NULL; + PSOCKET_INFORMATION Socket; NTSTATUS Status; INT Errno; - UCHAR ConnectBuffer[0x22]; ULONG ConnectDataLength; ULONG InConnectDataLength; INT BindAddressLength; PSOCKADDR BindAddress; HANDLE SockEvent; + int SocketDataLength; Status = NtCreateEvent(&SockEvent, GENERIC_READ | GENERIC_WRITE, @@ -1506,16 +1506,26 @@ goto notify; } - /* Dynamic Structure...ugh */ - ConnectInfo = (PAFD_CONNECT_INFO)ConnectBuffer; + /* Calculate the size of SocketAddress->sa_data */ + SocketDataLength = SocketAddressLength - FIELD_OFFSET(struct sockaddr, sa_data); + + /* Allocate a connection info buffer with SocketDataLength bytes of payload */ + ConnectInfo = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(AFD_CONNECT_INFO, + RemoteAddress.Address[0].Address[SocketDataLength])); + if (!ConnectInfo) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto notify; + } /* Set up Address in TDI Format */ ConnectInfo->RemoteAddress.TAAddressCount = 1; - ConnectInfo->RemoteAddress.Address[0].AddressLength = SocketAddressLength - sizeof(SocketAddress->sa_family); + ConnectInfo->RemoteAddress.Address[0].AddressLength = SocketDataLength; ConnectInfo->RemoteAddress.Address[0].AddressType = SocketAddress->sa_family; - RtlCopyMemory (ConnectInfo->RemoteAddress.Address[0].Address, - SocketAddress->sa_data, - SocketAddressLength - sizeof(SocketAddress->sa_family)); + RtlCopyMemory(ConnectInfo->RemoteAddress.Address[0].Address, + SocketAddress->sa_data, + SocketDataLength); /* * Disable FD_WRITE and FD_CONNECT @@ -1613,6 +1623,8 @@ AFD_DbgPrint(MID_TRACE,("Ending\n")); notify: + if (ConnectInfo) HeapFree(GetProcessHeap(), 0, ConnectInfo); + /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_WRITE);

13 years, 2 months

[akhaldi] 53961: [ADVAPI32_WINETEST] * Sync with Wine 1.3.29.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 3 15:18:15 2011 New Revision: 53961 URL: http://svn.reactos.org/svn/reactos?rev=53961&view=rev Log: [ADVAPI32_WINETEST] * Sync with Wine 1.3.29. Modified: trunk/rostests/winetests/advapi32/cred.c trunk/rostests/winetests/advapi32/crypt.c trunk/rostests/winetests/advapi32/crypt_lmhash.c trunk/rostests/winetests/advapi32/crypt_md4.c trunk/rostests/winetests/advapi32/crypt_md5.c trunk/rostests/winetests/advapi32/eventlog.c trunk/rostests/winetests/advapi32/lsa.c trunk/rostests/winetests/advapi32/registry.c trunk/rostests/winetests/advapi32/security.c trunk/rostests/winetests/advapi32/service.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/advapi32/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/cred.c… Modified: trunk/rostests/winetests/advapi32/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt.… Modified: trunk/rostests/winetests/advapi32/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/crypt_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/crypt_… Modified: trunk/rostests/winetests/advapi32/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/eventl… Modified: trunk/rostests/winetests/advapi32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/lsa.c?… Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic…

13 years, 2 months

← Newer
1
...
29
30
31
32
33
34
35
36
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2011