Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[osiejka] 56266: [TRANSLATION] - romanian rapps translation update (including INF update) by Stefan Fulea (bug no. 6878); - italian translation update by Paolo Devoti (bug no. 6980);

by osiejka＠svn.reactos.org

Author: osiejka Date: Wed Mar 28 22:09:00 2012 New Revision: 56266 URL: http://svn.reactos.org/svn/reactos?rev=56266&view=rev Log: [TRANSLATION] - romanian rapps translation update (including INF update) by Stefan Fulea (bug no. 6878); - italian translation update by Paolo Devoti (bug no. 6980); Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/abiword28x.txt trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/audiograbber.txt trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosblaster.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt trunk/reactos/base/applications/rapps/rapps/lgeneral.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/lmarbles.txt trunk/reactos/base/applications/rapps/rapps/mfc40.txt trunk/reactos/base/applications/rapps/rapps/mingw.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/mirc6.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.txt trunk/reactos/base/applications/rapps/rapps/msxml3.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/putty.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/python3.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/sambatng.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/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/smplayer.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/superfinder.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/tileworld.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = NarzÄdzie do tworzenia i otwierania plikÃ³w typu 7zip, zip, tar, i innych plikÃ³w archiwizacyjnych. +[Section.0418] +Description = Utilitar pentru crearea Èi deschiderea arhivelor 7zip, zip, tar, rar Èi altele. +Size = 1.06Mo + [Section.0422] Description = Ð£ÑÐ¸Ð»ÑÑÐ° Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ ÑÐ° Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ 7zip, zip, tar, rar ÑÐ° ÑÐ½ÑÐ¸Ñ Ð°ÑÑÑÐ²Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ². 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Edytor tekstu. +[Section.0418] +Description = Procesor de text. +Size = 5.64Mo + [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword28x.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword28x.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Edytor tekstu. +[Section.0418] +Description = Procesor de text. +Size = 9.33Mo + [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -25,5 +25,9 @@ MoÅ¼e takÅ¼e uruchamiaÄ zaawansowane aplikacje internetowe takie jak PHP, Perl, Python, ASP, ASP.NET, i Ruby on Rails. MogÄ one zostaÄ oparte o MySQL, SQLite, MS SQL Server, MS Access, lub Oracle. +[Section.0418] +Description = Abyss Web Server vÄ permite gÄzduirea de pagini Web pe calculatorul dumneavoastrÄ. OferÄ conexiuni securizate SSL/TLS (HTTPS) Èi multe alte tehnologii Web. Poate executa aplicaÈii Web avansate ]n PHP, Perl, Python, ASP, ASP.NET Èi Ruby on Rails, ce pot fi susÈinute de baze de date ca MySQL, SQLite, MS SQL Server, MS Access, sau Oracle. +Size = 1.82Mo + [Section.0422] Description = Abyss Web Server Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð²Ð°Ð¼ ÑÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¸ Ð½Ð° Ð²Ð°ÑÐ¾Ð¼Ñ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÑ. ÐÑÐ´ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ Ð±ÐµÐ·Ð¿ÐµÑÐ½Ñ SSL/TLS Ð·'ÑÐ´Ð½Ð°Ð½Ð½Ñ (HTTPS) ÑÐ° Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹ ÑÑÐ´ Ð²ÐµÐ±-ÑÐµÑÐ½Ð¾Ð»Ð¾Ð³ÑÐ¹. ÐÑÐ½ ÑÐ°ÐºÐ¾Ð¶ Ð·Ð°Ð¿ÑÑÐºÐ°Ñ PHP, Perl, Python, ASP, ASP.NET, ÑÐ° Ruby on Rails Ð²ÐµÐ±-Ð´Ð¾Ð´Ð°ÑÐºÐ¸, ÑÐºÑ Ð¼Ð¾Ð¶ÑÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ÑÑ ÑÐ°ÐºÐ¸Ð¼Ð¸ Ð±Ð°Ð·Ð°Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ñ, ÑÐº MySQL, SQLite, MS SQL Server, MS Access, ÑÐ¸ Oracle. Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -41,6 +41,13 @@ Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. URLSite = Nieznana +[Section.0418] +Name = Modul pilot AC97 pentru VirtualBox +Licence = NespecificatÄ +Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. +Size = 185.5ko +URLSite = NespecificatÄ + [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ AC97 Ð´Ð»Ñ VirtualBox Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Modified: trunk/reactos/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/audiograbber.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Bardzo dobry CD Ripper/konwerter plikÃ³w audio. +[Section.0418] +Description = Program de extragere conÈinuturi CD audio Èi de conversie a fiÈierelor de sunet. +Size = 3.57Mo + [Section.0422] Description = Ð§ÑÐ´Ð¾Ð²Ð¸Ð¹ CD Ð ÑÐ¿Ð¿ÐµÑ/ÐÐ¾Ð½Ð²ÐµÑÑÐµÑ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². 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] Wed Mar 28 22:09:00 2012 @@ -5,7 +5,7 @@ Version = 7.6.1 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. -Size = 5.78M +Size = 5.78MB Category = 5 URLSite = http://www.bittorrent.com/ URLDownload = http://download.bittorrent.com/dl/BitTorrent-7.6.1.exe @@ -17,3 +17,8 @@ [Section.0410] Description = L'originale Client BitTorrent + +[Section.0418] +Licence = GratuitÄ pentru uz necomercial +Description = Originalul client BitTorrent. +Size = 5.4Mo Modified: trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/comctl32ocx.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Microsoft Visual Basic 6.0 Common Controls jest uÅ¼ywany przez czÄÅÄ aplikacji. +[Section.0418] +Licence = NespecificatÄ +Description = Modul logic necesar unor aplicaÈii. ConÈine: comctl32.ocx, mscomctl.ocx, advpack.dll. +Size = 913.73ko + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = Ð¤Ð°Ð¹Ð» Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ Ð´ÐµÐºÐ¾ÑÑÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼. 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. +[Section.0418] +Description = Diablo 2 Shareware. Pentru execuÈie este necesar (pachetul) zeckensack's glide wrapper. +Size = 131.9Mo + [Section.0422] Description = Diablo 2 Shareware. ÐÐ»Ñ Ð·Ð°Ð¿ÑÑÐºÑ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ zeckensack's glide wrapper. Modified: trunk/reactos/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosblaster.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = DosBlaster to rozszerzenie powÅoki, ktÃ³re umoÅ¼liwia otwarcie kaÅ¼dego DOS-owego pliku wykonywalnego w DOSBox za pomocÄ prawego klawisza myszki. Ta wersja zawiera DosBox 0.70, ale moÅ¼na go Åatwo zaktualizowaÄ, instalujÄc nowszÄ wersje DOSBox do folderÃ³w DosBlaster. +[Section.0418] +Description = DosBlaster este o extensie de interfaÈare ce oferÄ posibilitatea deschiderii unui executabil DOS Ã®n aplicaÈia DOSBox prin clic dreapta. AceastÄ versiune conÈine DOSBox 0.70, Ã®nsÄ poate fi actualizatÄ instalÃ¢nd Ã®n dosarele DosBlaster o versiune mai nouÄ de DOSBox. +Size = 2.05Mo + [Section.0422] Description = DosBlaster ÑÐµ ÑÐ¾Ð·ÑÐ¸ÑÐµÐ½Ð½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÐ¸, ÑÐºÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð±ÑÐ´Ñ-ÑÐºÐ¸Ð¹ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð²ÑÐ¸Ð¹ ÑÐ°Ð¹Ð» DOS Ð² DOSBox ÑÐµÑÐµÐ· Ð¿ÑÐ°Ð²Ð¸Ð¹ ÐºÐ»ÑÐº. Ð¦Ñ Ð²ÐµÑÑÑÑ Ð¼ÑÑÑÐ¸ÑÑ DOSBox 0.70, Ð°Ð»Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð° Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¼ Ð½Ð¾Ð²ÑÑÐ¾Ñ Ð²ÐµÑÑÑÑ DOSBox Ð² ÑÐµÐºÐ¸ DosBlaster. Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = DOSBox - emulator DOSa. +[Section.0418] +Description = DOSBox este un emulator DOS. +Size = 1.38Mo + [Section.0422] Description = DOSBox - ÐµÐ¼ÑÐ»ÑÑÐ¾Ñ DOSÑ. Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/doublecommander.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -14,6 +14,10 @@ [Section.0415] Description = Double Commander to menedÅ¼er plikÃ³w, o otwartym ÅºrÃ³dle, z klasycznym ukÅadem dwÃ³ch paneli obok siebie. Do rozpakowania archiwum potrzebny jest 7-zip lub podobny program. +[Section.0418] +Description = Double Commander este un gestionar (open-source) de fiÈiere, cu douÄ panouri alÄturate. Este necesar 7-Zip sau un utilitar similar de dezarhivare pentru a-l putea extrage. +Size = 6.5Mo + [Section.0419] Description = Double Commander - ÑÑÐ¾ Ð¾ÑÐºÑÑÑÑÐ¹ Ð´Ð²ÑÑÐ¿Ð°Ð½ÐµÐ»ÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð»Ð¾Ð²ÑÐ¹ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ. ÐÐ°Ð¼ Ð½ÑÐ¶ÐµÐ½ 7-Zip Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð°Ñ ÑÑÐ¸Ð»Ð¸ÑÐ° Ð´Ð»Ñ ÐµÐ³Ð¾ ÑÐ°ÑÐ¿Ð°ÐºÐ¾Ð²ÐºÐ¸. Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Prosty i lekki odtwarzacz audio. +[Section.0418] +Description = Un lector audio simplu Èi uÈor. +Size = 1.86Mo + [Section.0422] Description = ÐÑÐ¾ÑÑÐ¸Ð¹ ÑÐ° Ð¼Ð°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð²Ð°Ñ Ð°ÑÐ´ÑÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -35,6 +35,11 @@ Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. URLSite = http://www.mozilla-europe.org/pl/ +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. +Size = 5.77Mo +URLSite = http://www.mozilla-europe.org/ro/ + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². URLSite = http://www.mozilla-europe.org/ru/ Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -40,6 +40,11 @@ Size = 7.9M URLSite = http://www.mozilla-europe.org/pl/ +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. +Size = 7.16Mo +URLSite = http://www.mozilla-europe.org/ro/ + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.8M 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] Wed Mar 28 22:09:00 2012 @@ -41,6 +41,12 @@ URLSite = http://www.mozilla-europe.org/pl/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. +Size = 8.46Mo +URLSite = http://www.mozilla-europe.org/ro/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-3.6/win… + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 8.46MB 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] Wed Mar 28 22:09:00 2012 @@ -41,6 +41,12 @@ URLSite = http://www.mozilla-europe.org/pl/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/pl/… +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. +Size = 15.7Mo +URLSite = http://www.mozilla-europe.org/ro/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/11.0/win32/ro/… + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 15.33MB 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. +[Section.0419] +Description = Compilator (open-source) BASIC. Sintaxa BASIC este compatibilÄ cu QBASIC. +Size = 6.0Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ BASIC. Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÐ¼ÑÑÐ½Ð¸Ð¹ Ð· QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/glidewrapzbag.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,10 @@ [Section.0415] Description = glidewrapper jest potrzebny do uruchomienia Diablo2 w ReactOS-ie. +[Section.0418] +Licence = GratuitÄ +Description = Glide wrapper, necesar pentru a executa Diablo 2 Ã®n ReactOS. +Size = 249.02ko + [Section.0422] Description = glidewrapper Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¸Ð¹ Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÑ Diablo2 Ð² ReactOS. Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Freeware (dla uÅ¼ytku domowego) Description = PrzeglÄdarka dla bardzo wielu typÃ³w obrazÃ³w, plikÃ³w audio oraz wideo. +[Section.0418] +Licence = GratuitÄ (pentru uz personal) +Description = Lector pentru multiple formate de fiÈiere grafice/audio/video. +Size = 1.46Mo + [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) Description = ÐÐµÑÐµÐ³Ð»ÑÐ´Ð°Ñ Ð´Ð»Ñ Ð²ÑÑÑ Ð²Ð¸Ð´ÑÐ² Ð³ÑÐ°ÑÑÑÐ½Ð¸Ñ ÑÐ° Ð°ÑÐ´ÑÐ¾/Ð²ÑÐ´ÐµÐ¾ ÑÐ°Ð¹Ð»ÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanviewplugins.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Freeware (dla uÅ¼ytku domowego) Description = Wtyczki otwierajÄce dodatkowe typy plikÃ³w w Irfanview. +[Section.0418] +Licence = GratuitÄ (pentru uz personal) +Description = Extensii adiÈionale pentru a spori numÄrul de formate de fiÈiere recunoscute. +Size = 8.92Mo + [Section.0422] Licence = Freeware (Ð´Ð»Ñ Ð´Ð¾Ð¼Ð°ÑÐ½ÑÐ¾Ð³Ð¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ) Description = ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð¿Ð»Ð°Ð³ÑÐ½Ð¸ Ð´Ð»Ñ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¸ Ð±ÑÐ»ÑÑÐ¾Ñ ÐºÑÐ»ÑÐºÐ¾ÑÑÑ ÑÐ°Ð¹Ð»Ð¾Ð²Ð¸Ñ ÑÐ¸Ð¿ÑÐ². 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = KDE dla Windows. +[Section.0418] +Description = KDE pentru Windows. +Size = 2.21Mo + [Section.0422] Description = KDE Ð´Ð»Ñ Windows. Modified: trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lbreakout2.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Klon Breakouta/Arkanoida napisany przy uÅ¼yciu biblioteki SDL. +[Section.0418] +Description = RamificaÈie-clonÄ a bibliotecilor SDL. +Size = 3.03Mo + [Section.0422] Description = ÐÐ»Ð¾Ð½ Breakouta/Arkanoida, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lgeneral.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Klon gry Panzer General napisany przy uÅ¼yciu biblioteki SDL. +[Section.0418] +Description = ClonÄ Panzer General utilizÃ¢nd bibliotecile SDL. +Size = 1.92Mo + [Section.0422] Description = ÐÐ»Ð¾Ð½ Ð³ÑÐ¸ Panzer General, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Otwarty pakiet biurowy. +[Section.0418] +Description = Fostul OpenOffice. Suita de aplicaÈii de biroticÄ open-source. +Size = 201.6Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/lmarbles.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Klon gry Atomix, uÅ¼ywajÄcy biblioteki SDL. +[Section.0418] +Description = Clona Atomix utilizÃ¢nd bibliotecile SDL. +Size = 1.39Mo + [Section.0422] Description = ÐÐ»Ð¾Ð½ Ð³ÑÐ¸ Atomix, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ SDL. Modified: trunk/reactos/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mfc40.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -31,6 +31,11 @@ Licence = Nieznana Description = Biblioteka MFC 4 jest uÅ¼ywana przez czÄÅÄ aplikacji. +[Section.0418] +Licence = NespecificatÄ +Description = MFC 4 este necesarÄ unor aplicaÈii. ConÈine: mfc40.dll, msvcrt40.dll. +Size = 865.04ko + [Section.0422] Name = ÐÐµÑÐµÐ³Ð»ÑÐ´Ð°Ñ OLE ÑÐ° MFC (Microsoft Foundation Classes) Ð²ÐµÑÑÑÑ 4 Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Modified: trunk/reactos/base/applications/rapps/rapps/mingw.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mingw.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -5,7 +5,7 @@ Version = 20111118 Licence = Public domain/GPL Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = 578kb +Size = 578kB Category = 7 URLSite = http://mingw.org/ URLDownload = http://garr.dl.sourceforge.net/project/mingw/Installer/mingw-get-inst/mingw… @@ -23,5 +23,10 @@ [Section.0415] Description = Kompilator GCC dla platformy Windows wraz z dodatkowymi narzÄdziami (GDB, make, itd.). +[Section.0418] +Licence = Domeniu public/GPL +Description = O portare a colecÈiei de instrumente GNU: GCC, GDB, GNU make, etc. +Size = 578ko + [Section.0422] Description = ÐÐ¾Ð¼Ð¿ÑÐ»ÑÑÐ¾Ñ GCC Ð´Ð»Ñ Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð¸ Windows Ð· Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÐ°Ð¼Ð¸ GDB, GNU make, ÑÐ° ÑÐ½. Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Otwarty komunikator internetowy, obsÅugujÄcy wiele rÃ³Å¼nych protokoÅÃ³w (m.in. GG, Tlen, Jabber, ICQ, IRC) - moÅ¼e nie dziaÅaÄ prawidÅowo. +[Section.0418] +Description = AplicaÈie de mesagerie instant multiprotocol (open-source) - posibil cu limitÄri Ã®n funcÈionalitate. +Size = 3.1Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ° Ð¼ÑÐ»ÑÑÐ¸Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»ÑÐ½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð¼Ð¸ÑÑÑÐ²Ð¸Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ - Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð¿ÑÐ°ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð¾Ð²Ð½ÑÑÑÑ. 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,10 @@ [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). +[Section.0418] +Licence = Versiune de evaluare +Description = Cel mai popular client de IRC (Internet Relay Chat). +Size = 1.82Mo + [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,10 @@ [Section.0415] Description = Najpopularniejszy klient IRC (Internet Relay Chat). +[Section.0418] +Licence = Versiune de evaluare +Description = Cel mai popular client de IRC (Internet Relay Chat). +Size = 1.67Mo + [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -20,5 +20,10 @@ [Section.0415] Description = Pakiet Mono .net Framework dla ProgramistÃ³w. +[Section.0418] +Licence = NespecificatÄ +Description = PlatformÄ .net (open-source). +Size = 79.47Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ .net Ð¤ÑÐµÐ¹Ð¼Ð²Ð¾ÑÐº. Modified: trunk/reactos/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mpc.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -20,6 +20,10 @@ [Section.040c] Description = Un lecteur media. +[Section.0418] +Description = Lector multimedia. +Size = 5.57Mo + [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/msxml3.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = NiektÃ³re spoÅrÃ³d plikÃ³w instalacyjnych MSI potrzebujÄ parsera MSXML3. +[Section.0418] +Licence = NespecificatÄ +Description = MSXML3 este necesar unor Instalatori MSI. ConÈine: msxml3.dll, msxml3a.dll, msxml3r.dll. +Size = 1.85Mo + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = MSXML3 Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ Ð´ÐµÐºÐ¾ÑÑÐ¸Ñ MSI ÑÐ½ÑÑÐ°Ð»ÑÑÐ¾ÑÑÐ². Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -19,3 +19,8 @@ [Section.0415] Description = Microsoft .NET Framework Wersja 1.1 - Pakiet Dystrybucyjny. + +[Section.0418] +Licence = NespecificatÄ +Description = Platforma Microsoft .NET versiunea 1.1 - Pachet redistributabl. +Size = 23.14Mo Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -19,3 +19,8 @@ [Section.0415] Description = Microsoft .NET Framework Wersja 2.0 - Pakiet Dystrybucyjny. + +[Section.0418] +Licence = NespecificatÄ +Description = Platforma Microsoft .NET versiunea 2.0 - Pachet redistributabl. +Size = 22.42Mo Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -19,3 +19,8 @@ [Section.0415] Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2. + +[Section.0418] +Licence = NespecificatÄ +Description = Platforma Microsoft .NET versiunea 2.0 - Service Pack 2 +Size = 23.84Mo Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,10 @@ [Section.0415] Description = Bardzo maÅa i szybka przeglÄdarka internetowa z peÅnÄ obsÅugÄ HTML 3.2. +[Section.0418] +Licence = GratuitÄ +Description = Un navigator web foarte mic Èi rapid compatibil cu HTML 3.2. +Size = 0.98Mo + [Section.0422] Description = ÐÑÐ¶Ðµ Ð¼Ð°Ð»Ð¸Ð¹ ÑÐ° ÑÐ²Ð¸Ð´ÐºÐ¸Ð¹ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑ Ð· Ð¿Ð¾Ð²Ð½Ð¾Ñ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÐºÐ¾Ñ HTML 3.2. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -36,6 +36,10 @@ URLDownload = http://archive.services.openoffice.org/pub/openoffice-archive/localized/pl/… Size = 113.92MB +[Section.0418] +Description = Suita de aplicaÈii de biroticÄ open-source. +Size = 113Mo + [Section.0422] URLSite = http://ua.openoffice.org/ Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -36,6 +36,10 @@ URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.3.0/OOo_3.3.0_Win_x86_ins… [Section.0422] +Description = Suita de aplicaÈii de biroticÄ open-source. +Size = 136.79Mo + +[Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. URLSite = http://ua.openoffice.org/ Size = 132.82MB Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Otwarty klon silnika gry "Transport Tycoon Deluxe". Do poprawnego dziaÅania potrzebna jest kopia gry Transport Tycoon. +[Section.0418] +Description = Clona (open-source a) motorului de joc "Transport Tycoon Deluxe". Este necesarÄ o copie a jocului Transport Tycoon. +Size = 4.13Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ ÐºÐ»Ð¾Ð½ Ð´Ð²Ð¸Ð³ÑÐ½Ð° Ð³ÑÐ¸ "Transport Tycoon Deluxe". ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð° ÐºÐ¾Ð¿ÑÑ Ð³ÑÐ¸ Transport Tycoon. 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] Wed Mar 28 22:09:00 2012 @@ -29,6 +29,11 @@ [Section.0415] Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. +[Section.0418] +Licence = GratuitÄ +Description = Navigatorul popular Opera cu multe funcÈionalitÄÈi avansate incluzÃ¢nd poÈtÄ electronicÄ Èi un client de BitTorrent. +Size = 10.13Mo + [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,6 +23,11 @@ [Section.0415] Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. +[Section.0418] +Licence = GratuitÄ +Description = Navigatorul popular Opera cu multe funcÈionalitÄÈi avansate incluzÃ¢nd poÈtÄ electronicÄ Èi un client de BitTorrent. +Size = 7.21Mo + [Section.0419] Description = ÐÐ¾Ð¿ÑÐ»ÑÑÐ½ÑÐ¹ Ð±ÑÐ°ÑÐ·ÐµÑ ÑÐ¾ Ð¼Ð½Ð¾Ð³Ð¸Ð¼Ð¸ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐ¼Ð¸ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÐ¼Ð¸, Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸Ð¹ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð² Ð¿Ð¾ÑÑÑ Ð¸ 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] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Darmowy klient obsÅugujÄcy protokoÅy SSH, Telnet, rlogin oraz bezpoÅrednie TCP. +[Section.0418] +Description = Un client gratuit de SSH, Telnet, rlogin, and TCP brut. +Size = 1.76Mo + [Section.0422] Description = ÐÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ SSH, Telnet, rlogin ÑÐ° raw TCP ÐºÐ»ÑÑÐ½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = PotÄÅ¼y i dynamiczny jÄzyk programowania. +[Section.0418] +Description = Un limbaj de programare dinamic Èi puternic. +Size = 15.23Mo + [Section.0422] Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/python3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python3.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = PotÄÅ¼y i dynamiczny jÄzyk programowania. +[Section.0418] +Description = Un limbaj de programare dinamic Èi puternic. +Size = 17.2Mo + [Section.0422] Description = ÐÑÐ¶Ðµ Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð´Ð¸Ð½Ð°Ð¼ÑÑÐ½Ð° Ð¼Ð¾Ð²Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ÑÐ²Ð°Ð½Ð½Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Å¹rÃ³dÅowy port Doom. Jego celem jest zapewnienie rozrywki znanej z klasycznej wersji z nowymi funkcjami i lepszÄ stabilnoÅciÄ. +[Section.0418] +Description = ReMooD este o portare a codului Doom Legacy. Scopul e de a oferi clasica experienÈÄ cu noi funcÈionalitÄÈi Èi o mai bunÄ stabilitate. +Size = 1.15Mo + [Section.0422] Description = ReMooD Ñ ÐÐ¾ÑÑÐ¾Ð¼ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ² Doom Legacy. ÐÐ¾Ð³Ð¾ Ð¼ÐµÑÐ¾Ñ Ñ Ð´Ð¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÑÐ° ÑÑÐ°Ð±ÑÐ»ÑÐ½ÑÑÑÑ Ð´Ð¾ Ð´Ð¾ÑÐ²ÑÐ´Ñ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ð¾Ð³Ð¾ Legacy. 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] Wed Mar 28 22:09:00 2012 @@ -29,5 +29,9 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. +[Section.0418] +Description = Permite compilarea surselor ReactOS. Pentru instrucÈiuni, consultaÈi wiki ReactOS. +Size = 17.8Mo + [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS AMD64 ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. +[Section.0418] +Description = Permite compilarea surselor ReactOS pentru AMD64. Pentru instrucÈiuni, consultaÈi wiki ReactOS. +Size = 15.83Mo + [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS AMD64 Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ARM ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. +[Section.0418] +Description = Permite compilarea surselor ReactOS pentru ARM. Pentru instrucÈiuni, consultaÈi wiki ReactOS. +Size = 11.15Mo + [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS ARM Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ. Modified: trunk/reactos/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sambatng.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = NarzÄdzie pozwalajÄce na dostÄp z poziomu ReactOSa do wspÃ³Ådzielonych folderÃ³w/drukarek Windows. +[Section.0418] +Description = Acest instrument permite accesarea Ã®n ReactOS a dosarelor/imprimantelor partajate din Windows. +Size = 2.13Mo + [Section.0422] Description = Ð¦ÐµÐ¹ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ñ ÑÐµÐº/Ð¿ÑÐ¸Ð½ÑÐµÑÑÐ² Windows Ð· ReactOSÐ°. Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -41,6 +41,11 @@ Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. URLSite = Nieznana +[Section.0418] +Licence = NespecificatÄ +Description = DezarhivaÈi Ã®n dosarul âReactOSâ apoi reporniÈi ReactOS de douÄ ori. +Size = 2.22Mo + [Section.0419] Name = ÐÑÐ°Ð¹Ð²ÐµÑ SoundBlaster Ð´Ð»Ñ VMWare Licence = ÐÐµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -5,7 +5,7 @@ Version = 3.0.4 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 666KB +Size = 677kB Category = 7 URLSite = http://www.scintilla.org/ URLDownload = http://dfn.dl.sourceforge.net/project/scintilla/SciTE/3.0.4/Sc304.exe @@ -23,5 +23,10 @@ [Section.0415] Description = SciTE to edytor tekstu bazowany na SCIntilla. Oryginalnie stworzony aby pokazaÄ Scintille, staÅ sie ogÃ³lnie przydatnym edytorem z infrastrukturÄ potrzebnÄ do tworzenia i uruchamiania programÃ³w. +[Section.0418] +Licence = GratuitÄ +Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. +Size = 677ko + [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Program pozwalajÄcy uruchomiÄ stare gry przygodowe (Sam and Max, Day of the Tentacle, Monkey Island) w ReactOS. +[Section.0418] +Description = Motor de execuÈie pentru jocuri SCUMM. +Size = 5.28Mo + [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÑ Ð³ÑÐ°ÑÐ¸ Sam and Max, Day of the Tentacle ÑÐ° ÑÐ½ÑÑ ÐºÐ»Ð°ÑÐ¸ÑÐ½Ñ ÑÐ³ÑÐ¸ Ð² 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] Wed Mar 28 22:09:00 2012 @@ -29,5 +29,9 @@ [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. +[Section.0418] +Description = Necesar pentru execuÈia unor jocuri (open-source). DezarhivaÈi cu 7-Zip sau cu un utilitar asemÄnÄtor. +Size = 548.02ko + [Section.0422] Description = ÐÐµÐ¾Ð±ÑÑÐ´Ð½Ð¸Ð¹ Ð´Ð»Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð´ÐµÐºÐ¾ÑÑÐ¸Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ ÑÐ³Ð¾Ñ. ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ 7-Zip Ð°Ð±Ð¾ Ð¿Ð¾Ð´ÑÐ±Ð½Ð° ÑÑÐ¸Ð»ÑÑÐ° ÑÐ¾Ð± ÑÐ¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸ Ð¹Ð¾Ð³Ð¾. 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] Wed Mar 28 22:09:00 2012 @@ -30,6 +30,10 @@ 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. +[Section.0418] +Description = Necesar pentru execuÈia multor jocuri (open-source). DezarhivaÈi cu 7-Zip sau cu un utilitar asemÄnÄtor. +Size = 136.67ko + [Section.0422] Name = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ° Simple Direct Media Layer (SDL) Description = ÐÐµÐ¾Ð±ÑÑÐ´Ð½Ð° Ð´Ð»Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ Ð±Ð°Ð³Ð°ÑÑÐ¾Ñ Ð²ÑÐ´ÐºÑÐ¸ÑÐ¸Ñ ÑÐ³Ð¾Ñ. ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ 7-Zip Ð°Ð±Ð¾ Ð¿Ð¾Ð´ÑÐ±Ð½Ð° ÑÑÐ¸Ð»ÑÑÐ° ÑÐ¾Ð± ÑÐ¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸ ÑÑ. 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] Wed Mar 28 22:09:00 2012 @@ -31,6 +31,10 @@ Size = 18.38MB URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.8/win32/pl/SeaMonkey%20Se… +[Section.0418] +Description = Suita Mozilla. Acest pachet ce Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. +Size = 17.59Mo + [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 18.01MB Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -25,6 +25,11 @@ URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=pl Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. +[Section.0418] +Description = Lector multimedia (interfaÈÄ pentru MPlayer). +Size = 15.1Mo +URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=ro + [Section.0422] URLSite = http://smplayer.sourceforge.net/index.php?tr_lang=uk Description = ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐ½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ). Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,11 @@ [Section.0415] Description = STEAM - platforma, ktÃ³rÄ uÅ¼ywa obecnie wiele gier. +[Section.0418] +Licence = GratuitÄ +Description = Platforma de joc STEAM, utilizatÄ de multe jocuri Ã®n zilele de astÄzi. +Size = 1.53Mo +URLSite = http://store.steampowered.com/?l=romanian + [Section.0422] Description = ÐÐ³ÑÐ¾Ð²Ð° Ð¿Ð»Ð°ÑÑÐ¾ÑÐ¼Ð°, ÑÐ¾ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ Ð±Ð°Ð³Ð°ÑÑÐ¼Ð° ÑÐ³ÑÐ°Ð¼Ð¸. 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] Wed Mar 28 22:09:00 2012 @@ -25,3 +25,8 @@ [Section.0415] Description = Sumatra PDF to maÅy, darmowy, otwarty czytnik PDF. + +[Section.0418] +Description = Lector PDF - uÈor, gratuit (open-source), Èi portabil. +Size = 4.48Mo +URLSite = http://blog.kowalczyk.info/software/sumatrapdf/free-pdf-reader-ro.html Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,10 @@ [Section.0415] Description = Szybka i bogata w opcje aplikacja szukajÄca. +[Section.0418] +Licence = GratuitÄ +Description = AplicaÈie rapidÄ de cÄutÄri complexe de text. +Size = 4.94Mo + [Section.0422] Description = Ð¨Ð²Ð¸Ð´ÐºÐ° ÑÐ° Ð¿Ð¾ÑÑÐ¶Ð½Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð¿Ð¾ÑÑÐºÑ. 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] Wed Mar 28 22:09:00 2012 @@ -29,6 +29,11 @@ [Section.0415] Description = Pakiet Czcionki Tahoma wymagany przez niektÃ³re programy (np. Steam). +[Section.0418] +Licence = NecunoscutÄ +Description = Pachetul Tahoma Font, necesar unor aplicaÈii (Steam). ConÈine: Tahoma.tff, Tahomabd.ttf. +Size = 305.12ko + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÐ°ÐºÐµÑ ÑÑÐ¸ÑÑÑÐ² Tahoma, ÑÐ¾ Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ñ Ð´ÐµÑÐºÐ¸Ð¼ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°Ð¼ (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] Wed Mar 28 22:09:00 2012 @@ -35,6 +35,12 @@ URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. +Size = 9.06Mo +URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.20/win… + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 9.29MB 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] Wed Mar 28 22:09:00 2012 @@ -35,6 +35,12 @@ URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… +[Section.0418] +Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. +Size = 16.5Mo +URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/11.0/win32… + [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 15.5MB Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Udany klon gry Chip's Challenge z Atari Lynx. Zawiera darmowy zestaw grafik CCLP2. +[Section.0418] +Description = ClonÄ a Chip's Challenge, creatÄ iniÈial pentru Atari Lynx. Include pachetul gratuit CCLP2 Graphics, deci nu este necesar Originalul cu drepturi de autor. +Size = 1.16Mo + [Section.0422] Description = Ð§ÑÐ´Ð¾Ð²Ð¸Ð¹ ÐºÐ»Ð¾Ð½ Ð³ÑÐ¸ Chip's Challenge Ð´Ð»Ñ Atari Lynx. ÐÐºÐ»ÑÑÐµÐ½Ð¾ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ð¹ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ CCLP2, ÑÐ¾Ð¼Ñ Ð²Ð°Ð¼ Ð½Ðµ Ð¿Ð¾ÑÑÑÐ±ÐµÐ½ Ð¾ÑÐ¸Ð³ÑÐ½Ð°Ð»ÑÐ½Ð¸Ð¹. Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -26,5 +26,9 @@ [Section.0415] Description = Otwarty program graficzny przeznaczony gÅÃ³wnie dla dzieci. +[Section.0418] +Description = Un editor grafic bitmap, adresat copiilor. +Size = 10.42Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð»Ñ Ð¼Ð°Ð»Ð¸Ñ Ð´ÑÑÐµÐ¹. Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -20,5 +20,9 @@ [Section.0415] Description = Otwarty klient/serwer VNC. +[Section.0418] +Description = Client/server VNC (open-source). +Size = 2.19Mo + [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ VNC ÐºÐ»ÑÑÐ½Ñ/ÑÐµÑÐ²ÐµÑ. Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -5,7 +5,7 @@ Version = 3.1.3 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 720.87KB +Size = 720.87kB Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download.utorrent.com/3.1.3/utorrent.exe @@ -28,6 +28,11 @@ Licence = Freeware (do uÅ¼ytku domowego) Description = MaÅy i szybki klient BitTorrent. +[Section.0418] +Licence = GratuitÄ pentru uz necomercial +Description = Client BitTorrent, mic Èi rapid. +Size = 720.87ko + [Section.0419] Licence = ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð°Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾Ð¼Ð¼ÐµÑÑÐµÑÐºÐ¾Ð³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Description = ÐÐ°Ð»ÐµÐ½ÑÐºÐ¸Ð¹ Ð¸ Ð±ÑÑÑÑÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 5. +[Section.0418] +Licence = NecunoscutÄ +Description = Visual Basic 5 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm50.dll, oleaut32.dll, olepro32.dll. +Size = 969.59ko + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 5. Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Basic 6. +[Section.0418] +Licence = NecunoscutÄ +Description = Visual Basic 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, comcat.dll, msvbvm60.dll, oleaut32.dll, olepro32.dll. +Size = 1.02Mo + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Basic 6. Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2005 SP1. +[Section.0418] +Licence = NecunoscutÄ +Description = Visual Studio 2005 Runtime SP1. ConÈine: atl80.dll, mfc80.dll, mfcm80.dll, mfcm80u.dll, msdia80.dll, msvcm80.dll, msvcp80.dll, msvcr80.dll, vcomp.dll. +Size = 2.6Mo + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2005 SP1. Modified: trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008sp1run.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 2008 SP1. +[Section.0418] +Licence = NecunoscutÄ +Description = Visual Studio 2008 SP1 Runtime. ConÈine: atl90.dll, mfc90.dll, mfc90u.dll, mfcm90.dll, mfcm90u.dll, msdia90.dll, msvcm90.dll, msvcp90.dll, msvcr90.dll, vcomp90.dll. +Size = 4.02Mo + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 2008 SP1. Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -27,6 +27,11 @@ Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 6. +[Section.0418] +Licence = NecunoscutÄ +Description = Visual Studio 6 Runtime. ConÈine: advpack.dll, asycfilt.dll, atla.dll, atlu.dll, comcat.dll, mfc42.dll, mfc42u.dll, msvcirt.dll, msvcp60.dll, msvcrt.dll, oleaut32.dll, olepro32.dll. +Size = 1.75Mo + [Section.0422] Licence = ÐÐµÐ²ÑÐ´Ð¾Ð¼Ð° Description = ÐÑÐ±Ð»ÑÐ¾ÑÐµÐºÐ¸ Visual Studio 6. 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] Wed Mar 28 22:09:00 2012 @@ -26,6 +26,10 @@ [Section.0415] Description = Odtwarzacz multimediÃ³w. +[Section.0418] +Description = Lector multimedia. +Size = 21.1Mo + [Section.0419] Description = ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½ÑÐ¹ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,5 +23,9 @@ [Section.0415] Description = Graficzna szachownica dla systemu Windows/ReactOS, ktÃ³ra moÅ¼e sÅuÅ¼yÄ jako graficzna nakÅadka dla GNU Chess, Crafty, lub innych programÃ³w szachowych (w tym internetowych serwerÃ³w szachowych) lub szachÃ³w korespondencyjnych. +[Section.0418] +Description = WinBoard este o tablÄ de Èah graficÄ pentru Windows/ReactOS ce poate servi ca interfaÈÄ pentru GNU Chess, Crafty, sau alte motoare de Èah, pentru servere de Èah din Internet, sau pentru corespondenÈÄ poÈtalÄ de Èah. +Size = 5.93Mo + [Section.0422] Description = ÐÑÐ°ÑÑÑÐ½Ð° ÑÐ°ÑÐ¼Ð°ÑÐ½Ð° Ð´Ð¾ÑÐºÐ° Ð´Ð»Ñ Windows/ReactOS, ÑÐ¾ Ð¼Ð¾Ð¶Ðµ ÑÐ»ÑÐ³ÑÐ²Ð°ÑÐ¸ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¼ ÑÐ½ÑÐµÑÑÐµÐ¹ÑÐ¾Ð¼ Ð´Ð»Ñ GNU Chess, Crafty, ÑÐ° ÑÐ½ÑÐ¸Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¸Ñ Ð´Ð²Ð¸Ð³ÑÐ½ÑÐ², Ð´Ð»Ñ ÑÐµÑÐ²ÐµÑÑÐ² ÑÐ½ÑÐµÑÐ½ÐµÑ-ÑÐ°ÑÐ¼Ð°Ñ ÑÐ° Ð´Ð»Ñ ÑÐ°ÑÐ¼Ð°ÑÐ½Ð¾Ñ Ð¿ÐµÑÐµÐ¿Ð¸ÑÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¼ÐµÐ¹Ð». Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -23,6 +23,10 @@ [Section.0415] Licence = Nieznana +[Section.0418] +Licence = NecunoscutÄ +Size = 9.46Mo + [Section.041b] Description = NeznÃ¡ma Modified: trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/it-IT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Italian resources for the Internet control panel applet * * Copyright 2010 Luca Bennati <lucak3(a)gmail.com @@ -40,11 +40,11 @@ PUSHBUTTON "Pagina &attuale", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "Pagina &predefinita", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "Pagina &vuota", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Storia navigazione ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "E' possibile cancellare le pagine in cache,i cookies e altri dati.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Cancella...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Impostazioni...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END @@ -65,13 +65,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" + IDS_CPL_NAME "Impostazioni Internet" + IDS_CPL_INFO "Configura Internet Browser e impostazioni corelate" + IDS_SEC_SETTINGS "Impostazioni di sicurezza per la zona: " + IDS_SEC_LEVEL0 "Personalizzato" + IDS_SEC_LEVEL1 "Molto basso" + IDS_SEC_LEVEL2 "Basso" + IDS_SEC_LEVEL3 "Medio" + IDS_SEC_LEVEL4 "Alto" + IDS_SEC_LEVEL5 "Molto alto" END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -114,9 +114,9 @@ CAPTION "Copy Profile" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "Da:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "A:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -1,4 +1,4 @@ -// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-10) +ï»¿// Italian language resource file (Paolo Devoti, devotip(a)tiscali.it, 2007-01-10) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL @@ -73,8 +73,8 @@ IDS_DEV_DISABLED_SERVICE "ReactOS non puÃ² installare i driver del dispositivo perchÃ¨ non Ã¨ possibile accedere al disco o alla rete dove si trovano i file di setup." IDS_DEV_TRANSLATION_FAILED "Il dispositivo non risponde ai suoi driver." IDS_DEV_NO_SOFTCONFIG "ReactOS non puÃ² individuare le impostazioni necessarie. Verificate la documentazione e usate il tab Risorse per impostare la configurazione." - IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." - IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma Ã¨ configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." + IDS_DEV_BIOS_TABLE "Il firmware di sistema del vostro con contiene sufficienti informazioni per configurare correttamente questo dispositivo. \nPer utilizzare questo dispositivo contattate il costruttore per richiedere un aggiornamento del firmware o del BIOS." + IDS_DEV_IRQ_TRANSLATION_FAILED "E' necessario un Interrupt PCI ma ne Ã¨ configurato uno ISA o viceversa. \nUsate il setup di sistema del computer per riconfigurare l'Interrupt." IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS non puÃ² inizializzare il driver di questo hardware." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS non puo' caricare il driver perchÃ¨ si trova in memoria una attivazione precedente." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS non puo' caricare il driver, potrebbe essere corrotto o assente." @@ -199,7 +199,7 @@ IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Details" +CAPTION "Dettagli" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -212,7 +212,7 @@ IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resources" +CAPTION "Risorse" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Mar 28 22:09:00 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Copyright 1998 Juergen Schmied * Copyright 2003-2004 Puoti * @@ -235,7 +235,7 @@ AUTOCHECKBOX "&Sola lettura", 14021, 56, 152, 70, 10 AUTOCHECKBOX "&Nascosto", 14022, 56, 166, 70, 10 AUTOCHECKBOX "&Archivio", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "A&vanzate...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -250,14 +250,14 @@ CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "Apri con:", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Modifica...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Posizione:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Dimensione:", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "Dimensione sul disco:", 140112, 8, 107, 55, 10 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Creato:", 14014, 8, 131, 45, 10 @@ -271,7 +271,7 @@ AUTOCHECKBOX "&Sola lettura", 14021, 58, 189, 67, 10 AUTOCHECKBOX "&Nascosto", 14022, 126, 189, 50, 10 AUTOCHECKBOX "&Archivio", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + PUSHBUTTON "A&vanzate...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -750,8 +750,8 @@ /* Open With */ IDS_OPEN_WITH "Apri con" IDS_OPEN_WITH_CHOOSE "Scegliere un programma..." - IDS_OPEN_WITH_RECOMMENDED "Recommended Programs:" - IDS_OPEN_WITH_OTHER "Other Programs:" + IDS_OPEN_WITH_RECOMMENDED "Programmi suggeriti:" + IDS_OPEN_WITH_OTHER "Altri Programmi:" IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< &Indietro" @@ -804,6 +804,6 @@ IDS_FILE_TYPES "Tipi di file" IDS_COLUMN_EXTENSION "Estensioni" IDS_BYTES_FORMAT "byte" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" -END + IDS_UNKNOWN_APP "Applicazione sconosciuta" + IDS_EXE_DESCRIPTION "Descrizione:" +END

12 years, 9 months

[tkreuzer] 56265: [NTOSKRNL] - ObReferenceObject() does NOT return an NTSTATUS. It returns the new reference count. Remove pointless NT_SUCCESS check - Enable interrupts in amd54 page fault handler...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 21:09:03 2012 New Revision: 56265 URL: http://svn.reactos.org/svn/reactos?rev=56265&view=rev Log: [NTOSKRNL] - ObReferenceObject() does NOT return an NTSTATUS. It returns the new reference count. Remove pointless NT_SUCCESS check - Enable interrupts in amd54 page fault handler before calling MmAccessFault - Add missing MmDecommittedPte for amd64 Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Wed Mar 28 21:09:03 2012 @@ -349,13 +349,7 @@ ExReleaseFastMutex(&RmapListLock); goto bail; } - Status = ObReferenceObject(Process); - if (!NT_SUCCESS(Status)) - { - DPRINT("bail\n"); - ExReleaseFastMutex(&RmapListLock); - goto bail; - } + ObReferenceObject(Process); ProcRef = TRUE; AddressSpace = &Process->Vm; } Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Wed Mar 28 21:09:03 2012 @@ -416,6 +416,9 @@ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx + /* Enable interrupts for the page fault handler */ + sti + /* Call page fault handler */ mov ecx, [rbp + KTRAP_FRAME_ErrorCode] // StoreInstruction and ecx, 1 @@ -428,6 +431,9 @@ /* Check for success */ test eax, eax jge PageFaultReturn + + /* Disable interrupts again for the debugger */ + cli /* Set parameter 1 to error code */ mov r9d, [rbp + KTRAP_FRAME_ErrorCode] Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Mar 28 21:09:03 2012 @@ -33,6 +33,9 @@ /* Template PTE for prototype page */ MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << 32)}}; + +/* Template PTE for decommited page */ +MMPTE MmDecommittedPte = {{MM_DECOMMIT << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* Address ranges */ PVOID MiSessionViewEnd;

12 years, 9 months

[tkreuzer] 56264: [NTOSKRNL] - Make file offsets 64 bit - Fix lots of MSVC/64 bit warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 19:41:40 2012 New Revision: 56264 URL: http://svn.reactos.org/svn/reactos?rev=56264&view=rev Log: [NTOSKRNL] - Make file offsets 64 bit - Fix lots of MSVC/64 bit warnings Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/reqtools.c trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/pageop.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -129,7 +129,7 @@ while (FileOffset.QuadPart < End.QuadPart) { PVOID Address; - ULONG Entry; + ULONG_PTR Entry; if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page))) break; @@ -223,7 +223,7 @@ PageAddress < EndingAddress; PageAddress += PAGE_SIZE) { - ULONG Entry; + ULONG_PTR Entry; FileOffset.QuadPart = ViewOffset.QuadPart + PageAddress - BeginningAddress; Entry = MmGetPageEntrySectionSegment(MemoryArea->Data.SectionData.Segment, &FileOffset); @@ -250,7 +250,7 @@ PageAddress < EndingAddress; PageAddress += PAGE_SIZE) { - ULONG Entry; + ULONG_PTR Entry; FileOffset.QuadPart = ViewOffset.QuadPart + PageAddress - BeginningAddress; Entry = Pages[(PageAddress - BeginningAddress) >> PAGE_SHIFT]; Page = PFN_FROM_SSE(Entry); @@ -351,7 +351,7 @@ { PROS_SECTION_OBJECT Section; NTSTATUS Status; - ULARGE_INTEGER MaximumSize; + LARGE_INTEGER MaximumSize; PMM_SECTION_SEGMENT Segment; IO_STATUS_BLOCK Iosb; CC_FILE_SIZES FileSizes; @@ -394,6 +394,7 @@ */ if (!CcGetFileSizes(FileObject, &FileSizes)) { + ULONG Information; /* * FIXME: This is propably not entirely correct. We can't look into * the standard FCB header because it might not be initialized yet @@ -405,7 +406,8 @@ FileStandardInformation, sizeof(FILE_STANDARD_INFORMATION), &FileInfo, - &Iosb.Information); + &Information); + Iosb.Information = Information; DPRINT("Query => %x\n", Status); if (!NT_SUCCESS(Status)) @@ -644,7 +646,7 @@ MiFreeSegmentPage(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER FileOffset) { - ULONG Entry; + ULONG_PTR Entry; PFILE_OBJECT FileObject = Segment->FileObject; Entry = MmGetPageEntrySectionSegment(Segment, FileOffset); @@ -696,7 +698,7 @@ SWAPENTRY SwapEntry, BOOLEAN Dirty) { - ULONG Entry; + ULONG_PTR Entry; PVOID *ContextData = Context; PMMSUPPORT AddressSpace; PEPROCESS Process; Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -69,7 +69,7 @@ ULONG Consumer; PMM_SECTION_SEGMENT Segment; LARGE_INTEGER FileOffset, TotalOffset; - ULONG Entry; + ULONG_PTR Entry; ULONG Attributes; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); KIRQL OldIrql; @@ -295,7 +295,7 @@ Region->Protect == PAGE_EXECUTE_READWRITE) #endif { - ULONG Entry; + ULONG_PTR Entry; DPRINTC("setting non-cow page %x %x:%x offset %x (%x) to writable\n", Segment, Process, Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -5,16 +5,20 @@ /* TYPES *********************************************************************/ #define MM_WAIT_ENTRY 0x7ffff800 -#define PFN_FROM_SSE(E) ((E) >> PAGE_SHIFT) +#define PFN_FROM_SSE(E) ((PFN_NUMBER)((E) >> PAGE_SHIFT)) #define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) #define MM_IS_WAIT_PTE(E) \ (IS_SWAP_FROM_SSE(E) && SWAPENTRY_FROM_SSE(E) == MM_WAIT_ENTRY) -#define MAKE_PFN_SSE(P) ((P) << PAGE_SHIFT) +#define MAKE_PFN_SSE(P) ((ULONG_PTR)((P) << PAGE_SHIFT)) #define SWAPENTRY_FROM_SSE(E) ((E) >> 1) -#define MAKE_SWAP_SSE(S) (((ULONG)(S) << 1) | 0x1) +#define MAKE_SWAP_SSE(S) (((ULONG_PTR)(S) << 1) | 0x1) #define DIRTY_SSE(E) ((E) | 2) #define CLEAN_SSE(E) ((E) & ~2) #define IS_DIRTY_SSE(E) ((E) & 2) +#define PAGE_FROM_SSE(E) ((E) & 0xFFFFF000) +#define SHARE_COUNT_FROM_SSE(E) (((E) & 0x00000FFC) >> 2) +#define MAX_SHARE_COUNT 0x3FF +#define MAKE_SSE(P, C) ((ULONG_PTR)((P) | ((C) << 2))) #define MM_SEGMENT_FINALIZE (0x40000000) @@ -52,7 +56,7 @@ LARGE_INTEGER FileOffset; PMM_SECTION_SEGMENT Segment; ULONG Refcount; - ULONG PageEntries[ENTRIES_PER_ELEMENT]; + ULONG_PTR PageEntries[ENTRIES_PER_ELEMENT]; } CACHE_SECTION_PAGE_TABLE, *PCACHE_SECTION_PAGE_TABLE; struct _MM_REQUIRED_RESOURCES; @@ -124,11 +128,11 @@ NTAPI _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, - ULONG Entry, + ULONG_PTR Entry, const char *file, int line); -ULONG +ULONG_PTR NTAPI _MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -61,7 +61,7 @@ PMEMORY_AREA MemoryArea, PMM_REQUIRED_RESOURCES Required) { - int i; + ULONG i; NTSTATUS Status = STATUS_SUCCESS; for (i = 0; i < Required->Amount; i++) Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -148,11 +148,11 @@ NTAPI _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, - ULONG Entry, + ULONG_PTR Entry, const char *file, int line) { - ULONG PageIndex, OldEntry; + ULONG_PTR PageIndex, OldEntry; PCACHE_SECTION_PAGE_TABLE PageTable; ASSERT(Segment->Locked); @@ -202,7 +202,7 @@ return STATUS_SUCCESS; } -ULONG +ULONG_PTR NTAPI _MmGetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset, @@ -210,7 +210,7 @@ int line) { LARGE_INTEGER FileOffset; - ULONG PageIndex, Result; + ULONG_PTR PageIndex, Result; PCACHE_SECTION_PAGE_TABLE PageTable; ASSERT(Segment->Locked); @@ -247,10 +247,10 @@ Element->FileOffset.u.LowPart); if (FreePage) { - int i; + ULONG i; for (i = 0; i < ENTRIES_PER_ELEMENT; i++) { - ULONG Entry; + ULONG_PTR Entry; LARGE_INTEGER Offset; Offset.QuadPart = Element->FileOffset.QuadPart + i * PAGE_SIZE; Entry = Element->PageEntries[i]; Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -64,7 +64,7 @@ PLARGE_INTEGER FileOffset, BOOLEAN *Dirty) { - ULONG Entry; + ULONG_PTR Entry; DPRINT("MmWithdrawSectionPage(%x,%08x%08x,%x)\n", Segment, @@ -228,7 +228,7 @@ PBOOLEAN Dirty, PMM_REQUIRED_RESOURCES Required) { - ULONG Entry; + ULONG_PTR Entry; PFN_NUMBER OurPage; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); LARGE_INTEGER TotalOffset; @@ -521,7 +521,8 @@ MiCacheEvictPages(PMM_SECTION_SEGMENT Segment, ULONG Target) { - ULONG Entry, Result = 0, i, j; + ULONG_PTR Entry; + ULONG Result = 0, i, j; NTSTATUS Status; PFN_NUMBER Page; LARGE_INTEGER Offset; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -983,12 +983,14 @@ IN PKTRAP_FRAME TrapFrame ); +#ifndef _M_AMD64 VOID FASTCALL KiInterruptDispatch( IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt ); +#endif VOID FASTCALL Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -206,10 +206,10 @@ BOOLEAN WriteCopy; BOOLEAN Locked; - struct + struct { - LONG FileOffset; /* start offset into the file for image sections */ - ULONG_PTR VirtualAddress; /* dtart offset into the address range for image sections */ + ULONGLONG FileOffset; /* start offset into the file for image sections */ + ULONG_PTR VirtualAddress; /* start offset into the address range for image sections */ ULONG Characteristics; } Image; @@ -443,7 +443,7 @@ * section mapping. */ PMM_SECTION_SEGMENT Segment; - ULONG Offset; + ULONGLONG Offset; } MM_PAGEOP, *PMM_PAGEOP; typedef struct _MM_MEMORY_CONSUMER @@ -1020,7 +1020,7 @@ HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, - ULONG Offset, + ULONGLONG Offset, ULONG OpType, BOOLEAN First ); @@ -1032,7 +1032,7 @@ HANDLE Pid, PVOID Address, PMM_SECTION_SEGMENT Segment, - ULONG Offset + ULONGLONG Offset ); VOID Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -63,7 +63,7 @@ VOID IopFixupDeviceId(PWCHAR String) { - ULONG Length = wcslen(String), i; + SIZE_T Length = wcslen(String), i; for (i = 0; i < Length; i++) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -306,7 +306,7 @@ FORCEINLINE VOID ExpCheckPoolIrqlLevel(IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN PVOID Entry) { // @@ -341,7 +341,7 @@ // the table // ULONGLONG Result = 40543 * Tag; - return BucketMask & (Result ^ (Result >> 32)); + return (ULONG)BucketMask & ((ULONG)Result ^ (Result >> 32)); } FORCEINLINE @@ -358,7 +358,7 @@ // while holding the expansion pushlock, and this is why we call this a // "partial" hash only. // - Result = (ULONG_PTR)BaseAddress >> PAGE_SHIFT; + Result = (ULONG)((ULONG_PTR)BaseAddress >> PAGE_SHIFT); return (Result >> 24) ^ (Result >> 16) ^ (Result >> 8) ^ Result; } @@ -538,11 +538,13 @@ if ((PoolType & BASE_POOL_TYPE_MASK) == NonPagedPool) { InterlockedIncrement(&TableEntry->NonPagedFrees); - InterlockedExchangeAddSizeT(&TableEntry->NonPagedBytes, -NumberOfBytes); + InterlockedExchangeAddSizeT(&TableEntry->NonPagedBytes, + -(SSIZE_T)NumberOfBytes); return; } InterlockedIncrement(&TableEntry->PagedFrees); - InterlockedExchangeAddSizeT(&TableEntry->PagedBytes, -NumberOfBytes); + InterlockedExchangeAddSizeT(&TableEntry->PagedBytes, + -(SSIZE_T)NumberOfBytes); return; } @@ -1071,7 +1073,7 @@ IN ULONG SystemInformationLength, IN OUT PULONG ReturnLength OPTIONAL) { - SIZE_T TableSize, CurrentLength; + ULONG TableSize, CurrentLength; ULONG EntryCount; NTSTATUS Status = STATUS_SUCCESS; PSYSTEM_POOLTAG TagEntry; @@ -1094,7 +1096,7 @@ // Capture the number of entries, and the total size needed to make a copy // of the table // - EntryCount = PoolTrackTableSize; + EntryCount = (ULONG)PoolTrackTableSize; TableSize = EntryCount * sizeof(POOL_TRACKER_TABLE); // @@ -1262,7 +1264,7 @@ ULONG NTAPI ExpFindAndRemoveTagBigPages(IN PVOID Va, - OUT PULONG BigPages, + OUT PULONG_PTR BigPages, IN POOL_TYPE PoolType) { BOOLEAN FirstTry = TRUE; @@ -1525,7 +1527,8 @@ // // Increment required counters // - InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, BYTES_TO_PAGES(NumberOfBytes)); + InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, + (LONG)BYTES_TO_PAGES(NumberOfBytes)); InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, NumberOfBytes); InterlockedIncrement((PLONG)&PoolDesc->RunningAllocs); @@ -1535,7 +1538,7 @@ // if (!ExpAddTagForBigPages(Entry, Tag, - BYTES_TO_PAGES(NumberOfBytes), + (ULONG)BYTES_TO_PAGES(NumberOfBytes), OriginalType)) { Tag = ' GIB'; @@ -2083,14 +2086,16 @@ // PoolDesc = PoolVector[PoolType]; InterlockedIncrement((PLONG)&PoolDesc->RunningDeAllocs); - InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, -PageCount << PAGE_SHIFT); + InterlockedExchangeAddSizeT(&PoolDesc->TotalBytes, + -(LONG_PTR)(PageCount << PAGE_SHIFT)); // // Do the real free now and update the last counter with the big page count // RealPageCount = MiFreePoolPages(P); ASSERT(RealPageCount == PageCount); - InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, -RealPageCount); + InterlockedExchangeAdd((PLONG)&PoolDesc->TotalBigPages, + -(LONG)RealPageCount); return; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -1071,7 +1071,7 @@ { PLIST_ENTRY NextMd; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - ULONG i; + ULONG_PTR i; PFN_NUMBER BasePage, LoaderPages; PMMPFN Pfn1; KIRQL OldIrql; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -244,7 +244,8 @@ if (ExQueryDepthSList(&MmDeadStackSListHead) < MmMaximumDeadKernelStacks) { Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); - InterlockedPushEntrySList(&MmDeadStackSListHead, &Pfn1->u1.NextStackPfn); + InterlockedPushEntrySList(&MmDeadStackSListHead, + (PSLIST_ENTRY)&Pfn1->u1.NextStackPfn); return; } } @@ -1138,7 +1139,7 @@ /* Use idle process Working set */ Process->Vm.VmWorkingSetList = PsGetCurrentProcess()->Vm.VmWorkingSetList; - + /* Done */ Process->HasAddressSpace = TRUE;//?? return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -848,7 +848,7 @@ { PointerPte = &Subsection->SubsectionBase[PteOffset]; LastPte = PointerPte + BYTES_TO_PAGES(CommitSize); - QuotaCharge = LastPte - PointerPte; + QuotaCharge = (ULONG)(LastPte - PointerPte); } /* ARM3 does not currently support large pages */ @@ -1467,7 +1467,8 @@ { /* Convert the flag, and make sure the section isn't too big */ NewSection->u.Flags.Based = TRUE; - if (NewSection->SizeOfSection.QuadPart > (ULONG_PTR)MmHighSectionBase) + if ((ULONGLONG)NewSection->SizeOfSection.QuadPart > + (ULONG_PTR)MmHighSectionBase) { DPRINT1("BASED section is too large\n"); ObDereferenceObject(NewSection); Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -3668,9 +3668,9 @@ IN ULONG FreeType) { PMEMORY_AREA MemoryArea; - ULONG PRegionSize; + SIZE_T PRegionSize; PVOID PBaseAddress; - ULONG CommitReduction = 0; + ULONG_PTR CommitReduction = 0; ULONG_PTR StartingAddress, EndingAddress; PMMVAD Vad; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -157,7 +157,7 @@ if (MmAvailablePages < MiMinimumAvailablePages) { /* Global page limit exceeded */ - Target = max(Target, MiMinimumAvailablePages - MmAvailablePages); + Target = (ULONG)max(Target, MiMinimumAvailablePages - MmAvailablePages); } if (Target) Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -72,7 +72,7 @@ PMM_PAGEOP NTAPI MmCheckForPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset) + PMM_SECTION_SEGMENT Segment, ULONGLONG Offset) { ULONG_PTR Hash; KIRQL oldIrql; @@ -135,7 +135,7 @@ PMM_PAGEOP NTAPI MmGetPageOp(PMEMORY_AREA MArea, HANDLE Pid, PVOID Address, - PMM_SECTION_SEGMENT Segment, ULONG Offset, ULONG OpType, BOOLEAN First) + PMM_SECTION_SEGMENT Segment, ULONGLONG Offset, ULONG OpType, BOOLEAN First) /* * FUNCTION: Get a page operation descriptor corresponding to * the memory area and either the segment, offset pair or the Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=562… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -53,7 +53,7 @@ PVOID Address; PEPROCESS Process; PMM_PAGEOP PageOp; - ULONG Offset; + ULONGLONG Offset; NTSTATUS Status = STATUS_SUCCESS; ExAcquireFastMutex(&RmapListLock); @@ -126,8 +126,8 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset.QuadPart; + Offset = MemoryArea->Data.SectionData.ViewOffset.QuadPart + + ((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress); /* * Get or create a pageop Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -167,15 +167,6 @@ STANDARD_RIGHTS_EXECUTE | SECTION_MAP_EXECUTE, SECTION_ALL_ACCESS}; -#define PAGE_FROM_SSE(E) ((E) & 0xFFFFF000) -#define PFN_FROM_SSE(E) ((E) >> PAGE_SHIFT) -#define SHARE_COUNT_FROM_SSE(E) (((E) & 0x00000FFC) >> 2) -#define IS_SWAP_FROM_SSE(E) ((E) & 0x00000001) -#define MAX_SHARE_COUNT 0x3FF -#define MAKE_SSE(P, C) ((P) | ((C) << 2)) -#define SWAPENTRY_FROM_SSE(E) ((E) >> 1) -#define MAKE_SWAP_SSE(S) (((ULONG)(S) << 1) | 0x1) - static const INFORMATION_CLASS_INFO ExSectionInfoClass[] = { ICI_SQ_SAME( sizeof(SECTION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SectionBasicInformation */ @@ -695,7 +686,7 @@ pssSegments[i].Image.Characteristics = pishSectionHeaders[i].Characteristics; /* ensure the memory image is no larger than 4GB */ - nPrevVirtualEndOfSegment = pssSegments[i].Image.VirtualAddress + pssSegments[i].Length.QuadPart; + nPrevVirtualEndOfSegment = (ULONG_PTR)(pssSegments[i].Image.VirtualAddress + pssSegments[i].Length.QuadPart); if (nPrevVirtualEndOfSegment < pssSegments[i].Image.VirtualAddress) DIE(("The image is too large\n")); } @@ -813,7 +804,7 @@ MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER Offset) { - ULONG Entry; + ULONG_PTR Entry; Entry = MmGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) @@ -842,7 +833,7 @@ BOOLEAN Dirty, BOOLEAN PageOut) { - ULONG Entry; + ULONG_PTR Entry; BOOLEAN IsDirectMapped = FALSE; Entry = MmGetPageEntrySectionSegment(Segment, Offset); @@ -982,7 +973,7 @@ PBCB Bcb; PCACHE_SEGMENT CacheSeg; Bcb = MemoryArea->Data.SectionData.Section->FileObject->SectionObjectPointer->SharedCacheMap; - CacheSeg = CcRosLookupCacheSegment(Bcb, SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset); + CacheSeg = CcRosLookupCacheSegment(Bcb, (ULONG)(SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset)); if (CacheSeg) { CcRosReleaseCacheSegment(Bcb, CacheSeg, CacheSeg->Valid, FALSE, TRUE); @@ -1029,7 +1020,7 @@ */ { ULONG BaseOffset; - ULONG_PTR FileOffset; + ULONGLONG FileOffset; PVOID BaseAddress; BOOLEAN UptoDate; PCACHE_SEGMENT CacheSeg; @@ -1042,7 +1033,7 @@ FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - RawLength = MemoryArea->Data.SectionData.Segment->RawLength.QuadPart; + RawLength = (ULONG_PTR)(MemoryArea->Data.SectionData.Segment->RawLength.QuadPart); FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->Image.FileOffset; IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; @@ -1055,8 +1046,8 @@ * memory area was mapped at an offset in the file which is page aligned * then get the related cache segment. */ - if ((FileOffset % PAGE_SIZE) == 0 && - (SegOffset + PAGE_SIZE <= RawLength || !IsImageSection) && + if (((FileOffset % PAGE_SIZE) == 0) && + ((SegOffset + PAGE_SIZE <= RawLength) || !IsImageSection) && !(MemoryArea->Data.SectionData.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) { @@ -1140,7 +1131,7 @@ Process = PsGetCurrentProcess(); PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); - CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset; + CacheSegOffset = (ULONG_PTR)(BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset); Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) { @@ -1469,7 +1460,7 @@ /* * Just map the desired physical page */ - Page = Offset.QuadPart >> PAGE_SHIFT; + Page = (PFN_NUMBER)(Offset.QuadPart >> PAGE_SHIFT); Status = MmCreateVirtualMappingUnsafe(Process, PAddress, Region->Protect, @@ -1552,7 +1543,8 @@ MmUnlockAddressSpace(AddressSpace); if ((Segment->Flags & MM_PAGEFILE_SEGMENT) || - (Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart) && Section->AllocationAttributes & SEC_IMAGE)) + ((Offset.QuadPart >= (LONGLONG)PAGE_ROUND_UP(Segment->RawLength.QuadPart) && + (Section->AllocationAttributes & SEC_IMAGE)))) { MI_SET_USAGE(MI_USAGE_SECTION); if (Process) MI_SET_PROCESS2(Process->ImageFileName); @@ -1566,7 +1558,7 @@ } else { - Status = MiReadPage(MemoryArea, Offset.QuadPart, &Page); + Status = MiReadPage(MemoryArea, (ULONG_PTR)Offset.QuadPart, &Page); if (!NT_SUCCESS(Status)) { DPRINT1("MiReadPage failed (Status %x)\n", Status); @@ -1745,7 +1737,7 @@ LARGE_INTEGER Offset; PMM_PAGEOP PageOp; PMM_REGION Region; - ULONG Entry; + ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address); @@ -1800,10 +1792,10 @@ MmSetPageProtect(Process, Address, Region->Protect); return(STATUS_SUCCESS); } - + if(OldPage == 0) DPRINT("OldPage == 0!\n"); - + /* * Get or create a pageop */ @@ -1962,8 +1954,8 @@ PFN_NUMBER Page; MM_SECTION_PAGEOUT_CONTEXT Context; SWAPENTRY SwapEntry; - ULONG Entry; - ULONG FileOffset; + ULONG_PTR Entry; + ULONGLONG FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; #ifndef NEWCC @@ -2162,7 +2154,7 @@ KeBugCheckEx(MEMORY_MANAGEMENT, STATUS_UNSUCCESSFUL, SwapEntry, (ULONG_PTR)Process, (ULONG_PTR)Address); } #ifndef NEWCC - Status = CcRosUnmapCacheSegment(Bcb, FileOffset, FALSE); + Status = CcRosUnmapCacheSegment(Bcb, (ULONG)FileOffset, FALSE); #else Status = STATUS_SUCCESS; #endif @@ -2170,7 +2162,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); - KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, FileOffset, (ULONG_PTR)Address); + KeBugCheckEx(MEMORY_MANAGEMENT, Status, (ULONG_PTR)Bcb, (ULONG_PTR)FileOffset, (ULONG_PTR)Address); } #endif PageOp->Status = STATUS_SUCCESS; @@ -2237,7 +2229,7 @@ } else { - LONG OldEntry; + ULONG_PTR OldEntry; /* * For non-private pages if the page wasn't direct mapped then * set it back into the section segment entry so we don't loose @@ -2365,7 +2357,7 @@ PMM_SECTION_SEGMENT Segment; PFN_NUMBER Page; SWAPENTRY SwapEntry; - ULONG Entry; + ULONG_PTR Entry; BOOLEAN Private; NTSTATUS Status; PFILE_OBJECT FileObject; @@ -2457,7 +2449,7 @@ { ASSERT(SwapEntry == 0); #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, Offset.LowPart + Segment->Image.FileOffset); + CcRosMarkDirtyCacheSegment(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); #endif PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2543,7 +2535,7 @@ if (DoCOW && MmIsPagePresent(Process, Address)) { LARGE_INTEGER Offset; - ULONG Entry; + ULONG_PTR Entry; PFN_NUMBER Page; Offset.QuadPart = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress @@ -2655,7 +2647,7 @@ { ULONG Length; LARGE_INTEGER Offset; - ULONG Entry; + ULONG_PTR Entry; SWAPENTRY SavedSwapEntry; PFN_NUMBER Page; @@ -2739,7 +2731,7 @@ ULONG RefCount = 0; PMM_SECTION_SEGMENT Segment = Section->Segment; - if (Segment && + if (Segment && (RefCount = InterlockedDecrementUL(&Segment->ReferenceCount)) == 0) { DPRINT("Freeing section segment\n"); @@ -3307,7 +3299,7 @@ Status = MiSimpleRead(FileObject, &FileOffset, Buffer, BufferSize, TRUE, &Iosb); - UsedSize = Iosb.Information; + UsedSize = (ULONG)Iosb.Information; if(NT_SUCCESS(Status) && UsedSize < OffsetAdjustment) { @@ -3540,7 +3532,7 @@ PMM_SECTION_SEGMENT Segment = &ImageSectionObject->Segments[i]; ULONG_PTR EndOfEffectiveSegment; - EndOfEffectiveSegment = EffectiveSegment->Image.VirtualAddress + EffectiveSegment->Length.QuadPart; + EndOfEffectiveSegment = (ULONG_PTR)(EffectiveSegment->Image.VirtualAddress + EffectiveSegment->Length.QuadPart); ASSERT((EndOfEffectiveSegment % PAGE_SIZE) == 0); /* @@ -4042,7 +4034,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, PFN_NUMBER Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { - ULONG Entry; + ULONG_PTR Entry; PFILE_OBJECT FileObject; PBCB Bcb; LARGE_INTEGER Offset; @@ -4098,7 +4090,7 @@ FileObject = MemoryArea->Data.SectionData.Section->FileObject; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; #ifndef NEWCC - CcRosMarkDirtyCacheSegment(Bcb, Offset.QuadPart + Segment->Image.FileOffset); + CcRosMarkDirtyCacheSegment(Bcb, (ULONG)(Offset.QuadPart + Segment->Image.FileOffset)); #endif ASSERT(SwapEntry == 0); } @@ -4597,8 +4589,8 @@ if (!(SectionSegments[i].Image.Characteristics & IMAGE_SCN_TYPE_NOLOAD)) { ULONG_PTR MaxExtent; - MaxExtent = (ULONG_PTR)SectionSegments[i].Image.VirtualAddress + - SectionSegments[i].Length.QuadPart; + MaxExtent = (ULONG_PTR)(SectionSegments[i].Image.VirtualAddress + + SectionSegments[i].Length.QuadPart); ImageSize = max(ImageSize, MaxExtent); } } @@ -5047,7 +5039,7 @@ DPRINT("Creating a section with WRITE access\n"); FileAccess = FILE_READ_DATA | FILE_WRITE_DATA | SYNCHRONIZE; } - else + else { DPRINT("Creating a section with READ access\n"); FileAccess = FILE_READ_DATA | SYNCHRONIZE; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Mar 28 19:41:40 2012 @@ -470,8 +470,8 @@ VmCounters->PagefileUsage = Process->QuotaUsage[2] << PAGE_SHIFT; VmCounters->PeakPagefileUsage = Process->QuotaPeak[2] << PAGE_SHIFT; //VmCounters->PrivateUsage = Process->CommitCharge << PAGE_SHIFT; - // - + // + /* Set the return length */ Length = ProcessInformationLength; }

12 years, 9 months

[tkreuzer] 56263: [NDK/NTOSKRNK] - Finally make EPROCESS::Session PVOID, as it's supposed to be - add missing Wow64Process member

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 18:46:30 2012 New Revision: 56263 URL: http://svn.reactos.org/svn/reactos?rev=56263&view=rev Log: [NDK/NTOSKRNK] - Finally make EPROCESS::Session PVOID, as it's supposed to be - add missing Wow64Process member Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Wed Mar 28 18:46:30 2012 @@ -1112,13 +1112,17 @@ HARDWARE_PTE PageDirectoryPte; ULONGLONG Filler; }; - ULONG Session; // FIXME: PVOID + PVOID Session; CHAR ImageFileName[16]; LIST_ENTRY JobLinks; PVOID LockedPagesList; LIST_ENTRY ThreadListHead; PVOID SecurityPort; +#ifdef _M_AMD64 + struct _WOW64_PROCESS *Wow64Process; +#else PVOID PaeTop; +#endif ULONG ActiveThreads; #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG ImagePathHash; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Mar 28 18:46:30 2012 @@ -880,10 +880,10 @@ Status = STATUS_INFO_LENGTH_MISMATCH; break; } - + /* Indicate success */ Status = STATUS_SUCCESS; - + /* Protect write in SEH */ _SEH2_TRY { @@ -958,14 +958,14 @@ { /* Get the WOW64 process structure */ #ifdef _WIN64 - Wow64 = Process->Wow64Process; + Wow64 = (ULONG_PTR)Process->Wow64Process; #else Wow64 = 0; #endif /* Release the lock */ ExReleaseRundownProtection(&Process->RundownProtect); } - + /* Protect write with SEH */ _SEH2_TRY { @@ -982,9 +982,9 @@ /* Dereference the process */ ObDereferenceObject(Process); break; - + case ProcessExecuteFlags: - + /* Set return length */ Length = sizeof(ULONG); if (ProcessInformationLength != Length) @@ -1322,7 +1322,7 @@ if (!NT_SUCCESS(Status)) break; /* Write the session ID in the EPROCESS */ - Process->Session = SessionInfo.SessionId; + Process->Session = UlongToPtr(SessionInfo.SessionId); // HACK!!! /* Check if the process also has a PEB */ if (Process->Peb) @@ -1811,11 +1811,11 @@ KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); Status = STATUS_SUCCESS; break; - + case ProcessUserModeIOPL: /* Only TCB can do this */ - if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { /* Fail */ DPRINT1("Need TCB to set IOPL\n"); @@ -1863,7 +1863,7 @@ /* Call Mm for the update */ Status = MmSetExecuteOptions(NoExecute); break; - + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: @@ -2319,7 +2319,7 @@ /* All done */ break; - + case ThreadBreakOnTermination: /* Check buffer length */

12 years, 9 months

[akhaldi] 56262: [FORMATTING] * Improve indentation, remove trailing spaces, apply a consistent style, adjust to 80 col... No code changes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 28 18:39:21 2012 New Revision: 56262 URL: http://svn.reactos.org/svn/reactos?rev=56262&view=rev Log: [FORMATTING] * Improve indentation, remove trailing spaces, apply a consistent style, adjust to 80 col... No code changes. Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/reqtools.c trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cache/section/swapout.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa…

12 years, 9 months

[cgutman] 56261: [VBEMP] - Promote fatal VESA BIOS errors to Error status

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Mar 28 13:39:02 2012 New Revision: 56261 URL: http://svn.reactos.org/svn/reactos?rev=56261&view=rev Log: [VBEMP] - Promote fatal VESA BIOS errors to Error status Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Wed Mar 28 13:39:02 2012 @@ -250,7 +250,7 @@ /* Verify the VBE signature. */ if (VideoPortCompareMemory(VBEDeviceExtension->VbeInfo.Signature, "VESA", 4) != 4) { - VideoPortDebugPrint(Warn, "No VBE BIOS present\n"); + VideoPortDebugPrint(Error, "No VBE BIOS present\n"); return FALSE; } @@ -265,13 +265,15 @@ if (VBEDeviceExtension->VbeInfo.Version < 0x200) #endif { - VideoPortDebugPrint(Warn, "VBE BIOS present, but incompatible version.\n"); + VideoPortDebugPrint(Error, "VBE BIOS present, but incompatible version %d.%d\n", + VBEDeviceExtension->VbeInfo.Version / 0x100, + VBEDeviceExtension->VbeInfo.Version & 0xFF); return FALSE; } } else { - VideoPortDebugPrint(Warn, "No VBE BIOS found.\n"); + VideoPortDebugPrint(Error, "No VBE BIOS found.\n"); return FALSE; }

12 years, 9 months

[tkreuzer] 56260: [HAL] Fix MSVC / 64 bit warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 12:15:54 2012 New Revision: 56260 URL: http://svn.reactos.org/svn/reactos?rev=56260&view=rev Log: [HAL] Fix MSVC / 64 bit warnings Modified: trunk/reactos/hal/halx86/acpi/busemul.c trunk/reactos/hal/halx86/acpi/halacpi.c trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/generic/memory.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/hal/halx86/generic/usage.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/legacy/bus/pcibus.c Modified: trunk/reactos/hal/halx86/acpi/busemul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/busemul.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -87,8 +87,8 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity) { - ULONG Vector = IRQ2VECTOR(BusInterruptLevel); - *Irql = (KIRQL)VECTOR2IRQL(Vector); + UCHAR Vector = IRQ2VECTOR((UCHAR)BusInterruptLevel); + *Irql = VECTOR2IRQL(Vector); *Affinity = 0xFFFFFFFF; return Vector; } Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -52,7 +52,7 @@ { PLIST_ENTRY ListHead, NextEntry; PACPI_CACHED_TABLE CachedTable; - + /* Loop cached tables */ ListHead = &HalpAcpiTableCacheList; NextEntry = ListHead->Flink; @@ -60,10 +60,10 @@ { /* Get the table */ CachedTable = CONTAINING_RECORD(NextEntry, ACPI_CACHED_TABLE, Links); - + /* Compare signatures */ if (CachedTable->Header.Signature == Signature) return &CachedTable->Header; - + /* Keep going */ NextEntry = NextEntry->Flink; } @@ -77,7 +77,7 @@ HalpAcpiCacheTable(IN PDESCRIPTION_HEADER TableHeader) { PACPI_CACHED_TABLE CachedTable; - + /* Get the cached table and link it */ CachedTable = CONTAINING_RECORD(TableHeader, ACPI_CACHED_TABLE, Header); InsertTailList(&HalpAcpiTableCacheList, &CachedTable->Links); @@ -89,11 +89,11 @@ IN PDESCRIPTION_HEADER TableHeader) { ULONG Size; - PFN_NUMBER PageCount; + PFN_COUNT PageCount; PHYSICAL_ADDRESS PhysAddress; PACPI_CACHED_TABLE CachedTable; PDESCRIPTION_HEADER CopiedTable; - + /* Size we'll need for the cached table */ Size = TableHeader->Length + FIELD_OFFSET(ACPI_CACHED_TABLE, Header); if (LoaderBlock) @@ -120,7 +120,7 @@ /* Use Mm pool */ CachedTable = ExAllocatePoolWithTag(NonPagedPool, Size, ' laH'); } - + /* Do we have the cached table? */ if (CachedTable) { @@ -133,7 +133,7 @@ /* Nothing to return */ CopiedTable = NULL; } - + /* Return the table */ return CopiedTable; } @@ -153,8 +153,8 @@ ULONG Offset; ULONG EntryCount, CurrentEntry; PCHAR CurrentByte; - PFN_NUMBER PageCount; - + PFN_COUNT PageCount; + /* Should not query the RSDT/XSDT by itself */ if ((Signature == RSDT_SIGNATURE) || (Signature == XSDT_SIGNATURE)) return NULL; @@ -169,7 +169,7 @@ PhysicalAddress.HighPart = 0; PhysicalAddress.LowPart = Fadt->dsdt; TableLength = 2 * PAGE_SIZE; - + /* Map it */ if (LoaderBlock) { @@ -188,7 +188,7 @@ DPRINT1("HAL: Failed to map ACPI table.\n"); return NULL; } - + /* Validate the signature */ if (Header->Signature != DSDT_SIGNATURE) { @@ -232,7 +232,7 @@ /* Won't be using the RSDT */ Rsdt = NULL; } - + /* Smallest RSDT/XSDT is one without table entries */ Offset = FIELD_OFFSET(RSDT, Tables); if (Xsdt) @@ -240,7 +240,7 @@ /* Figure out total size of table and the offset */ TableLength = Xsdt->Header.Length; if (TableLength < Offset) Offset = Xsdt->Header.Length; - + /* The entries are each 64-bits, so count them */ EntryCount = (TableLength - Offset) / sizeof(PHYSICAL_ADDRESS); } @@ -249,11 +249,11 @@ /* Figure out total size of table and the offset */ TableLength = Rsdt->Header.Length; if (TableLength < Offset) Offset = Rsdt->Header.Length; - + /* The entries are each 32-bits, so count them */ EntryCount = (TableLength - Offset) / sizeof(ULONG); } - + /* Start at the beginning of the array and loop it */ for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++) { @@ -269,7 +269,7 @@ /* Read the 64-bit physical address */ PhysicalAddress = Xsdt->Tables[CurrentEntry]; } - + /* Had we already mapped a table? */ if (Header) { @@ -285,7 +285,7 @@ MmUnmapIoSpace(Header, 2 * PAGE_SIZE); } } - + /* Now map this table */ if (!LoaderBlock) { @@ -297,7 +297,7 @@ /* Phase 0: Use Mm */ Header = HalpMapPhysicalMemory64(PhysicalAddress, 2); } - + /* Check if we mapped it */ if (!Header) { @@ -315,7 +315,7 @@ Header); if (Header->Signature == Signature) break; } - + /* Did we end up here back at the last entry? */ if (CurrentEntry == EntryCount) { @@ -335,10 +335,10 @@ return NULL; } } - + /* Past this point, we assume something was found */ ASSERT(Header); - + /* How many pages do we need? */ PageCount = BYTES_TO_PAGES(Header->Length); if (PageCount != 2) @@ -354,7 +354,7 @@ /* Using Mm */ MmUnmapIoSpace(Header, 2 * PAGE_SIZE); } - + /* Now map this table using its correct size */ if (!LoaderBlock) { @@ -367,7 +367,7 @@ Header = HalpMapPhysicalMemory64(PhysicalAddress, PageCount); } } - + /* Fail if the remapped failed */ if (!Header) return NULL; @@ -382,7 +382,7 @@ /* Add this byte */ CheckSum += *CurrentByte; } - + /* The correct checksum is always 0, anything else is illegal */ if (CheckSum) { @@ -394,7 +394,7 @@ (Signature & 0xFF000000) >> 24); } } - + /* Return the table */ return Header; } @@ -404,7 +404,7 @@ HalpAcpiGetTable(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN ULONG Signature) { - PFN_NUMBER PageCount; + PFN_COUNT PageCount; PDESCRIPTION_HEADER TableAddress, BiosCopy; /* See if we have a cached table? */ @@ -417,7 +417,7 @@ { /* Found it, copy it into our own memory */ BiosCopy = HalpAcpiCopyBiosTable(LoaderBlock, TableAddress); - + /* Get the pages, and unmap the BIOS copy */ PageCount = BYTES_TO_PAGES(TableAddress->Length); if (LoaderBlock) @@ -430,13 +430,13 @@ /* Phase 1, use Mm */ MmUnmapIoSpace(TableAddress, PageCount << PAGE_SHIFT); } - + /* Cache the bios copy */ TableAddress = BiosCopy; if (BiosCopy) HalpAcpiCacheTable(BiosCopy); } } - + /* Return the table */ return TableAddress; } @@ -447,7 +447,7 @@ IN ULONG Signature) { PDESCRIPTION_HEADER TableHeader; - + /* Is this phase0 */ if (LoaderBlock) { @@ -462,7 +462,7 @@ /* Get the table */ TableHeader = HalpAcpiGetTable(LoaderBlock, Signature); - + /* Release the lock in phase 1 */ if (!LoaderBlock) ExReleaseFastMutex(&HalpAcpiTableCacheLock); @@ -475,7 +475,7 @@ HalpNumaInitializeStaticConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PACPI_SRAT SratTable; - + /* Get the SRAT, bail out if it doesn't exist */ SratTable = HalAcpiGetTable(LoaderBlock, SRAT_SIGNATURE); HalpAcpiSrat = SratTable; @@ -487,7 +487,7 @@ HalpGetHotPlugMemoryInfo(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PACPI_SRAT SratTable; - + /* Get the SRAT, bail out if it doesn't exist */ SratTable = HalAcpiGetTable(LoaderBlock, SRAT_SIGNATURE); HalpAcpiSrat = SratTable; @@ -537,7 +537,7 @@ /* Invalid or doesn't exist, ignore it */ HalpSimpleBootFlagTable = 0; } - + /* Install the end of boot handler */ // HalEndOfBoot = HalpEndOfBoot; } @@ -552,7 +552,7 @@ PCM_PARTIAL_RESOURCE_LIST ResourceList; PACPI_BIOS_MULTI_NODE NodeData; SIZE_T NodeLength; - PFN_NUMBER PageCount; + PFN_COUNT PageCount; PVOID MappedAddress; PHYSICAL_ADDRESS PhysicalAddress; @@ -566,7 +566,7 @@ /* Assume failure */ *AcpiMultiNode = NULL; - + /* Find the multi function adapter key */ ComponentEntry = KeFindConfigurationNextEntry(LoaderBlock->ConfigurationRoot, AdapterClass, @@ -581,7 +581,7 @@ /* Found it */ break; } - + /* Keep searching */ Next = ComponentEntry; ComponentEntry = KeFindConfigurationNextEntry(LoaderBlock->ConfigurationRoot, @@ -590,24 +590,24 @@ NULL, &Next); } - + /* Make sure we found it */ if (!ComponentEntry) { DPRINT1("**** HalpAcpiFindRsdtPhase0: did NOT find RSDT\n"); return STATUS_NOT_FOUND; } - + /* The configuration data is a resource list, and the BIOS node follows */ ResourceList = ComponentEntry->ConfigurationData; NodeData = (PACPI_BIOS_MULTI_NODE)(ResourceList + 1); - + /* How many E820 memory entries are there? */ NodeLength = sizeof(ACPI_BIOS_MULTI_NODE) + (NodeData->Count - 1) * sizeof(ACPI_E820_ENTRY); - + /* Convert to pages */ - PageCount = BYTES_TO_PAGES(NodeLength); + PageCount = (PFN_COUNT)BYTES_TO_PAGES(NodeLength); /* Allocate the memory */ PhysicalAddress.QuadPart = HalpAllocPhysicalMemory(LoaderBlock, @@ -624,11 +624,11 @@ /* Otherwise we'll have to fail */ MappedAddress = NULL; } - + /* Save the multi node, bail out if we didn't find it */ HalpAcpiMultiNode = MappedAddress; if (!MappedAddress) return STATUS_INSUFFICIENT_RESOURCES; - + /* Copy the multi-node data */ RtlCopyMemory(MappedAddress, NodeData, NodeLength); @@ -648,20 +648,20 @@ ULONG TableLength; PRSDT Rsdt; PLOADER_PARAMETER_EXTENSION LoaderExtension; - + /* Only initialize once */ if (HalpAcpiTableCacheList.Flink) return Status; - + /* Setup the lock and table */ ExInitializeFastMutex(&HalpAcpiTableCacheLock); InitializeListHead(&HalpAcpiTableCacheList); - + /* Find the RSDT */ Status = HalpAcpiFindRsdtPhase0(LoaderBlock, &AcpiMultiNode); if (!NT_SUCCESS(Status)) return Status; PhysicalAddress.QuadPart = AcpiMultiNode->RsdtAddress.QuadPart; - + /* Map the RSDT */ if (LoaderBlock) { @@ -673,7 +673,7 @@ /* Use an I/O map */ MappedAddress = MmMapIoSpace(PhysicalAddress, PAGE_SIZE * 2, MmNonCached); } - + /* Get the RSDT */ Rsdt = MappedAddress; if (!MappedAddress) @@ -682,7 +682,7 @@ DPRINT1("HAL: Failed to map RSDT\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Validate it */ if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && (Rsdt->Header.Signature != XSDT_SIGNATURE)) @@ -691,7 +691,7 @@ HalDisplayString("Bad RSDT pointer\n"); KeBugCheckEx(MISMATCHED_HAL, 4, __LINE__, 0, 0); } - + /* We assumed two pages -- do we need less or more? */ TableLength = ADDRESS_AND_SIZE_TO_SPAN_PAGES(PhysicalAddress.LowPart, Rsdt->Header.Length); @@ -712,7 +712,7 @@ HalpUnmapVirtualAddress(MappedAddress, 2); MappedAddress = HalpMapPhysicalMemory64(PhysicalAddress, TableLength); } - + /* Get the remapped table */ Rsdt = MappedAddress; if (!MappedAddress) @@ -722,7 +722,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } } - + /* Now take the BIOS copy and make our own local copy */ Rsdt = HalpAcpiCopyBiosTable(LoaderBlock, &Rsdt->Header); if (!Rsdt) @@ -731,7 +731,7 @@ DPRINT1("HAL: Couldn't remap RSDT\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Get rid of the BIOS mapping */ if (LoaderBlock) { @@ -747,10 +747,10 @@ LoaderExtension = NULL; } - + /* Cache the RSDT */ HalpAcpiCacheTable(&Rsdt->Header); - + /* Check for compatible loader block extension */ if (LoaderExtension && (LoaderExtension->Size >= 0x58)) { @@ -772,7 +772,7 @@ IN ULONG TimerValExt) { PAGED_CODE(); - + /* Is this in the init phase? */ if (!TimerPort) { @@ -781,7 +781,7 @@ TimerValExt = HalpFixedAcpiDescTable.flags & ACPI_TMR_VAL_EXT; DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); } - + /* FIXME: Now proceed to the timer initialization */ //HalaAcpiTimerInit(TimerPort, TimerValExt); } @@ -810,23 +810,23 @@ DPRINT1("HAL: Didn't find the FACP\n"); return STATUS_NOT_FOUND; } - + /* Assume typical size, otherwise whatever the descriptor table says */ TableLength = sizeof(FADT); if (Fadt->Header.Length < sizeof(FADT)) TableLength = Fadt->Header.Length; /* Copy it in the HAL static buffer */ RtlCopyMemory(&HalpFixedAcpiDescTable, Fadt, TableLength); - + /* Anything special this HAL needs to do? */ HalpAcpiDetectMachineSpecificActions(LoaderBlock, &HalpFixedAcpiDescTable); - + /* Get the debug table for KD */ HalpDebugPortTable = HalAcpiGetTable(LoaderBlock, DBGP_SIGNATURE); - + /* Initialize NUMA through the SRAT */ HalpNumaInitializeStaticConfiguration(LoaderBlock); - + /* Initialize hotplug through the SRAT */ HalpDynamicSystemResourceConfiguration(LoaderBlock); if (HalpAcpiSrat) @@ -840,10 +840,10 @@ /* We'll need this for DMA later */ HalpPhysicalMemoryMayAppearAbove4GB = TRUE; } - + /* Setup the ACPI timer */ HaliAcpiTimerInit(0, 0); - + /* Do we have a low stub address yet? */ if (!HalpLowStubPhysicalAddress.QuadPart) { @@ -858,15 +858,15 @@ HalpLowStub = HalpMapPhysicalMemory64(HalpLowStubPhysicalAddress, 1); } } - + /* Grab a page for flushes */ PhysicalAddress.QuadPart = 0x100000; HalpVirtAddrForFlush = HalpMapPhysicalMemory64(PhysicalAddress, 1); HalpPteForFlush = HalAddressToPte(HalpVirtAddrForFlush); - + /* Don't do this again */ HalpProcessedACPIPhase0 = TRUE; - + /* Setup the boot table */ HalpInitBootTable(LoaderBlock); @@ -912,7 +912,7 @@ { /* Setup the PCI stub support */ HalpInitializePciStubs(); - + /* Set the NMI crash flag */ HalpGetNMICrashFlag(); } @@ -963,7 +963,7 @@ HalpAcpiDetectResourceListSize(OUT PULONG ListSize) { PAGED_CODE(); - + /* One element if there is a SCI */ *ListSize = HalpFixedAcpiDescTable.sci_int_vector ? 1: 0; } @@ -983,7 +983,7 @@ ResourceList->List[0].Version = 1; ResourceList->List[0].Revision = 1; ResourceList->List[0].Count = 0; - + /* Is there a SCI? */ if (HalpFixedAcpiDescTable.sci_int_vector) { @@ -991,16 +991,16 @@ ResourceList->List[0].Descriptors[0].Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; ResourceList->List[0].Descriptors[0].Type = CmResourceTypeInterrupt; ResourceList->List[0].Descriptors[0].ShareDisposition = CmResourceShareShared; - + /* Get the interrupt number */ Interrupt = HalpPicVectorRedirect[HalpFixedAcpiDescTable.sci_int_vector]; ResourceList->List[0].Descriptors[0].u.Interrupt.MinimumVector = Interrupt; ResourceList->List[0].Descriptors[0].u.Interrupt.MaximumVector = Interrupt; - + /* One more */ ++ResourceList->List[0].Count; } - + /* All good */ return STATUS_SUCCESS; } @@ -1013,11 +1013,11 @@ ULONG Count = 0, ListSize; NTSTATUS Status; PAGED_CODE(); - + /* Get ACPI resources */ HalpAcpiDetectResourceListSize(&Count); DPRINT("Resource count: %d\n", Count); - + /* Compute size of the list and allocate it */ ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + (Count * sizeof(IO_RESOURCE_DESCRIPTOR)); @@ -1028,14 +1028,14 @@ /* Initialize it */ RtlZeroMemory(RequirementsList, ListSize); RequirementsList->ListSize = ListSize; - + /* Build it */ Status = HalpBuildAcpiResourceList(RequirementsList); if (NT_SUCCESS(Status)) { /* It worked, return it */ *Requirements = RequirementsList; - + /* Validate the list */ ASSERT(RequirementsList->List[0].Count == Count); } @@ -1051,7 +1051,7 @@ /* Not enough memory */ Status = STATUS_INSUFFICIENT_RESOURCES; } - + /* Return the status */ return Status; } Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -116,7 +116,7 @@ /* Create the FDO */ Status = IoCreateDevice(DriverObject, - sizeof(FDO_EXTENSION), + sizeof(FDO_EXTENSION), NULL, FILE_DEVICE_BUS_EXTENDER, 0, @@ -128,17 +128,17 @@ DbgBreakPoint(); return Status; } - + /* Setup the FDO extension */ FdoExtension = DeviceObject->DeviceExtension; FdoExtension->ExtensionType = FdoExtensionType; FdoExtension->PhysicalDeviceObject = TargetDevice; FdoExtension->FunctionalDeviceObject = DeviceObject; FdoExtension->ChildPdoList = NULL; - + /* FDO is done initializing */ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - + /* Attach to the physical device object (the bus) */ AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, TargetDevice); if (!AttachedDevice) @@ -187,11 +187,11 @@ PDEVICE_RELATIONS PdoRelations, FdoRelations; PDEVICE_OBJECT* ObjectEntry; ULONG i = 0, PdoCount = 0; - + /* Get FDO device extension and PDO count */ FdoExtension = DeviceObject->DeviceExtension; ExtensionType = FdoExtension->ExtensionType; - + /* What do they want? */ if (RelationType == BusRelations) { @@ -220,10 +220,10 @@ sizeof(PDEVICE_OBJECT) * PdoCount, ' laH'); if (!FdoRelations) return STATUS_INSUFFICIENT_RESOURCES; - + /* Save our count */ FdoRelations->Count = PdoCount; - + /* Query existing relations */ ObjectEntry = FdoRelations->Objects; if (*DeviceRelations) @@ -239,11 +239,11 @@ } while (++i < (*DeviceRelations)->Count); } - + /* Free existing structure */ ExFreePool(*DeviceRelations); } - + /* Now check if we have a PDO list */ PdoExtension = FdoExtension->ChildPdoList; if (PdoExtension) @@ -254,13 +254,13 @@ /* Save our own PDO and reference it */ *ObjectEntry++ = PdoExtension->PhysicalDeviceObject; ObReferenceObject(PdoExtension->PhysicalDeviceObject); - + /* Go to our next PDO */ PdoExtension = PdoExtension->Next; } while (PdoExtension); } - + /* Return the new structure */ *DeviceRelations = FdoRelations; return STATUS_SUCCESS; @@ -277,18 +277,18 @@ sizeof(DEVICE_RELATIONS), ' laH'); if (!PdoRelations) return STATUS_INSUFFICIENT_RESOURCES; - + /* Fill it out and reference us */ PdoRelations->Count = 1; PdoRelations->Objects[0] = DeviceObject; ObReferenceObject(DeviceObject); - + /* Return it */ *DeviceRelations = PdoRelations; return STATUS_SUCCESS; } } - + /* We don't support anything else */ return STATUS_NOT_SUPPORTED; } @@ -301,7 +301,7 @@ //PPDO_EXTENSION PdoExtension; NTSTATUS Status; PAGED_CODE(); - + /* Get the extension and check for valid version */ //PdoExtension = DeviceObject->DeviceExtension; ASSERT(Capabilities->Version == 1); @@ -310,33 +310,33 @@ /* Can't lock or eject us */ Capabilities->LockSupported = FALSE; Capabilities->EjectSupported = FALSE; - + /* Can't remove or dock us */ Capabilities->Removable = FALSE; Capabilities->DockDevice = FALSE; - + /* Can't access us raw */ Capabilities->RawDeviceOK = FALSE; - + /* We have a unique ID, and don't bother the user */ Capabilities->UniqueID = TRUE; Capabilities->SilentInstall = TRUE; - + /* Fill out the adress */ Capabilities->Address = InterfaceTypeUndefined; Capabilities->UINumber = InterfaceTypeUndefined; - + /* Fill out latencies */ Capabilities->D1Latency = 0; Capabilities->D2Latency = 0; Capabilities->D3Latency = 0; - + /* Fill out supported device states */ Capabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; Capabilities->DeviceState[PowerSystemHibernate] = PowerDeviceD3; Capabilities->DeviceState[PowerSystemShutdown] = PowerDeviceD3; Capabilities->DeviceState[PowerSystemSleeping3] = PowerDeviceD3; - + /* Done */ Status = STATUS_SUCCESS; } @@ -345,7 +345,7 @@ /* Fail */ Status = STATUS_NOT_SUPPORTED; } - + /* Return status */ return Status; } @@ -363,16 +363,16 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDesc; ULONG i; PAGED_CODE(); - + /* Only the ACPI PDO has requirements */ if (DeviceExtension->PdoType == AcpiPdo) { /* Query ACPI requirements */ Status = HalpQueryAcpiResourceRequirements(&RequirementsList); if (!NT_SUCCESS(Status)) return Status; - + ASSERT(RequirementsList->AlternativeLists == 1); - + /* Allocate the resourcel ist */ ResourceList = ExAllocatePoolWithTag(PagedPool, sizeof(CM_RESOURCE_LIST), @@ -384,7 +384,7 @@ ExFreePoolWithTag(RequirementsList, ' laH'); return Status; } - + /* Initialize it */ RtlZeroMemory(ResourceList, sizeof(CM_RESOURCE_LIST)); ResourceList->Count = 1; @@ -432,7 +432,7 @@ else if (DeviceExtension->PdoType == WdPdo) { /* Watchdog doesn't */ - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } else { @@ -448,7 +448,7 @@ { PPDO_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; PAGED_CODE(); - + /* Only the ACPI PDO has requirements */ if (DeviceExtension->PdoType == AcpiPdo) { @@ -458,7 +458,7 @@ else if (DeviceExtension->PdoType == WdPdo) { /* Watchdog doesn't */ - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } else { @@ -478,7 +478,7 @@ PWCHAR CurrentId; WCHAR Id[100]; NTSTATUS Status; - ULONG Length = 0; + SIZE_T Length = 0; PWCHAR Buffer; /* Get the PDO type */ @@ -491,7 +491,7 @@ { case BusQueryDeviceID: case BusQueryHardwareIDs: - + /* What kind of PDO is this? */ if (PdoType == AcpiPdo) { @@ -521,7 +521,7 @@ return STATUS_NOT_SUPPORTED; } break; - + case BusQueryInstanceID: /* Instance ID */ @@ -529,15 +529,15 @@ RtlCopyMemory(Id, CurrentId, (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL)); Length += (wcslen(CurrentId) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); break; - + case BusQueryCompatibleIDs: default: - + /* We don't support anything else */ return STATUS_NOT_SUPPORTED; } - - + + /* Allocate the buffer */ Buffer = ExAllocatePoolWithTag(PagedPool, Length + sizeof(UNICODE_NULL), @@ -547,7 +547,7 @@ /* Copy the string and null-terminate it */ RtlCopyMemory(Buffer, Id, Length); Buffer[Length / sizeof(WCHAR)] = UNICODE_NULL; - + /* Return string */ *BusQueryId = Buffer; Status = STATUS_SUCCESS; @@ -558,11 +558,11 @@ /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; } - + /* Return status */ return Status; } - + NTSTATUS NTAPI HalpQueryIdFdo(IN PDEVICE_OBJECT DeviceObject, @@ -570,10 +570,10 @@ OUT PUSHORT *BusQueryId) { NTSTATUS Status; - ULONG Length; + SIZE_T Length; PWCHAR Id; PWCHAR Buffer; - + /* What kind of ID is being requested? */ DPRINT("ID: %d\n", IdType); switch (IdType) @@ -584,26 +584,26 @@ break; case BusQueryHardwareIDs: - + /* This is our hardware ID */ Id = HalHardwareIdString; break; - + case BusQueryInstanceID: - + /* And our instance ID */ Id = L"0"; break; - + default: - + /* We don't support anything else */ return STATUS_NOT_SUPPORTED; } - + /* Calculate the length */ Length = (wcslen(Id) * sizeof(WCHAR)) + sizeof(UNICODE_NULL); - + /* Allocate the buffer */ Buffer = ExAllocatePoolWithTag(PagedPool, Length + sizeof(UNICODE_NULL), @@ -639,12 +639,12 @@ PFDO_EXTENSION FdoExtension; NTSTATUS Status; UCHAR Minor; - + /* Get the device extension and stack location */ FdoExtension = DeviceObject->DeviceExtension; IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Minor = IoStackLocation->MinorFunction; - + /* FDO? */ if (FdoExtension->ExtensionType == FdoExtensionType) { @@ -652,14 +652,14 @@ switch (Minor) { case IRP_MN_QUERY_DEVICE_RELATIONS: - + /* Call the worker */ DPRINT("Querying device relations for FDO\n"); Status = HalpQueryDeviceRelations(DeviceObject, IoStackLocation->Parameters.QueryDeviceRelations.Type, (PVOID)&Irp->IoStatus.Information); break; - + case IRP_MN_QUERY_INTERFACE: /* Call the worker */ @@ -672,27 +672,27 @@ IoStackLocation->Parameters.QueryInterface.Interface, (PVOID)&Irp->IoStatus.Information); break; - - + + case IRP_MN_QUERY_ID: - + /* Call the worker */ DPRINT("Querying ID for FDO\n"); Status = HalpQueryIdFdo(DeviceObject, IoStackLocation->Parameters.QueryId.IdType, (PVOID)&Irp->IoStatus.Information); break; - + case IRP_MN_QUERY_CAPABILITIES: - + /* Call the worker */ DPRINT("Querying the capabilities for the FDO\n"); Status = HalpQueryCapabilities(DeviceObject, IoStackLocation->Parameters.DeviceCapabilities.Capabilities); break; - + default: - + DPRINT("Other IRP: %lx\n", Minor); Status = Irp->IoStatus.Status; break; @@ -711,41 +711,41 @@ /* Query the IRP type */ Status = STATUS_SUCCESS; switch (Minor) - { + { case IRP_MN_START_DEVICE: - + /* We only care about a PCI PDO */ DPRINT1("Start device received\n"); /* Complete the IRP normally */ break; - + case IRP_MN_REMOVE_DEVICE: /* Check if this is a PCI device */ DPRINT1("Remove device received\n"); - + /* We're done */ Status = STATUS_SUCCESS; break; case IRP_MN_SURPRISE_REMOVAL: - + /* Inherit whatever status we had */ DPRINT1("Surprise removal IRP\n"); Status = Irp->IoStatus.Status; break; - + case IRP_MN_QUERY_DEVICE_RELATIONS: - + /* Query the device relations */ DPRINT("Querying PDO relations\n"); Status = HalpQueryDeviceRelations(DeviceObject, IoStackLocation->Parameters.QueryDeviceRelations.Type, (PVOID)&Irp->IoStatus.Information); break; - + case IRP_MN_QUERY_INTERFACE: - + /* Call the worker */ DPRINT("Querying interface for PDO\n"); Status = HalpQueryInterface(DeviceObject, @@ -756,24 +756,24 @@ IoStackLocation->Parameters.QueryInterface.Interface, (PVOID)&Irp->IoStatus.Information); break; - + case IRP_MN_QUERY_CAPABILITIES: - + /* Call the worker */ DPRINT("Querying the capabilities for the PDO\n"); Status = HalpQueryCapabilities(DeviceObject, IoStackLocation->Parameters.DeviceCapabilities.Capabilities); break; - + case IRP_MN_QUERY_RESOURCES: - + /* Call the worker */ DPRINT("Querying the resources for the PDO\n"); Status = HalpQueryResources(DeviceObject, (PVOID)&Irp->IoStatus.Information); break; - + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: - + /* Call the worker */ DPRINT("Querying the resource requirements for the PDO\n"); Status = HalpQueryResourceRequirements(DeviceObject, @@ -781,25 +781,25 @@ break; case IRP_MN_QUERY_ID: - + /* Call the worker */ DPRINT("Query the ID for the PDO\n"); Status = HalpQueryIdPdo(DeviceObject, IoStackLocation->Parameters.QueryId.IdType, (PVOID)&Irp->IoStatus.Information); break; - + default: - + /* We don't handle anything else, so inherit the old state */ DPRINT("Illegal IRP: %lx\n", Minor); Status = Irp->IoStatus.Status; break; } - + /* If it's not supported, inherit the old status */ if (Status == STATUS_NOT_SUPPORTED) Status = Irp->IoStatus.Status; - + /* Complete the IRP */ DPRINT("IRP completed with status: %lx\n", Status); Irp->IoStatus.Status = Status; @@ -815,7 +815,7 @@ { DPRINT1("HAL: PnP Driver WMI!\n"); while (TRUE); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } NTSTATUS @@ -824,7 +824,7 @@ IN PIRP Irp) { DPRINT1("HAL: PnP Driver Power!\n"); - return STATUS_SUCCESS; + return STATUS_SUCCESS; } NTSTATUS @@ -890,7 +890,7 @@ NTSTATUS Status; UNICODE_STRING DriverString; PAGED_CODE(); - + /* Create the driver */ RtlInitUnicodeString(&DriverString, L"\\Driver\\ACPI_HAL"); Status = IoCreateDriver(&DriverString, HalpDriverEntry); Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -309,7 +309,7 @@ } RtlClearBit(AdapterObject->MapRegisters, - CurrentEntry - AdapterObject->MapRegisterBase); + (ULONG)(CurrentEntry - AdapterObject->MapRegisterBase)); CurrentEntry->VirtualAddress = VirtualAddress; CurrentEntry->PhysicalAddress = PhysicalAddress; @@ -553,7 +553,7 @@ { /* Set the Request Data */ WRITE_PORT_UCHAR(&((PDMA1_CONTROL)AdapterBaseVa)->Mode, DmaMode.Byte); - + /* Unmask DMA Channel */ WRITE_PORT_UCHAR(&((PDMA1_CONTROL)AdapterBaseVa)->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); @@ -562,7 +562,7 @@ { /* Set the Request Data */ WRITE_PORT_UCHAR(&((PDMA2_CONTROL)AdapterBaseVa)->Mode, DmaMode.Byte); - + /* Unmask DMA Channel */ WRITE_PORT_UCHAR(&((PDMA2_CONTROL)AdapterBaseVa)->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); @@ -917,7 +917,7 @@ ULONG MapRegisterCount; BOOLEAN WriteToDevice; } SCATTER_GATHER_CONTEXT, *PSCATTER_GATHER_CONTEXT; - + IO_ALLOCATION_ACTION NTAPI @@ -932,10 +932,10 @@ SCATTER_GATHER_ELEMENT TempElements[MAX_SG_ELEMENTS]; ULONG ElementCount = 0, RemainingLength = AdapterControlContext->Length; PUCHAR CurrentVa = AdapterControlContext->CurrentVa; - + /* Store the map register base for later in HalPutScatterGatherList */ AdapterControlContext->MapRegisterBase = MapRegisterBase; - + while (RemainingLength > 0 && ElementCount < MAX_SG_ELEMENTS) { TempElements[ElementCount].Length = RemainingLength; @@ -948,16 +948,16 @@ AdapterControlContext->WriteToDevice); if (TempElements[ElementCount].Length == 0) break; - + DPRINT("Allocated one S/G element: 0x%I64u with length: 0x%x\n", TempElements[ElementCount].Address.QuadPart, TempElements[ElementCount].Length); - + ASSERT(TempElements[ElementCount].Length <= RemainingLength); RemainingLength -= TempElements[ElementCount].Length; ElementCount++; } - + if (RemainingLength > 0) { DPRINT1("Scatter/gather list construction failed!\n"); @@ -974,14 +974,14 @@ RtlCopyMemory(ScatterGatherList->Elements, TempElements, sizeof(SCATTER_GATHER_ELEMENT) * ElementCount); - + DPRINT("Initiating S/G DMA with %d element(s)\n", ElementCount); - + AdapterControlContext->AdapterListControlRoutine(DeviceObject, Irp, ScatterGatherList, AdapterControlContext->AdapterListControlContext); - + return DeallocateObjectKeepRegisters; } @@ -1025,10 +1025,10 @@ IN BOOLEAN WriteToDevice) { PSCATTER_GATHER_CONTEXT AdapterControlContext; - + AdapterControlContext = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCATTER_GATHER_CONTEXT), TAG_DMA); if (!AdapterControlContext) return STATUS_INSUFFICIENT_RESOURCES; - + AdapterControlContext->AdapterObject = AdapterObject; AdapterControlContext->Mdl = Mdl; AdapterControlContext->CurrentVa = CurrentVa; @@ -1037,7 +1037,7 @@ AdapterControlContext->AdapterListControlRoutine = ExecutionRoutine; AdapterControlContext->AdapterListControlContext = Context; AdapterControlContext->WriteToDevice = WriteToDevice; - + return IoAllocateAdapterChannel(AdapterObject, DeviceObject, AdapterControlContext->MapRegisterCount, @@ -1071,7 +1071,7 @@ { PSCATTER_GATHER_CONTEXT AdapterControlContext = (PSCATTER_GATHER_CONTEXT)ScatterGather->Reserved; ULONG i; - + for (i = 0; i < ScatterGather->NumberOfElements; i++) { IoFlushAdapterBuffers(AdapterObject, @@ -1086,9 +1086,9 @@ IoFreeMapRegisters(AdapterObject, AdapterControlContext->MapRegisterBase, AdapterControlContext->MapRegisterCount); - + DPRINT("S/G DMA has finished!\n"); - + ExFreePoolWithTag(AdapterControlContext, TAG_DMA); ExFreePoolWithTag(ScatterGather, TAG_DMA); } @@ -1141,10 +1141,10 @@ do { OldCount = Count; - + /* Send Reset */ WRITE_PORT_UCHAR(&DmaControl1->ClearBytePointer, 0); - + /* Read Count */ Count = READ_PORT_UCHAR(&DmaControl1->DmaAddressCount [AdapterObject->ChannelNumber].DmaBaseCount); @@ -1160,10 +1160,10 @@ do { OldCount = Count; - + /* Send Reset */ WRITE_PORT_UCHAR(&DmaControl2->ClearBytePointer, 0); - + /* Read Count */ Count = READ_PORT_UCHAR(&DmaControl2->DmaAddressCount [AdapterObject->ChannelNumber].DmaBaseCount); @@ -1327,7 +1327,7 @@ if (Index == MAXULONG) { InsertTailList(&MasterAdapter->AdapterQueue, &AdapterObject->AdapterQueue); - + WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(GROW_WORK_ITEM), TAG_DMA); @@ -1439,7 +1439,7 @@ DeviceQueueEntry = KeRemoveDeviceQueue(&AdapterObject->ChannelWaitQueue); if (!DeviceQueueEntry) break; - + WaitContextBlock = CONTAINING_RECORD(DeviceQueueEntry, WAIT_CONTEXT_BLOCK, WaitQueueEntry); @@ -1547,7 +1547,7 @@ RealMapRegisterBase = (PROS_MAP_REGISTER_ENTRY)((ULONG_PTR)MapRegisterBase & ~MAP_BASE_SW_SG); RtlClearBits(MasterAdapter->MapRegisters, - RealMapRegisterBase - MasterAdapter->MapRegisterBase, + (ULONG)(RealMapRegisterBase - MasterAdapter->MapRegisterBase), NumberOfMapRegisters); } @@ -1593,12 +1593,12 @@ { KeAcquireSpinLock(&MasterAdapter->SpinLock, &OldIrql); RtlClearBits(MasterAdapter->MapRegisters, - AdapterObject->MapRegisterBase - - MasterAdapter->MapRegisterBase, + (ULONG)(AdapterObject->MapRegisterBase - + MasterAdapter->MapRegisterBase), AdapterObject->NumberOfMapRegisters); KeReleaseSpinLock(&MasterAdapter->SpinLock, OldIrql); } - + IoFreeAdapterChannel(AdapterObject); break; @@ -2011,16 +2011,16 @@ /* Reset Register */ WRITE_PORT_UCHAR(&DmaControl1->ClearBytePointer, 0); - + /* Set the Mode */ WRITE_PORT_UCHAR(&DmaControl1->Mode, AdapterMode.Byte); - + /* Set the Offset Register */ WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseAddress, (UCHAR)(TransferOffset)); WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseAddress, (UCHAR)(TransferOffset >> 8)); - + /* Set the Page Register */ WRITE_PORT_UCHAR(AdapterObject->PagePort + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages), (UCHAR)(PhysicalAddress.LowPart >> 16)); @@ -2029,13 +2029,13 @@ WRITE_PORT_UCHAR(AdapterObject->PagePort + FIELD_OFFSET(EISA_CONTROL, DmaController2Pages), 0); } - + /* Set the Length */ WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseCount, (UCHAR)(TransferLength - 1)); WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseCount, (UCHAR)((TransferLength - 1) >> 8)); - + /* Unmask the Channel */ WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); } @@ -2045,16 +2045,16 @@ /* Reset Register */ WRITE_PORT_UCHAR(&DmaControl2->ClearBytePointer, 0); - + /* Set the Mode */ WRITE_PORT_UCHAR(&DmaControl2->Mode, AdapterMode.Byte); - + /* Set the Offset Register */ WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseAddress, (UCHAR)(TransferOffset)); WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseAddress, (UCHAR)(TransferOffset >> 8)); - + /* Set the Page Register */ WRITE_PORT_UCHAR(AdapterObject->PagePort + FIELD_OFFSET(EISA_CONTROL, DmaController1Pages), (UCHAR)(PhysicalAddress.u.LowPart >> 16)); @@ -2063,13 +2063,13 @@ WRITE_PORT_UCHAR(AdapterObject->PagePort + FIELD_OFFSET(EISA_CONTROL, DmaController2Pages), 0); } - + /* Set the Length */ WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseCount, (UCHAR)(TransferLength - 1)); WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNumber].DmaBaseCount, (UCHAR)((TransferLength - 1) >> 8)); - + /* Unmask the Channel */ WRITE_PORT_UCHAR(&DmaControl2->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); Modified: trunk/reactos/hal/halx86/generic/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/memory.… ============================================================================== --- trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -31,21 +31,21 @@ IN PFN_NUMBER PageCount, IN BOOLEAN Aligned) { - ULONG UsedDescriptors, Alignment; + ULONG UsedDescriptors; ULONG_PTR PhysicalAddress; - PFN_NUMBER MaxPage, BasePage; + PFN_NUMBER MaxPage, BasePage, Alignment; PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; - + /* Highest page we'll go */ MaxPage = MaxAddress >> PAGE_SHIFT; - + /* We need at least two blocks */ if ((HalpUsedAllocDescriptors + 2) > 64) return 0; - + /* Remember how many we have now */ UsedDescriptors = HalpUsedAllocDescriptors; - + /* Loop the loader block memory descriptors */ NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) @@ -54,13 +54,13 @@ MdBlock = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - + /* No alignment by default */ Alignment = 0; - + /* Unless requested, in which case we use a 64KB block alignment */ if (Aligned) Alignment = ((MdBlock->BasePage + 0x0F) & ~0x0F) - MdBlock->BasePage; - + /* Search for free memory */ if ((MdBlock->MemoryType == LoaderFree) || (MdBlock->MemoryType == LoaderFirmwareTemporary)) @@ -71,30 +71,30 @@ (MdBlock->PageCount >= PageCount + Alignment) && (BasePage + PageCount + Alignment < MaxPage)) { - + /* We found an address */ PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; break; } } - + /* Keep trying */ NextEntry = NextEntry->Flink; } - + /* If we didn't find anything, get out of here */ if (NextEntry == &LoaderBlock->MemoryDescriptorListHead) return 0; - + /* Okay, now get a descriptor */ NewBlock = &HalpAllocationDescriptorArray[HalpUsedAllocDescriptors]; NewBlock->PageCount = (ULONG)PageCount; NewBlock->BasePage = MdBlock->BasePage + Alignment; NewBlock->MemoryType = LoaderHALCachedMemory; - + /* Update count */ UsedDescriptors++; HalpUsedAllocDescriptors = UsedDescriptors; - + /* Check if we had any alignment */ if (Alignment) { @@ -105,14 +105,14 @@ FreeBlock = &HalpAllocationDescriptorArray[UsedDescriptors]; FreeBlock->PageCount = MdBlock->PageCount - Alignment - (ULONG)PageCount; FreeBlock->BasePage = MdBlock->BasePage + Alignment + (ULONG)PageCount; - + /* One more */ HalpUsedAllocDescriptors++; - + /* Insert it into the list */ InsertHeadList(&MdBlock->ListEntry, &FreeBlock->ListEntry); } - + /* Trim the original block to the alignment only */ MdBlock->PageCount = Alignment; @@ -124,7 +124,7 @@ /* Consume memory from this block */ MdBlock->BasePage += (ULONG)PageCount; MdBlock->PageCount -= (ULONG)PageCount; - + /* Insert the descriptor before the original one */ InsertTailList(&MdBlock->ListEntry, &NewBlock->ListEntry); @@ -139,7 +139,7 @@ PVOID NTAPI HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, - IN PFN_NUMBER PageCount) + IN PFN_COUNT PageCount) { PHARDWARE_PTE PointerPte; PFN_NUMBER UsedPages = 0; @@ -207,7 +207,7 @@ VOID NTAPI HalpUnmapVirtualAddress(IN PVOID VirtualAddress, - IN PFN_NUMBER PageCount) + IN PFN_COUNT PageCount) { PHARDWARE_PTE PointerPte; ULONG i; Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -47,7 +47,7 @@ REG_BINARY, HalpSerialNumber, HalpSerialLen); - + /* Close the handle */ ZwClose(Handle); } @@ -63,7 +63,7 @@ HANDLE KeyHandle; HANDLE Handle; ULONG Value = HalDisableFirmwareMapper ? 1 : 0; - + /* Open the control set key */ RtlInitUnicodeString(&KeyString, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); @@ -79,7 +79,7 @@ TRUE); /* Close root key */ ZwClose(Handle); - + /* Check if PNP BIOS key exists */ if (NT_SUCCESS(Status)) { @@ -91,28 +91,28 @@ REG_DWORD, &Value, sizeof(Value)); - + /* Close subkey */ ZwClose(KeyHandle); } } - + /* Return status */ return Status; } -NTSTATUS +NTSTATUS NTAPI HalpOpenRegistryKey(IN PHANDLE KeyHandle, IN HANDLE RootKey, IN PUNICODE_STRING KeyName, - IN ACCESS_MASK DesiredAccess, + IN ACCESS_MASK DesiredAccess, IN BOOLEAN Create) { NTSTATUS Status; ULONG Disposition; OBJECT_ATTRIBUTES ObjectAttributes; - + /* Setup the attributes we received */ InitializeObjectAttributes(&ObjectAttributes, KeyName, @@ -137,7 +137,7 @@ /* Open the key */ Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); } - + /* We're done */ return Status; } @@ -157,7 +157,7 @@ NTAPI HalpFlushTLB(VOID) { - ULONG Flags, Cr4; + ULONG_PTR Flags, Cr4; INT CpuInfo[4]; ULONG_PTR PageDirectory; @@ -250,7 +250,7 @@ // // Fill the screen // - InbvSolidColorFill(0, 0, 639, 479, 1); + InbvSolidColorFill(0, 0, 639, 479, 1); InbvSetScrollRegion(0, 0, 639, 479); // Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -21,7 +21,7 @@ /* GLOBALS *******************************************************************/ -ULONG HalpSystemHardwareFlags; +ULONG_PTR HalpSystemHardwareFlags; KSPIN_LOCK HalpSystemHardwareLock; /* FUNCTIONS *****************************************************************/ @@ -226,7 +226,7 @@ NTAPI HalpAcquireCmosSpinLock(VOID) { - ULONG Flags; + ULONG_PTR Flags; /* Get flags and disable interrupts */ Flags = __readeflags(); @@ -243,7 +243,7 @@ NTAPI HalpReleaseCmosSpinLock(VOID) { - ULONG Flags; + ULONG_PTR Flags; /* Get the flags */ Flags = HalpSystemHardwareFlags; Modified: trunk/reactos/hal/halx86/generic/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/usage.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/usage.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -72,28 +72,28 @@ switch (Descriptor->Type) { case CmResourceTypeInterrupt: - + /* Interrupt goes by level */ *Scale = 0; *Value = RtlConvertUlongToLargeInteger(Descriptor->u.Interrupt.Level); break; - + case CmResourceTypePort: - + /* Port goes by port address */ *Scale = 1; *Value = Descriptor->u.Port.Start; break; - + case CmResourceTypeMemory: - + /* Memory goes by base address */ *Scale = 2; *Value = Descriptor->u.Memory.Start; break; - + default: - + /* Anything else */ *Scale = 4; *Value = RtlConvertUlongToLargeInteger(0); @@ -111,7 +111,7 @@ /* Exclusive interrupt entry */ RawDescriptor->Type = CmResourceTypeInterrupt; RawDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - + /* Check the interrupt type */ if (HalpIDTUsageFlags[Entry].Flags & IDT_LATCHED) { @@ -127,13 +127,13 @@ /* Get vector and level from IDT usage */ RawDescriptor->u.Interrupt.Vector = HalpIDTUsage[Entry].BusReleativeVector; RawDescriptor->u.Interrupt.Level = HalpIDTUsage[Entry].BusReleativeVector; - + /* Affinity is all the CPUs */ RawDescriptor->u.Interrupt.Affinity = HalpActiveProcessors; - + /* The translated copy is identical */ RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* But the vector and IRQL must be set correctly */ TranslatedDescriptor->u.Interrupt.Vector = Entry; TranslatedDescriptor->u.Interrupt.Level = HalpIDTUsage[Entry].Irql; @@ -149,11 +149,11 @@ IN PCM_PARTIAL_RESOURCE_DESCRIPTOR TranslatedDescriptor) { ULONG AddressSpace; - + /* Set the type and make it exclusive */ RawDescriptor->Type = CurrentAddress->Type; RawDescriptor->ShareDisposition = CmResourceShareDriverExclusive; - + /* Check what this is */ if (RawDescriptor->Type == CmResourceTypePort) { @@ -163,7 +163,7 @@ RawDescriptor->u.Port.Start.HighPart = 0; RawDescriptor->u.Port.Start.LowPart = CurrentAddress->Element[Element].Start; RawDescriptor->u.Port.Length = CurrentAddress->Element[Element].Length; - + /* Determine if 16-bit port addresses are allowed */ RawDescriptor->Flags |= HalpIs16BitPortDecodeSupported(); } @@ -178,10 +178,10 @@ RawDescriptor->u.Memory.Start.LowPart = CurrentAddress->Element[Element].Start; RawDescriptor->u.Memory.Length = CurrentAddress->Element[Element].Length; } - + /* Make an identical copy to begin with */ RtlCopyMemory(TranslatedDescriptor, RawDescriptor, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - + /* Check what this is */ if (RawDescriptor->Type == CmResourceTypePort) { @@ -191,7 +191,7 @@ RawDescriptor->u.Port.Start, &AddressSpace, &TranslatedDescriptor->u.Port.Start); - + /* If it turns out this is memory once translated, flag it */ if (AddressSpace == 0) TranslatedDescriptor->Flags = CM_RESOURCE_PORT_MEMORY; @@ -223,18 +223,18 @@ ADDRESS_USAGE *CurrentAddress; LARGE_INTEGER CurrentSortValue, SortValue; DbgPrint("%wZ Detected\n", HalName); - + /* Check if KD is using a COM port */ if (KdComPortInUse) { /* Enter it into the I/O space */ - HalpComIoSpace.Element[0].Start = (ULONG_PTR)KdComPortInUse; + HalpComIoSpace.Element[0].Start = PtrToUlong(KdComPortInUse); HalpComIoSpace.Next = HalpAddressUsageList; HalpAddressUsageList = &HalpComIoSpace; - + /* Use the debug port table if we have one */ HalpGetInfoFromACPI = HalpGetDebugPortTable(); - + /* Check if we're using ACPI */ if (!HalpGetInfoFromACPI) { @@ -256,10 +256,10 @@ } } } - + /* On non-ACPI systems, we need to build an address map */ HalpBuildAddressMap(); - + /* Allocate the master raw and translated lists */ RawList = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE * 2, ' laH'); TranslatedList = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE * 2, ' laH'); @@ -272,14 +272,14 @@ (ULONG_PTR)__FILE__, __LINE__); } - + /* Zero out the lists */ RtlZeroMemory(RawList, PAGE_SIZE * 2); RtlZeroMemory(TranslatedList, PAGE_SIZE * 2); /* Set the interface type to begin with */ RawList->List[0].InterfaceType = InterfaceTypeUndefined; - + /* Loop all IDT entries that are not IRQs */ for (i = 0; i < PRIMARY_VECTOR_BASE; i++) { @@ -291,20 +291,20 @@ HalpIDTUsage[i].BusReleativeVector = (UCHAR)i; } } - + /* Our full raw descriptors start here */ RawFull = RawList->List; - + /* Keep track of the current partial raw and translated descriptors */ CurrentRaw = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)RawList->List; CurrentTranslated = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)TranslatedList->List; - + /* Do two passes */ for (ReportType = 0; ReportType < 2; ReportType++) { /* Pass 0 is for device usage */ if (ReportType == 0) - { + { FlagMatch = IDT_DEVICE & ~IDT_REGISTERED; Interface = InterfaceType; } @@ -314,10 +314,10 @@ FlagMatch = IDT_INTERNAL & ~IDT_REGISTERED; Interface = Internal; } - + /* Reset loop variables */ i = Element = 0; - + /* Start looping our address uage list and interrupts */ CurrentAddress = HalpAddressUsageList; while (TRUE) @@ -343,7 +343,7 @@ { /* This is an address instead */ if (!CurrentAddress) break; - + /* Check if the address should be reported */ if (!(CurrentAddress->Flags & FlagMatch) || !(CurrentAddress->Element[Element].Length)) @@ -353,7 +353,7 @@ CurrentAddress = CurrentAddress->Next; continue; } - + /* Otherwise, parse the entry */ HalpBuildPartialFromAddress(Interface, CurrentAddress, @@ -362,7 +362,7 @@ &TranslatedPartial); Element++; } - + /* Check for interface change */ if (RawFull->InterfaceType != Interface) { @@ -373,67 +373,67 @@ /* The full descriptor follows wherever we were */ RawFull = (PCM_FULL_RESOURCE_DESCRIPTOR)CurrentRaw; TranslatedFull = (PCM_FULL_RESOURCE_DESCRIPTOR)CurrentTranslated; - + /* And it is of this new interface type */ RawFull->InterfaceType = Interface; TranslatedFull->InterfaceType = Interface; - + /* And its partial descriptors begin here */ RawPartialList = &RawFull->PartialResourceList; TranslatedPartialList = &TranslatedFull->PartialResourceList; - + /* And our next full descriptor should follow here */ CurrentRaw = RawFull->PartialResourceList.PartialDescriptors; CurrentTranslated = TranslatedFull->PartialResourceList.PartialDescriptors; } - + /* We have written a new partial descriptor */ RawPartialList->Count++; TranslatedPartialList->Count++; - + /* Copy our local descriptors into the actual list */ RtlCopyMemory(CurrentRaw, &RawPartial, sizeof(RawPartial)); RtlCopyMemory(CurrentTranslated, &TranslatedPartial, sizeof(TranslatedPartial)); - + /* Move to the next partial descriptor */ CurrentRaw++; CurrentTranslated++; } } - + /* Get the final list of the size for the kernel call later */ - ListSize = (ULONG_PTR)CurrentRaw - (ULONG_PTR)RawList; - + ListSize = (ULONG)((ULONG_PTR)CurrentRaw - (ULONG_PTR)RawList); + /* Now reset back to the first full descriptor */ RawFull = RawList->List; TranslatedFull = TranslatedList->List; - + /* And loop all the full descriptors */ for (i = 0; i < RawList->Count; i++) { /* Get the first partial descriptor in this list */ CurrentRaw = RawFull->PartialResourceList.PartialDescriptors; CurrentTranslated = TranslatedFull->PartialResourceList.PartialDescriptors; - + /* Get the count of partials in this list */ Count = RawFull->PartialResourceList.Count; - + /* Loop all the partials in this list */ for (j = 0; j < Count; j++) { /* Get the sort value at this point */ HalpGetResourceSortValue(CurrentRaw, &CurrentScale, &CurrentSortValue); - + /* Save the current sort pointer */ SortedRaw = CurrentRaw; SortedTranslated = CurrentTranslated; - + /* Loop all descriptors starting from this one */ for (k = j; k < Count; k++) { /* Get the sort value at the sort point */ HalpGetResourceSortValue(SortedRaw, &SortScale, &SortValue); - + /* Check if a swap needs to occur */ if ((SortScale < CurrentScale) || ((SortScale == CurrentScale) && @@ -443,44 +443,44 @@ RtlCopyMemory(&RawPartial, CurrentRaw, sizeof(RawPartial)); RtlCopyMemory(CurrentRaw, SortedRaw, sizeof(RawPartial)); RtlCopyMemory(SortedRaw, &RawPartial, sizeof(RawPartial)); - + /* Swap translated partial in the same way */ RtlCopyMemory(&TranslatedPartial, CurrentTranslated, sizeof(TranslatedPartial)); RtlCopyMemory(CurrentTranslated, SortedTranslated, sizeof(TranslatedPartial)); RtlCopyMemory(SortedTranslated, &TranslatedPartial, sizeof(TranslatedPartial)); - + /* Update the sort value at this point */ HalpGetResourceSortValue(CurrentRaw, &CurrentScale, &CurrentSortValue); } - + /* The sort location has been updated */ SortedRaw++; SortedTranslated++; } - + /* Move to the next partial */ CurrentRaw++; CurrentTranslated++; } - + /* Move to the next full descriptor */ RawFull = (PCM_FULL_RESOURCE_DESCRIPTOR)CurrentRaw; TranslatedFull = (PCM_FULL_RESOURCE_DESCRIPTOR)CurrentTranslated; } - + /* Mark this is an ACPI system, if it is */ HalpMarkAcpiHal(); - + /* Tell the kernel about all this */ IoReportHalResourceUsage(HalName, RawList, TranslatedList, ListSize); - + /* Free our lists */ ExFreePool(RawList); ExFreePool(TranslatedList); - + /* Get the machine's serial number */ HalpReportSerialNumber(); } @@ -515,7 +515,7 @@ { /* Set the IDT_LATCHED flag for latched interrupts */ if (Mode == Latched) Flags |= IDT_LATCHED; - + /* Register the vector */ HalpRegisterVector(Flags, BusVector, SystemVector, Irql); @@ -537,7 +537,7 @@ ULONG ResultLength; HANDLE Handle; NTSTATUS Status; - KEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; + KEY_VALUE_PARTIAL_INFORMATION KeyValueInformation; /* Set default */ HalpNMIDumpFlag = 0; @@ -548,7 +548,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - + /* Open crash key */ Status = ZwOpenKey(&Handle, KEY_READ, &ObjectAttributes); if (NT_SUCCESS(Status)) @@ -570,7 +570,7 @@ HalpNMIDumpFlag = KeyValueInformation.Data[0]; } } - + /* We're done */ ZwClose(Handle); } Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -652,14 +652,14 @@ NTAPI HalpMapPhysicalMemory64( IN PHYSICAL_ADDRESS PhysicalAddress, - IN PFN_NUMBER PageCount + IN PFN_COUNT PageCount ); VOID NTAPI HalpUnmapVirtualAddress( IN PVOID VirtualAddress, - IN PFN_NUMBER NumberPages + IN PFN_COUNT NumberPages ); /* sysinfo.c */ @@ -846,7 +846,7 @@ #define KfLowerIrql KeLowerIrql #define KiEnterInterruptTrap(TrapFrame) /* We do all neccessary in asm code */ #define KiEoiHelper(TrapFrame) return /* Just return to the caller */ -#define HalBeginSystemInterrupt(Irql, Vector, OldIrql) TRUE +#define HalBeginSystemInterrupt(Irql, Vector, OldIrql) ((*(OldIrql) = PASSIVE_LEVEL), TRUE) #ifndef CONFIG_SMP /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ #define KiAcquireSpinLock(SpinLock) Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Wed Mar 28 12:15:54 2012 @@ -539,7 +539,7 @@ UNIMPLEMENTED; while (TRUE); } - + VOID NTAPI HalpPCIISALine2Pin(IN PBUS_HANDLER BusHandler, @@ -560,30 +560,30 @@ OUT PSUPPORTED_RANGE *Range) { PCI_COMMON_HEADER PciData; - + /* Read PCI configuration data */ HalGetBusData(PCIConfiguration, BusHandler->BusNumber, PciSlot.u.AsULONG, &PciData, PCI_COMMON_HDR_LENGTH); - + /* Make sure it's a real device */ if (PciData.VendorID == PCI_INVALID_VENDORID) return STATUS_UNSUCCESSFUL; - + /* Allocate the supported range structure */ *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), TAG_HAL); if (!*Range) return STATUS_INSUFFICIENT_RESOURCES; - + /* Set it up */ RtlZeroMemory(*Range, sizeof(SUPPORTED_RANGE)); (*Range)->Base = 1; - + /* If the PCI device has no IRQ, nothing to do */ if (!PciData.u.type0.InterruptPin) return STATUS_SUCCESS; - + /* FIXME: The PCI IRQ Routing Miniport should be called */ - + /* Also if the INT# seems bogus, nothing to do either */ if ((PciData.u.type0.InterruptLine == 0) || (PciData.u.type0.InterruptLine == 255)) @@ -591,7 +591,7 @@ /* Fake success */ return STATUS_SUCCESS; } - + /* Otherwise, the INT# should be valid, return it to the caller */ (*Range)->Base = PciData.u.type0.InterruptLine; (*Range)->Limit = PciData.u.type0.InterruptLine; @@ -639,7 +639,7 @@ /* Bail out if there aren't any */ if (!Found) return; - + /* FIXME: TODO */ DPRINT1("You have implemented the KD routines for searching PCI debugger" "devices, but you have forgotten to implement this routine\n"); @@ -664,11 +664,11 @@ PCI_SLOT_NUMBER SlotNumber; PSUPPORTED_RANGE Interrupt; NTSTATUS Status; - + /* Get PCI bus data */ BusData = BusHandler->BusData; SlotNumber.u.AsULONG = (*pResourceList)->SlotNumber; - + /* Get the IRQ supported range */ Status = BusData->GetIrqRange(BusHandler, RootHandler, SlotNumber, &Interrupt); if (!NT_SUCCESS(Status)) return Status; @@ -709,7 +709,7 @@ { PCI_COMMON_CONFIG PciConfig; SIZE_T Address; - SIZE_T ResourceCount; + ULONG ResourceCount; ULONG Size[PCI_TYPE0_ADDRESSES]; NTSTATUS Status = STATUS_SUCCESS; UCHAR Offset;

12 years, 9 months

[tkreuzer] 56259: [DBGHELP] Fix 64 bit compilation. "Should be sent to wine"(tm)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 11:08:41 2012 New Revision: 56259 URL: http://svn.reactos.org/svn/reactos?rev=56259&view=rev Log: [DBGHELP] Fix 64 bit compilation. "Should be sent to wine"(tm) Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff Modified: trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_x86_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_x86_64.c [iso-8859-1] Wed Mar 28 11:08:41 2012 @@ -281,10 +281,10 @@ if ((op0 & 0xf8) == 0x48) { if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE; + if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; switch (op1) { case 0x81: /* add $nnnn,%rsp */ - if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; if (op0 == 0x48 && op2 == 0xc4) { pc += 7; Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_ros.diff [iso-8859-1] Wed Mar 28 11:08:41 2012 @@ -3,9 +3,9 @@ --- stabs.c (revision 35085) +++ stabs.c (working copy) @@ -64,6 +64,8 @@ - + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); - + +#define strtoull _strtoui64 + /* Masks for n_type field */ @@ -16,11 +16,27 @@ --- cpu_sparc.c (revision 35085) +++ cpu_sparc.c (working copy) @@ -29,6 +29,8 @@ - + WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - + +#define IMAGE_FILE_MACHINE_SPARC 0x2000 + static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { +Index: cpu_x86_64.c +=================================================================== +--- cpu_x86_64.c (Revision 56237) ++++ cpu_x86_64.c (Arbeitskopie) +@@ -281,10 +281,10 @@ + if ((op0 & 0xf8) == 0x48) + { + if (!sw_read_mem(csw, pc + 1, &op1, 1)) return FALSE; ++ if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; + switch (op1) + { + case 0x81: /* add $nnnn,%rsp */ +- if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE; + if (op0 == 0x48 && op2 == 0xc4) + { + pc += 7;

12 years, 9 months

[tkreuzer] 56258: [CMD] Fix MSVC / 64 bit warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 09:50:04 2012 New Revision: 56258 URL: http://svn.reactos.org/svn/reactos?rev=56258&view=rev Log: [CMD] Fix MSVC / 64 bit warnings Modified: trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/mklink.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/set.c trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -817,7 +817,7 @@ static LPTSTR getName(const TCHAR* file, TCHAR * dest) { - int iLen; + INT_PTR iLen; LPTSTR end; /* Check for "." and ".." folders */ @@ -919,7 +919,7 @@ SHORT iScreenWidth; USHORT iColumns; USHORT iLines; - UINT iLongestName; + UINT_PTR iLongestName; TCHAR szTempFname[MAX_PATH]; DWORD i; DWORD j; @@ -944,7 +944,7 @@ /* Count the highest number of columns */ GetScreenSize(&iScreenWidth, 0); - iColumns = iScreenWidth / iLongestName; + iColumns = (USHORT)(iScreenWidth / iLongestName); /* Check if there is enough space for spaces between names */ if (((iLongestName * iColumns) + iColumns) >= (UINT)iScreenWidth) @@ -1301,7 +1301,7 @@ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ -{ +{ BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ HANDLE hSearch; /* The handle of the search */ HANDLE hRecSearch; /* The handle for searching recursivly */ Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -509,7 +509,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) { /* Length of string before we complete it */ - INT StartLength; + INT_PTR StartLength; /* Length of string after completed */ //INT EndLength; /* The number of chars added too it */ Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -94,15 +94,15 @@ * dynamically allocating enough space to hold it all */ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) { - DWORD Len = 0; - DWORD AllocLen = 1000; + SIZE_T Len = 0; + SIZE_T AllocLen = 1000; LPTSTR Contents = cmd_alloc(AllocLen * sizeof(TCHAR)); if (!Contents) return NULL; while (_fgetts(Buffer, CMDLINE_LENGTH, InputFile)) { - DWORD CharsRead = _tcslen(Buffer); + ULONG_PTR CharsRead = _tcslen(Buffer); while (Len + CharsRead >= AllocLen) { Contents = cmd_realloc(Contents, (AllocLen *= 2) * sizeof(TCHAR)); Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/goto.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -80,7 +80,7 @@ while (BatchGetString (textline, sizeof(textline) / sizeof(textline[0]))) { int pos; - int size; + INT_PTR size; /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; @@ -93,7 +93,7 @@ tmp = textline; while (_istspace (*tmp)) tmp++; - + /* All space after leading space terminate the string */ size = _tcslen(tmp) -1; pos=0; Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -281,7 +281,7 @@ { TCHAR path[MAX_PATH]; TCHAR *p = DirPath; - INT n; + INT_PTR n; if (CreateDirectory(DirPath, NULL)) return TRUE; Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -281,7 +281,7 @@ LPTSTR start; LPTSTR q; INT ac; - INT len; + INT_PTR len; arg = cmd_alloc (sizeof (LPTSTR)); if (!arg) @@ -360,7 +360,7 @@ LPTSTR start; LPTSTR q; INT ac; - INT len; + INT_PTR len; arg = cmd_alloc (sizeof (LPTSTR)); if (!arg) @@ -505,7 +505,7 @@ len = dwRead; if (end) { - len = (end - lpString) + 1; + len = (INT)(end - lpString) + 1; SetFilePointer(hFile, len - dwRead, NULL, FILE_CURRENT); } } Modified: trunk/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/mklink.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/mklink.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -81,22 +81,22 @@ if (hJunction != INVALID_HANDLE_VALUE) { /* Allocate a buffer large enough to hold both strings, including trailing NULs */ - DWORD TargetLen = wcslen(TargetFullPathW) * sizeof(WCHAR); - DWORD DataSize = FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer) - + TargetNTPath.Length + sizeof(WCHAR) - + TargetLen + sizeof(WCHAR); + SIZE_T TargetLen = wcslen(TargetFullPathW) * sizeof(WCHAR); + DWORD DataSize = (DWORD)(FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer) + + TargetNTPath.Length + sizeof(WCHAR) + + TargetLen + sizeof(WCHAR)); PREPARSE_DATA_BUFFER Data = _alloca(DataSize); /* Fill it out and use it to turn the directory into a reparse point */ Data->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; - Data->ReparseDataLength = DataSize - FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer); + Data->ReparseDataLength = (WORD)(DataSize - FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer)); Data->Reserved = 0; Data->MountPointReparseBuffer.SubstituteNameOffset = 0; Data->MountPointReparseBuffer.SubstituteNameLength = TargetNTPath.Length; wcscpy(Data->MountPointReparseBuffer.PathBuffer, TargetNTPath.Buffer); Data->MountPointReparseBuffer.PrintNameOffset = TargetNTPath.Length + sizeof(WCHAR); - Data->MountPointReparseBuffer.PrintNameLength = TargetLen; + Data->MountPointReparseBuffer.PrintNameLength = (USHORT)TargetLen; wcscpy((WCHAR *)((BYTE *)Data->MountPointReparseBuffer.PathBuffer + Data->MountPointReparseBuffer.PrintNameOffset), TargetFullPathW); Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/move.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/move.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -435,7 +435,7 @@ if (nDirLevel > 0) { TCHAR szTempPath[MAX_PATH]; - INT nDiff; + INT_PTR nDiff; FoundFile = TRUE; /* we need to continue our seek for files */ nDirLevel--; Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -411,7 +411,7 @@ return Cmd; } -/* Parse a FOR command. +/* Parse a FOR command. * Syntax is: FOR [options] %var IN (list) DO command */ static PARSED_COMMAND *ParseFor(void) { @@ -536,7 +536,7 @@ PARSED_COMMAND *(*Func)(void); TCHAR *Pos = _stpcpy(ParsedLine, CurrentToken) + 1; - DWORD TailOffset = Pos - ParsedLine; + DWORD_PTR TailOffset = Pos - ParsedLine; /* Check for special forms */ if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/replace.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -203,7 +203,8 @@ INT recReplace(DWORD dwFlags, TCHAR szSrcPath[MAX_PATH], TCHAR szDestPath[MAX_PATH], BOOL *doMore) { TCHAR tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; - INT filesReplaced=0, i; + INT filesReplaced=0; + INT_PTR i; DWORD dwAttrib = 0; HANDLE hFile; WIN32_FIND_DATA findBuffer; @@ -298,7 +299,8 @@ HANDLE hFile; WIN32_FIND_DATA findBuffer; TCHAR tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; - INT filesReplaced = 0, i; + INT filesReplaced = 0; + INT_PTR i; /* Add a wildcard to dest end so the it will be easy to itterate over all the files and directorys in the dest directory */ Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -212,7 +212,7 @@ while ( __iscsym(*p2) ) ++p2; } - return p2-p; + return (INT)(p2-p); } #define PARSE_IDENT(ident,identlen,p) \ Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Wed Mar 28 09:50:04 2012 @@ -36,7 +36,7 @@ if (GetVersionEx(&VersionInfo)) { LPTSTR RosVersion; - unsigned RosVersionLen; + SIZE_T RosVersionLen; RosVersion = VersionInfo.szCSDVersion + _tcslen(VersionInfo.szCSDVersion) + 1; RosVersionLen = sizeof(VersionInfo.szCSDVersion) / sizeof(VersionInfo.szCSDVersion[0]) - @@ -76,7 +76,7 @@ { ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team")); + ConOutPuts (_T("Copyright (C) 1998-") _T(COPYRIGHT_YEAR) _T(" ReactOS Team")); for (i = 0; param[i]; i++) {

12 years, 9 months

[tkreuzer] 56257: [NDK] Don't C_ASSERT some struct sizes on 64 bit builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 28 09:14:27 2012 New Revision: 56257 URL: http://svn.reactos.org/svn/reactos?rev=56257&view=rev Log: [NDK] Don't C_ASSERT some struct sizes on 64 bit builds Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Wed Mar 28 09:14:27 2012 @@ -845,7 +845,9 @@ ULONG WaitReason; ULONG PadPadAlignment; } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; +#ifndef _WIN64 C_ASSERT(sizeof(SYSTEM_THREAD_INFORMATION) == 0x40); // Must be 8-byte aligned +#endif typedef struct _SYSTEM_PROCESS_INFORMATION { @@ -894,9 +896,11 @@ LARGE_INTEGER OtherTransferCount; // SYSTEM_THREAD_INFORMATION TH[1]; } SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; +#ifndef _WIN64 C_ASSERT(sizeof(SYSTEM_PROCESS_INFORMATION) == 0xB8); // Must be 8-byte aligned - -// +#endif + +// // Class 6 typedef struct _SYSTEM_CALL_COUNT_INFORMATION {

12 years, 9 months

← Newer
1
2
3
4
5
6
7
...
36
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 March 2012