Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mnordell] 57271: Hopefully unbreak MSVC build.
by mnordell＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: mnordell Date: Tue Sep 11 04:52:19 2012 New Revision: 57271 URL: http://svn.reactos.org/svn/reactos?rev=57271&view=rev Log: Hopefully unbreak MSVC build. Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c Modified: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Tue Sep 11 04:52:19 2012 @@ -8,7 +8,7 @@ #define WIN32_NO_STATUS #include <stdio.h> #include <wine/test.h> -#include <windows.h> +#include <ndk/rtltypes.h> /* * Keep these returning different values, to prevent compiler folding

1 0

[mnordell] 57270: Test for SetUnhandledExceptionFilter actually rerturning what it should.
by mnordell＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: mnordell Date: Tue Sep 11 04:34:03 2012 New Revision: 57270 URL: http://svn.reactos.org/svn/reactos?rev=57270&view=rev Log: Test for SetUnhandledExceptionFilter actually rerturning what it should. Added: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Tue Sep 11 04:34:03 2012 @@ -7,6 +7,7 @@ GetModuleFileName.c lstrcpynW.c SetCurrentDirectory.c + SetUnhandledExceptionFilter.c testlist.c) add_executable(kernel32_apitest ${SOURCE}) Added: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/SetUnha… ============================================================================== --- trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c (added) +++ trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c [iso-8859-1] Tue Sep 11 04:34:03 2012 @@ -1,0 +1,41 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for SetUnhandledExceptionFilter + * PROGRAMMER: Mike "tamlin" Nordell + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +/* + * Keep these returning different values, to prevent compiler folding + * them into a single function, thereby voiding the test + */ +WINAPI LONG Filter1(LPEXCEPTION_POINTERS p) { return 0; } +WINAPI LONG Filter2(LPEXCEPTION_POINTERS p) { return 1; } + + +/* + * Verify that SetUnhandledExceptionFilter actually returns the + * _previous_ handler. + */ +static +VOID +TestSetUnhandledExceptionFilter(VOID) +{ + LPTOP_LEVEL_EXCEPTION_FILTER p1, p2; + p1 = SetUnhandledExceptionFilter(Filter1); + p2 = SetUnhandledExceptionFilter(Filter2); + ok(p1 != Filter1, "SetUnhandledExceptionFilter returned what was set, not prev\n"); + ok(p2 != Filter2, "SetUnhandledExceptionFilter returned what was set, not prev\n"); + ok(p2 == Filter1, "SetUnhandledExceptionFilter didn't return previous filter\n"); + ok(p1 != p2, "SetUnhandledExceptionFilter seems to return random stuff\n"); +} + +START_TEST(SetUnhandledExceptionFilter) +{ + TestSetUnhandledExceptionFilter(); +} Propchange: trunk/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Tue Sep 11 04:34:03 2012 @@ -10,14 +10,16 @@ extern void func_GetModuleFileName(void); extern void func_lstrcpynW(void); extern void func_SetCurrentDirectory(void); +extern void func_SetUnhandledExceptionFilter(void); const struct test winetest_testlist[] = { - { "GetCurrentDirectory", func_GetCurrentDirectory }, - { "GetDriveType", func_GetDriveType }, - { "GetModuleFileName", func_GetModuleFileName }, - { "lstrcpynW", func_lstrcpynW }, - { "SetCurrentDirectory", func_SetCurrentDirectory }, + { "GetCurrentDirectory", func_GetCurrentDirectory }, + { "GetDriveType", func_GetDriveType }, + { "GetModuleFileName", func_GetModuleFileName }, + { "lstrcpynW", func_lstrcpynW }, + { "SetCurrentDirectory", func_SetCurrentDirectory }, + { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter}, { 0, 0 } };

1 0

[mnordell] 57269: Make SetUnhandledExceptionFilter return the _previous_ handler as it should. Fixes at least a winetest for ntdll (MinGW startup code got stuck in infinite loop due to this bug)
by mnordell＠svn.reactos.org 11 Sep '12

11 Sep '12

Author: mnordell Date: Tue Sep 11 03:50:20 2012 New Revision: 57269 URL: http://svn.reactos.org/svn/reactos?rev=57269&view=rev Log: Make SetUnhandledExceptionFilter return the _previous_ handler as it should. Fixes at least a winetest for ntdll (MinGW startup code got stuck in infinite loop due to this bug) Modified: trunk/reactos/dll/win32/kernel32/client/except.c Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Tue Sep 11 03:50:20 2012 @@ -435,12 +435,12 @@ WINAPI SetUnhandledExceptionFilter(IN LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) { - PVOID EncodedPointer, NewPointer; + PVOID EncodedPointer, EncodedOldPointer; EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter); - NewPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, + EncodedOldPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, EncodedPointer); - return RtlDecodePointer(EncodedPointer); + return RtlDecodePointer(EncodedOldPointer); } /*

1 0

[dreimer] 57268: Update rapps to new Versions
by dreimer＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: dreimer Date: Mon Sep 10 21:08:55 2012 New Revision: 57268 URL: http://svn.reactos.org/svn/reactos?rev=57268&view=rev Log: Update rapps to new Versions Removed: trunk/reactos/base/applications/rapps/rapps/mingw.txt Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt trunk/reactos/base/applications/rapps/rapps/firefox5.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/mpc.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/scite.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt Modified: trunk/reactos/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/bittorrent.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = BitTorrent -Version = 7.6.1 +Version = 7.7 Licence = Freeware for non-commercial uses Description = The Original BitTorrent Client. Size = 5.78MB Category = 5 URLSite = http://www.bittorrent.com/ -URLDownload = http://download.bittorrent.com/7.6.1/BitTorrent3.exe +URLDownload = http://download.bittorrent.com/7.7/BitTorrent3.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox5.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -1,66 +1,66 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Firefox 14 -Version = 14.0.1 +Name = Mozilla Firefox 15 +Version = 15.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 15.8MB Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/e… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 15.7MB URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/d… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 15.6MB URLSite = http://www.mozilla-europe.org/es/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/e… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 15.9MB URLSite = http://www.mozilla-europe.org/fr/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/f… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/f… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 15.6MB URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 16.5MB URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/p… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. Size = 16.1Mo URLSite = http://www.mozilla-europe.org/ro/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/r… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 16.1MB URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/r… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 16.3MB URLSite = http://www.mozilla-europe.org/sk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/s… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/s… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 16.1MB URLSite = http://www.mozilla-europe.org/uk/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/14.0.1/win32/u… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/15.0.1/win32/u… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = FreeBASIC -Version = 0.23.0 +Version = 0.24.0 Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = 6.0MB +Size = 8.7MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… +URLDownload = http://garr.dl.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASIC… CDPath = none [Section.0407] 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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = LibreOffice -Version = 3.5.5 +Version = 3.6.1 Licence = LGPL Description = Former called OpenOffice. Open Source Office Suite. -Size = 201.6MB +Size = 200.0MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.5.5/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/3.6.1/win/x86/Lib… CDPath = none [Section.0407] Removed: 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 (removed) @@ -1,32 +1,0 @@ -ï»¿; UTF-8 - -[Section] -Name = MinGW -Version = 20111118 -Licence = Public domain/GPL -Description = A Port of the GNU toolchain with GCC, GDB, GNU make, etc. -Size = 578kB -Category = 7 -URLSite = http://mingw.org/ -URLDownload = http://garr.dl.sourceforge.net/project/mingw/Installer/mingw-get-inst/mingw… -CDPath = none - -[Section.0407] -Description = Eine Portierung der GNU Werkzeugkette mit GCC, GDB, GNU make usw. - -[Section.040a] -Description = Es una cadena de herramientas GNU con GCC, GDB, GNU make, etc. - -[Section.040c] -Description = Un portage de la chaÃ®ne d'outils GNU avec GCC, GDB, GNU make, etc. - -[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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.10.0 +Version = 0.10.2 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.1MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.0-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.10.2-unicode.exe CDPath = none [Section.0407] 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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = Mono .net Development Framework -Version = 2.11.2 +Version = 2.11.4 Licence = Unknown Description = Open Source .net Framework. -Size = 88.6MB +Size = 91.9MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://download.mono-project.com/archive/2.11.2/windows-installer/mono-2.11… +URLDownload = http://download.mono-project.com/archive/2.11.4/windows-installer/mono-2.11… CDPath = none [Section.040a] 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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = Media Player Classic Home Cinema -Version = 1.6.2.4902 +Version = 1.6.3.5818 Licence = GPL Description = A media player. -Size = 5.9MB +Size = 7.0MB Category = 1 URLSite = http://mpc-hc.sourceforge.net/ -URLDownload = http://heanet.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win3… +URLDownload = http://heanet.dl.sourceforge.net/project/mpc-hc/MPC%20HomeCinema%20-%20Win3… CDPath = none [Section.0407] 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] Mon Sep 10 21:08:55 2012 @@ -2,32 +2,32 @@ [Section] Name = OpenOffice 3.4 -Version = 3.4.0 +Version = 3.4.1 Licence = LGPL Description = THE Open Source Office Suite. Size = 145.0MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/stable/3.4.0/Apa… +URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/stable/3.4.1/Apa… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. URLSite = http://de.openoffice.org/ Size = 145.0MB -URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/de/3.4… +URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/de/3.4… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. URLSite = http://es.openoffice.org/ Size = 119.0MB -URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/es/3.4… +URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/es/3.4… [Section.040c] Description = LA suite bureautique open source. URLSite = http://fr.openoffice.org/ Size = 120.0MB -URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/fr/3.4… +URLDownload = http://dfn.dl.sourceforge.net/project/openofficeorg.mirror/localized/fr/3.4… [Section.0415] Description = Otwarty pakiet biurowy. @@ -39,4 +39,4 @@ Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. URLSite = http://ua.openoffice.org/ Size = 123.0MB -URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/ru/… +URLDownload = http://heanet.dl.sourceforge.net/project/openofficeorg.mirror/localized/ru/… 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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 1.2.1 +Version = 1.2.2 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 4.4MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.2.1/openttd-1.2.1-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.2.2/openttd-1.2.2-windows-win32.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 12.00 +Version = 12.02 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. Size = 12.00MB Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://ftp.opera.com/pub/opera/win/1200/int/Opera_1200_int_Setup.exe +URLDownload = http://ftp.opera.com/pub/opera/win/1202/int/Opera_1202_int_Setup.exe CDPath = none [Section.0405] 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] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 3.2.1 +Version = 3.2.2 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 = 683kB +Size = 685kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.1/Sc321.exe +URLDownload = http://heanet.dl.sourceforge.net/project/scintilla/SciTE/3.2.2/Sc322.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scummvm.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -2,13 +2,13 @@ [Section] Name = ScummVM -Version = 1.4.1 +Version = 1.5.0 Licence = GPL Description = Sam and Max, Day of the Tentacle, etc on ReactOS. -Size = 5.28MB +Size = 6.3MB Category = 4 URLSite = http://scummvm.org/ -URLDownload = http://kent.dl.sourceforge.net/project/scummvm/scummvm/1.4.1/scummvm-1.4.1-… +URLDownload = http://heanet.dl.sourceforge.net/project/scummvm/scummvm/1.5.0/scummvm-1.5.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -2,34 +2,34 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.11 +Version = 2.12 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 19.0MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/en-US/SeaMonkey%… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/en-US/SeaMonkey%… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 19.0MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/de/SeaMonkey%20S… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/de/SeaMonkey%20S… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. Size = 18.9MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/es-ES/SeaMonkey%… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/es-ES/SeaMonkey%… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. Size = 19.2MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/fr/SeaMonkey%20S… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/fr/SeaMonkey%20S… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 19.8MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/pl/SeaMonkey%20S… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/pl/SeaMonkey%20S… [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. @@ -38,9 +38,9 @@ [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 19.5MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/ru/SeaMonkey%20S… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/ru/SeaMonkey%20S… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 19.5MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.11/win32/ru/SeaMonkey%20S… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/2.12/win32/ru/SeaMonkey%20S… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird5.txt [iso-8859-1] Mon Sep 10 21:08:55 2012 @@ -1,54 +1,54 @@ ï»¿; UTF-8 [Section] -Name = Mozilla Thunderbird 14 -Version = 14.0 +Name = Mozilla Thunderbird 15 +Version = 15.0 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 17.6MB Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 17.5MB URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 17.4MB URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 17.8MB URLSite = http://www.mozilla-europe.org/fr/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 18.3MB URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 18.0Mo URLSite = http://www.mozilla-europe.org/ro/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 17.9MB URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 17.9MB URLSite = http://www.mozillamessaging.com/uk/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/14.0/win32… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/15.0/win32… 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] Mon Sep 10 21:08:55 2012 @@ -2,7 +2,7 @@ [Section] Name = ÂµTorrent -Version = 3.1.3 +Version = 3.2 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. Size = 874.87kB

1 0

[tkreuzer] 57267: [FREELDR] Stop using the FILESYSBUFFER. It's a 64 KB memory region statically set up int the lower 1MB address space. This memory is rare and it doesn't make sense to put the buff...
by tkreuzer＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: tkreuzer Date: Mon Sep 10 20:53:39 2012 New Revision: 57267 URL: http://svn.reactos.org/svn/reactos?rev=57267&view=rev Log: [FREELDR] Stop using the FILESYSBUFFER. It's a 64 KB memory region statically set up int the lower 1MB address space. This memory is rare and it doesn't make sense to put the buffer there, since it's only used to copy the data from the DISKREADBUFFER (which *must* be in the lower 1MB) to a temporary location to copy it to some other location afterwards. It's replaced with temporary heap buffers and direct reads, where possible. Also Don't read a full FAT cluster, when only a part of it is required. Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Mon Sep 10 20:53:39 2012 @@ -720,8 +720,9 @@ BOOLEAN Ext2ReadGroupDescriptors(VOID) { - ULONG GroupDescBlockCount; - ULONG CurrentGroupDescBlock; + ULONG GroupDescBlockCount; + ULONG BlockNumber; + PUCHAR CurrentGroupDescBlock; TRACE("Ext2ReadGroupDescriptors()\n"); @@ -751,14 +752,18 @@ } // Now read the group descriptors - for (CurrentGroupDescBlock=0; CurrentGroupDescBlock<GroupDescBlockCount; CurrentGroupDescBlock++) - { - if (!Ext2ReadBlock(Ext2SuperBlock->first_data_block + 1 + CurrentGroupDescBlock, (PVOID)FILESYSBUFFER)) + CurrentGroupDescBlock = (PUCHAR)Ext2GroupDescriptors; + BlockNumber = Ext2SuperBlock->first_data_block + 1; + + while (GroupDescBlockCount--) + { + if (!Ext2ReadBlock(BlockNumber, CurrentGroupDescBlock)) { return FALSE; } - RtlCopyMemory((Ext2GroupDescriptors + (CurrentGroupDescBlock * Ext2BlockSizeInBytes)), (PVOID)FILESYSBUFFER, Ext2BlockSizeInBytes); + BlockNumber++; + CurrentGroupDescBlock += Ext2BlockSizeInBytes; } return TRUE; @@ -857,15 +862,20 @@ */ BOOLEAN Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { + PVOID TempBuffer; TRACE("Ext2ReadPartialBlock() BlockNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", BlockNumber, StartingOffset, Length, Buffer); - if (!Ext2ReadBlock(BlockNumber, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - memcpy(Buffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + StartingOffset), Length); + TempBuffer = HeapAllocate(FrLdrTempHeap, Ext2BlockSizeInBytes, '2TXE'); + + if (!Ext2ReadBlock(BlockNumber, TempBuffer)) + { + return FALSE; + } + + memcpy(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length); + + HeapFree(FrLdrTempHeap, TempBuffer, '2TXE'); return TRUE; } @@ -902,6 +912,7 @@ ULONG InodeOffsetInBlock; CHAR ErrorString[80]; EXT2_GROUP_DESC GroupDescriptor; + BOOLEAN Status; TRACE("Ext2ReadInode() Inode = %d\n", Inode); @@ -932,13 +943,14 @@ TRACE("InodeBlockNumber (after group desc correction) = %d\n", InodeBlockNumber); // Read the block - if (!Ext2ReadBlock(InodeBlockNumber, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - // Copy the data to their buffer - RtlCopyMemory(InodeBuffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + (InodeOffsetInBlock * EXT2_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); + Status = Ext2ReadPartialBlock(InodeBlockNumber, + (InodeOffsetInBlock * EXT2_INODE_SIZE(Ext2SuperBlock)), + sizeof(EXT2_INODE), + InodeBuffer); + if (!Status) + { + return FALSE; + } TRACE("Dumping inode information:\n"); TRACE("mode = 0x%x\n", InodeBuffer->mode); @@ -1078,7 +1090,7 @@ BOOLEAN Ext2CopyIndirectBlockPointers(ULONG* BlockList, ULONG* CurrentBlockInList, ULONG BlockCount, ULONG IndirectBlock) { - ULONG* BlockBuffer = (ULONG*)FILESYSBUFFER; + ULONG* BlockBuffer; ULONG CurrentBlock; ULONG BlockPointersPerBlock; @@ -1086,6 +1098,14 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); + BlockBuffer = HeapAllocate(FrLdrTempHeap, + Ext2BlockSizeInBytes, + '2TXE'); + if (!BlockBuffer) + { + return FALSE; + } + if (!Ext2ReadBlock(IndirectBlock, BlockBuffer)) { return FALSE; @@ -1096,6 +1116,8 @@ BlockList[(*CurrentBlockInList)] = BlockBuffer[CurrentBlock]; (*CurrentBlockInList)++; } + + HeapFree(FrLdrTempHeap, BlockBuffer, '2TXE'); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Mon Sep 10 20:53:39 2012 @@ -904,8 +904,18 @@ UINT32 FatOffset; UINT32 ThisFatSecNum; UINT32 ThisFatEntOffset; + ULONG SectorCount; + PUCHAR ReadBuffer; + BOOLEAN status = TRUE;; //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); + + // We need a buffer for 2 secors + ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); + if (!ReadBuffer) + { + return FALSE; + } switch(Volume->FatType) { @@ -919,22 +929,23 @@ TRACE("ThisFatSecNum: %d\n", ThisFatSecNum); TRACE("ThisFatEntOffset: %d\n", ThisFatEntOffset); + if (ThisFatEntOffset == (Volume->BytesPerSector - 1)) { - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 2, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } + SectorCount = 2; } else { - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - } - - fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset)); + SectorCount = 1; + } + + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, SectorCount, ReadBuffer)) + { + status = FALSE; + break; + } + + fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); fat = SWAPW(fat); if (Cluster & 0x0001) fat = fat >> 4; /* Cluster number is ODD */ @@ -950,12 +961,13 @@ ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset)); + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) + { + status = FALSE; + break; + } + + fat = *((USHORT *) (ReadBuffer + ThisFatEntOffset)); fat = SWAPW(fat); break; @@ -967,24 +979,26 @@ ThisFatSecNum = Volume->ActiveFatSectorStart + (FatOffset / Volume->BytesPerSector); ThisFatEntOffset = (FatOffset % Volume->BytesPerSector); - if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ThisFatSecNum, 1, ReadBuffer)) { return FALSE; } // Get the fat entry - fat = (*((ULONG *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset))) & 0x0FFFFFFF; + fat = (*((ULONG *) (ReadBuffer + ThisFatEntOffset))) & 0x0FFFFFFF; fat = SWAPD(fat); break; default: - TRACE("Unknown FAT type %d\n", Volume->FatType); - return FALSE; - + ERR("Unknown FAT type %d\n", Volume->FatType); + status = FALSE; + break; } //TRACE("FAT entry is 0x%x.\n", fat); + + HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); *ClusterPointer = fat; @@ -1106,12 +1120,10 @@ // // Read cluster into memory // - if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) + if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, Buffer)) { return FALSE; } - - memcpy(Buffer, (PVOID)FILESYSBUFFER, Volume->SectorsPerCluster * Volume->BytesPerSector); // // Decrement count of clusters left to read @@ -1152,19 +1164,39 @@ BOOLEAN FatReadPartialCluster(PFAT_VOLUME_INFO Volume, ULONG ClusterNumber, ULONG StartingOffset, ULONG Length, PVOID Buffer) { ULONG ClusterStartSector; + ULONG SectorOffset, ReadSize, SectorCount; + PUCHAR ReadBuffer; + BOOLEAN status = FALSE; //TRACE("FatReadPartialCluster() ClusterNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", ClusterNumber, StartingOffset, Length, Buffer); ClusterStartSector = ((ClusterNumber - 2) * Volume->SectorsPerCluster) + Volume->DataSectorStart; - if (!FatReadVolumeSectors(Volume, ClusterStartSector, Volume->SectorsPerCluster, (PVOID)FILESYSBUFFER)) - { - return FALSE; - } - - memcpy(Buffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + StartingOffset), Length); - - return TRUE; + // This is the offset of the data in sectors + SectorOffset = (StartingOffset / Volume->BytesPerSector); + StartingOffset %= Volume->BytesPerSector; + + // Calculate how many sectors we need to read + SectorCount = (StartingOffset + Length + Volume->BytesPerSector - 1) / Volume->BytesPerSector; + + // Calculate rounded up read size + ReadSize = SectorCount * Volume->BytesPerSector; + + ReadBuffer = HeapAllocate(FrLdrTempHeap, ReadSize, 'xTAF'); + if (!ReadBuffer) + { + return FALSE; + } + + if (FatReadVolumeSectors(Volume, ClusterStartSector + SectorOffset, SectorCount, ReadBuffer)) + { + memcpy(Buffer, ReadBuffer + StartingOffset, Length); + status = TRUE; + } + + HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); + + return status; } /* Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Mon Sep 10 20:53:39 2012 @@ -38,4 +38,3 @@ extern ULONG gDiskReadBuffer, gFileSysBuffer; #define DISKREADBUFFER gDiskReadBuffer -#define FILESYSBUFFER gFileSysBuffer

1 0

[akhaldi] 57266: * Revert r57265 until the testbot issues caused by earlier revisions are fixed.
by akhaldi＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: akhaldi Date: Mon Sep 10 20:45:26 2012 New Revision: 57266 URL: http://svn.reactos.org/svn/reactos?rev=57266&view=rev Log: * Revert r57265 until the testbot issues caused by earlier revisions are fixed. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/todo.txt trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

1 0

[akhaldi] 57265: [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5.
by akhaldi＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: akhaldi Date: Mon Sep 10 19:38:32 2012 New Revision: 57265 URL: http://svn.reactos.org/svn/reactos?rev=57265&view=rev Log: [UNIATA]: Sync to 0.43f5. [ATACTL]: Sync to 0.43f5. Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/todo.txt trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

1 0

[ion] 57264: [CMLIB]: Forgot part of last patch.
by ion＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: ion Date: Mon Sep 10 15:32:43 2012 New Revision: 57264 URL: http://svn.reactos.org/svn/reactos?rev=57264&view=rev Log: [CMLIB]: Forgot part of last patch. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5726… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Mon Sep 10 15:32:43 2012 @@ -242,8 +242,11 @@ PHHIVE RegistryHive, HCELL_INDEX CellOffset); -#define HvReleaseCell(h, c) \ - if (h->ReleaseCellRoutine) h->ReleaseCellRoutine(h, c) +#define HvReleaseCell(h, c) \ +do { \ + if ((h)->ReleaseCellRoutine) \ + (h)->ReleaseCellRoutine(h, c); \ +} while(0) LONG CMAPI HvGetCellSize(

1 0

[ion] 57263: [NTOSKRNL]: CORE-6491 #resolve #comment Implement hive list support by hbelusca, with some minor cleanups by me. Loaded hives are now in the hivelist key.
by ion＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: ion Date: Mon Sep 10 15:25:26 2012 New Revision: 57263 URL: http://svn.reactos.org/svn/reactos?rev=57263&view=rev Log: [NTOSKRNL]: CORE-6491 #resolve #comment Implement hive list support by hbelusca, with some minor cleanups by me. Loaded hives are now in the hivelist key. Modified: trunk/reactos/ntoskrnl/config/cmhvlist.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmhvlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhvlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhvlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhvlist.c [iso-8859-1] Mon Sep 10 15:25:26 2012 @@ -1,24 +1,258 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmwraprs.c - * PURPOSE: Configuration Manager - Wrappers for Hive Operations - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * FILE: ntoskrnl/config/cmhvlist.c + * PURPOSE: Configuration Manager - Hives file list management + * PROGRAMMERS: Hermes BELUSCA - MAITO */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *******************************************************************/ #include "ntoskrnl.h" #define NDEBUG #include "debug.h" -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ********************************************************************/ + +UNICODE_STRING HiveListValueName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control\\hivelist"); + +/* FUNCTIONS ******************************************************************/ + +/* Note: the caller is expected to free the HiveName string buffer */ +BOOLEAN +NTAPI +CmpGetHiveName(IN PCMHIVE Hive, + OUT PUNICODE_STRING HiveName) +{ + HCELL_INDEX RootCell, LinkCell; + PCELL_DATA RootData, LinkData, ParentData; + ULONG ParentNameSize, LinkNameSize; + SIZE_T NameSize; + PWCHAR p; + UNICODE_STRING RegistryName = RTL_CONSTANT_STRING(L"\\REGISTRY\\"); + + /* Get the root cell of this hive */ + RootCell = Hive->Hive.BaseBlock->RootCell; + RootData = HvGetCell(&Hive->Hive, RootCell); + if (!RootData) return FALSE; + + /* Get the cell index at which this hive is linked to, and its parent */ + LinkCell = RootData->u.KeyNode.Parent; + HvReleaseCell(&Hive->Hive, RootCell); + + /* Sanity check */ + ASSERT((&CmiVolatileHive->Hive)->ReleaseCellRoutine == NULL); + + /* Get the cell data for link and parent */ + LinkData = HvGetCell(&CmiVolatileHive->Hive, LinkCell); + if (!LinkData) return FALSE; + ParentData = HvGetCell(&CmiVolatileHive->Hive, LinkData->u.KeyNode.Parent); + if (!ParentData) return FALSE; + + /* Get the size of the parent name */ + if (ParentData->u.KeyNode.Flags & KEY_COMP_NAME) + { + ParentNameSize = CmpCompressedNameSize(ParentData->u.KeyNode.Name, + ParentData->u.KeyNode.NameLength); + } + else + { + ParentNameSize = ParentData->u.KeyNode.NameLength; + } + + /* Get the size of the link name */ + if (LinkData->u.KeyNode.Flags & KEY_COMP_NAME) + { + LinkNameSize = CmpCompressedNameSize(LinkData->u.KeyNode.Name, + LinkData->u.KeyNode.NameLength); + } + else + { + LinkNameSize = LinkData->u.KeyNode.NameLength; + } + + /* No need to account for terminal NULL character since we deal with counted UNICODE strings */ + NameSize = RegistryName.Length + ParentNameSize + sizeof(WCHAR) + LinkNameSize; + + /* Allocate the memory */ + HiveName->Buffer = ExAllocatePoolWithTag(PagedPool, NameSize, TAG_CM); + if (!HiveName->Buffer) + { + /* Fail */ + DPRINT1("CmpGetHiveName: Unable to allocate memory\n"); + return FALSE; + } + + /* Build the string for it */ + HiveName->Length = HiveName->MaximumLength = (USHORT)NameSize; + p = HiveName->Buffer; + + /* Copy the parent name */ + RtlCopyMemory(p, RegistryName.Buffer, RegistryName.Length); + p += RegistryName.Length / sizeof(WCHAR); + if (ParentData->u.KeyNode.Flags & KEY_COMP_NAME) + { + CmpCopyCompressedName(p, + ParentNameSize, + ParentData->u.KeyNode.Name, + ParentData->u.KeyNode.NameLength); + } + else + { + RtlCopyMemory(p, ParentData->u.KeyNode.Name, ParentNameSize); + } + + /* Add a path separator between parent and link */ + p += ParentNameSize / sizeof(WCHAR); + *p = OBJ_NAME_PATH_SEPARATOR; + ++p; + + /* Now copy the link name */ + if (LinkData->u.KeyNode.Flags & KEY_COMP_NAME) + { + CmpCopyCompressedName(p, + LinkNameSize, + LinkData->u.KeyNode.Name, + LinkData->u.KeyNode.NameLength); + + } + else + { + RtlCopyMemory(p, LinkData->u.KeyNode.Name, LinkNameSize); + } + + /* All done */ + return TRUE; +} NTSTATUS NTAPI CmpAddToHiveFileList(IN PCMHIVE Hive) { - return STATUS_SUCCESS; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + UNICODE_STRING HivePath; + PWCHAR FilePath; + CHAR Buffer[sizeof(OBJECT_NAME_INFORMATION) + 512 * sizeof(WCHAR)]; + ULONG Length = sizeof(Buffer); + POBJECT_NAME_INFORMATION LocalNameInfo = (POBJECT_NAME_INFORMATION)&Buffer; + HivePath.Buffer = NULL; + + /* Create or open the hive list key */ + InitializeObjectAttributes(&ObjectAttributes, + &HiveListValueName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpAddToHiveFileList: Creation or opening of the hive list failed, status = %08lx\n", Status); + return Status; + } + + /* Retrieve the name of the hive */ + if (!CmpGetHiveName(Hive, &HivePath)) + { + /* Fail */ + DPRINT1("CmpAddToHiveFileList: Unable to retrieve the hive name\n"); + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Get the name of the corresponding file */ + if (!(Hive->Hive.HiveFlags & HIVE_VOLATILE)) + { + /* Try to get the value */ + Status = ZwQueryObject(Hive->FileHandles[HFILE_TYPE_PRIMARY], + ObjectNameInformation, + LocalNameInfo, + Length, + &Length); + if (NT_SUCCESS(Status)) + { + /* Null-terminate and add the length of the terminator */ + Length -= sizeof(OBJECT_NAME_INFORMATION); + FilePath = LocalNameInfo->Name.Buffer; + FilePath[Length / sizeof(WCHAR)] = UNICODE_NULL; + Length += sizeof(UNICODE_NULL); + } + else + { + /* Fail */ + DPRINT1("CmpAddToHiveFileList: Hive file name query failed, status = %08lx\n", Status); + goto Quickie; + } + } + else + { + /* No name */ + FilePath = L""; + Length = sizeof(UNICODE_NULL); + } + + /* Set the entry in the hive list */ + Status = ZwSetValueKey(KeyHandle, + &HivePath, + 0, + REG_SZ, + FilePath, + Length); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpAddToHiveFileList: Setting of entry in the hive list failed, status = %08lx\n", Status); + } + +Quickie: + /* Cleanup and return status */ + if (HivePath.Buffer) ExFreePoolWithTag(HivePath.Buffer, TAG_CM); + ObCloseHandle(KeyHandle, KernelMode); + return Status; } -/* EOF */ +VOID +NTAPI +CmpRemoveFromHiveFileList(IN PCMHIVE Hive) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle; + UNICODE_STRING HivePath; + + /* Open the hive list key */ + InitializeObjectAttributes(&ObjectAttributes, + &HiveListValueName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("CmpRemoveFromHiveFileList: Opening of the hive list failed, status = %08lx\n", Status); + return; + } + + /* Get the hive path name */ + CmpGetHiveName(Hive, &HivePath); + + /* Delete the hive path name from the list */ + ZwDeleteValueKey(KeyHandle, &HivePath); + + /* Cleanup allocation and handle */ + ExFreePoolWithTag(HivePath.Buffer, TAG_CM); + ObCloseHandle(KeyHandle, KernelMode); +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Sep 10 15:25:26 2012 @@ -1381,7 +1381,8 @@ /* Check if we created a new hive */ if (CmpMachineHiveList[i].CmHive2) { - /* TODO: Add to HiveList key */ + /* Add to HiveList key */ + CmpAddToHiveFileList(CmpMachineHiveList[i].CmHive2); } } @@ -1569,7 +1570,8 @@ KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); } - /* FIXME: Add to HiveList key */ + /* Add to HiveList key */ + CmpAddToHiveFileList(HardwareHive); /* Free the security descriptor */ ExFreePoolWithTag(SecurityDescriptor, TAG_CM); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Sep 10 15:25:26 2012 @@ -624,9 +624,22 @@ // // Hive List Routines // +BOOLEAN +NTAPI +CmpGetHiveName( + IN PCMHIVE Hive, + OUT PUNICODE_STRING HiveName +); + NTSTATUS NTAPI CmpAddToHiveFileList( + IN PCMHIVE Hive +); + +VOID +NTAPI +CmpRemoveFromHiveFileList( IN PCMHIVE Hive );

1 0

[ion] 57262: [NTOSKRNL]: CORE-6597 #resolve #time 5m #comment Fix incorrect double list increment
by ion＠svn.reactos.org 10 Sep '12

10 Sep '12

Author: ion Date: Mon Sep 10 15:00:16 2012 New Revision: 57262 URL: http://svn.reactos.org/svn/reactos?rev=57262&view=rev Log: [NTOSKRNL]: CORE-6597 #resolve #time 5m #comment Fix incorrect double list increment Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c 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] Mon Sep 10 15:00:16 2012 @@ -1583,6 +1583,7 @@ // i = (USHORT)((NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) / POOL_BLOCK_SIZE); + ASSERT(i < POOL_LISTS_PER_PAGE); // // Handle lookaside list optimization for both paged and nonpaged pool @@ -1664,7 +1665,6 @@ // Try again! // ExUnlockPool(PoolDesc, OldIrql); - ListHead++; continue; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs