Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[cfinck] 29961: Move cylfrac, matrix, scrmsave and starfield to rosapps as proposed on the mailing list. New screensavers should only go there now. I created an "applications/screensavers" directory for that, eventually rosapps should get a similar directory structure to reactos. Also changed the appropriate parts in reactos.dff.
by cfinck＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: cfinck Date: Tue Oct 30 00:30:02 2007 New Revision: 29961 URL: http://svn.reactos.org/svn/reactos?rev=29961&view=rev Log: Move cylfrac, matrix, scrmsave and starfield to rosapps as proposed on the mailing list. New screensavers should only go there now. I created an "applications/screensavers" directory for that, eventually rosapps should get a similar directory structure to reactos. Also changed the appropriate parts in reactos.dff. Added: trunk/rosapps/applications/ (with props) trunk/rosapps/applications/applications.rbuild (with props) trunk/rosapps/applications/screensavers/ (with props) trunk/rosapps/applications/screensavers/cylfrac/ - copied from r29957, trunk/reactos/base/applications/screensavers/cylfrac/ trunk/rosapps/applications/screensavers/matrix/ - copied from r29957, trunk/reactos/base/applications/screensavers/matrix/ trunk/rosapps/applications/screensavers/screensavers.rbuild (with props) trunk/rosapps/applications/screensavers/scrnsave/ - copied from r29957, trunk/reactos/base/applications/screensavers/scrnsave/ trunk/rosapps/applications/screensavers/starfield/ - copied from r29957, trunk/reactos/base/applications/screensavers/starfield/ Removed: trunk/reactos/base/applications/screensavers/cylfrac/ trunk/reactos/base/applications/screensavers/matrix/ trunk/reactos/base/applications/screensavers/scrnsave/ trunk/reactos/base/applications/screensavers/starfield/ Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/rosapps/directory.rbuild Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02 2007 @@ -4,19 +4,7 @@ <directory name="3dtext"> <xi:include href="3dtext/3dtext.rbuild" /> </directory> - <directory name="cylfrac"> - <xi:include href="cylfrac/cylfrac.rbuild" /> - </directory> <directory name="logon"> <xi:include href="logon/logon.rbuild" /> </directory> - <directory name="matrix"> - <xi:include href="matrix/matrix.rbuild" /> - </directory> - <directory name="scrnsave"> - <xi:include href="scrnsave/scrnsave.rbuild" /> - </directory> - <directory name="starfield"> - <xi:include href="starfield/starfield.rbuild" /> - </directory> -</group> +</group> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Oct 30 00:30:02 2007 @@ -60,11 +60,8 @@ base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 base\applications\sc\sc.exe 1 -base\applications\screensavers\cylfrac\cylfrac.scr 1 +base\applications\screensavers\3dtext\3dtext.scr 1 base\applications\screensavers\logon\logon.scr 1 -base\applications\screensavers\matrix\matrix.scr 1 -base\applications\screensavers\scrnsave\scrnsave.scr 1 -base\applications\screensavers\starfield\starfield.scr 1 base\applications\mscutils\servman\servman.exe 1 base\applications\shutdown\shutdown.exe 1 base\applications\sndvol32\sndvol32.exe 1 @@ -445,96 +442,100 @@ tools\dbgprint\dbgprint.exe 7 optional ; Modules -modules\os2\server\os2srv.dll 1 optional -modules\os2\dll\win32\doscalls\doscalls.dll 1 optional -modules\posix\server\psxsrv.dll 1 optional -modules\posix\dll\win32\psxdll\psxdll.dll 1 optional -modules\rosky\dll\win32\libsky\libsky.dll 1 optional -modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional -modules\vms\server\vmssrv.dll 1 optional -modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional -modules\rosapps\avtest\avtest.sys 1 optional -modules\rosapps\cmdutils\comp\comp.exe 1 optional -modules\rosapps\cmdutils\mode\mode.exe 1 optional -modules\rosapps\cmdutils\sort\sort.exe 1 optional -modules\rosapps\cmdutils\tee\tee.exe 1 optional -modules\rosapps\cmdutils\touch\touch.exe 1 optional -modules\rosapps\cmdutils\uptime\uptime.exe 1 optional -modules\rosapps\cmdutils\y\y.exe 1 optional -modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional -modules\rosapps\demos\maze\maze.exe 1 optional -modules\rosapps\devutils\cputointel\cputointel.exe 1 optional -modules\rosapps\devutils\gdb2\gdb2.exe 1 optional -modules\rosapps\devutils\gdihv\gdihv.exe 1 optional -modules\rosapps\devutils\genguid\genguid.exe 1 optional -modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional -modules\rosapps\devutils\zoomin\zoomin.exe 1 optional -modules\rosapps\dflat32\edit.exe 1 optional -modules\rosapps\downloader\downloader.exe 1 optional -modules\rosapps\downloader\downloader.xml 1 optional -modules\rosapps\gettype\gettype.exe 1 optional -modules\rosapps\green\green.sys 1 optional -modules\rosapps\imagesoft\imagesoft.exe 1 optional -modules\rosapps\lib\dflat32\dflat32.dll 1 optional -modules\rosapps\mc\mc.exe 1 optional -modules\rosapps\net\ncftp\ncftp.exe 1 optional -modules\rosapps\net\netreg\netreg.exe 1 optional -modules\rosapps\net\niclist\niclist.exe 1 optional -modules\rosapps\notevil\notevil.exe 1 optional -modules\rosapps\magnify\magnify.exe 1 optional -modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional -modules\rosapps\packmgr\gui\packmgr.exe 1 optional -modules\rosapps\packmgr\lib\package.dll 1 optional -modules\rosapps\ramdrv\ramdrv.sys 1 optional -modules\rosapps\roshttpd\roshttpd.exe 1 optional -modules\rosapps\screenshot\screenshot.exe 1 optional -modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional -modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional -modules\rosapps\sysutils\chklib\chklib.exe 1 optional -modules\rosapps\sysutils\ctm\ctm.exe 1 optional -modules\rosapps\sysutils\kill\kill.exe 1 optional -modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional -modules\rosapps\sysutils\man\man.exe 1 optional -modules\rosapps\sysutils\pedump\pedump.exe 1 optional -modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional -modules\rosapps\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\sysutils\tlist\tlist.exe 1 optional -modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional -modules\rosapps\sysutils\utils\cat\cat.exe 1 optional -modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional -modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional -modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional -modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional -modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional -modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional -modules\rosapps\sysutils\utils\ps\ps.exe 1 optional -modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional -modules\rosapps\sysutils\utils\stats\stats.exe 1 optional -modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional -modules\rosapps\templates\dialog.exe 1 optional -modules\rosapps\templates\mdi.exe 1 optional -modules\rosapps\winefile\winefile.exe 1 optional -modules\rosapps\winver\winver.exe 1 optional -modules\rosapps\write\write.exe 1 optional -modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional -modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional -modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional -modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional -modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional -modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional -modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional -modules\rostests\winetests\msi\msi_winetest.exe 7 optional -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional -modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional -modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional -modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional -modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional -modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional -modules\rostests\winetests\user32\user32_winetest.exe 7 optional -modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional -modules\rostests\winetests\version\version_winetest.exe 7 optional -modules\wallpaper\lake.bmp 4 optional +modules\os2\server\os2srv.dll 1 optional +modules\os2\dll\win32\doscalls\doscalls.dll 1 optional +modules\posix\server\psxsrv.dll 1 optional +modules\posix\dll\win32\psxdll\psxdll.dll 1 optional +modules\rosky\dll\win32\libsky\libsky.dll 1 optional +modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional +modules\vms\server\vmssrv.dll 1 optional +modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional +modules\rosapps\avtest\avtest.sys 1 optional +modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional +modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional +modules\rosapps\applications\screensavers\scrnsave\scrnsave.scr 1 optional +modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional +modules\rosapps\cmdutils\comp\comp.exe 1 optional +modules\rosapps\cmdutils\mode\mode.exe 1 optional +modules\rosapps\cmdutils\sort\sort.exe 1 optional +modules\rosapps\cmdutils\tee\tee.exe 1 optional +modules\rosapps\cmdutils\touch\touch.exe 1 optional +modules\rosapps\cmdutils\uptime\uptime.exe 1 optional +modules\rosapps\cmdutils\y\y.exe 1 optional +modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional +modules\rosapps\demos\maze\maze.exe 1 optional +modules\rosapps\devutils\cputointel\cputointel.exe 1 optional +modules\rosapps\devutils\gdb2\gdb2.exe 1 optional +modules\rosapps\devutils\gdihv\gdihv.exe 1 optional +modules\rosapps\devutils\genguid\genguid.exe 1 optional +modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional +modules\rosapps\devutils\zoomin\zoomin.exe 1 optional +modules\rosapps\dflat32\edit.exe 1 optional +modules\rosapps\downloader\downloader.exe 1 optional +modules\rosapps\downloader\downloader.xml 1 optional +modules\rosapps\gettype\gettype.exe 1 optional +modules\rosapps\green\green.sys 1 optional +modules\rosapps\imagesoft\imagesoft.exe 1 optional +modules\rosapps\lib\dflat32\dflat32.dll 1 optional +modules\rosapps\mc\mc.exe 1 optional +modules\rosapps\net\ncftp\ncftp.exe 1 optional +modules\rosapps\net\netreg\netreg.exe 1 optional +modules\rosapps\net\niclist\niclist.exe 1 optional +modules\rosapps\notevil\notevil.exe 1 optional +modules\rosapps\magnify\magnify.exe 1 optional +modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional +modules\rosapps\packmgr\gui\packmgr.exe 1 optional +modules\rosapps\packmgr\lib\package.dll 1 optional +modules\rosapps\ramdrv\ramdrv.sys 1 optional +modules\rosapps\roshttpd\roshttpd.exe 1 optional +modules\rosapps\screenshot\screenshot.exe 1 optional +modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional +modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional +modules\rosapps\sysutils\chklib\chklib.exe 1 optional +modules\rosapps\sysutils\ctm\ctm.exe 1 optional +modules\rosapps\sysutils\kill\kill.exe 1 optional +modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional +modules\rosapps\sysutils\man\man.exe 1 optional +modules\rosapps\sysutils\pedump\pedump.exe 1 optional +modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional +modules\rosapps\sysutils\tcat\tcat.exe 1 optional +modules\rosapps\sysutils\tlist\tlist.exe 1 optional +modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional +modules\rosapps\sysutils\utils\cat\cat.exe 1 optional +modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional +modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional +modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional +modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional +modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional +modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional +modules\rosapps\sysutils\utils\ps\ps.exe 1 optional +modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional +modules\rosapps\sysutils\utils\stats\stats.exe 1 optional +modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional +modules\rosapps\templates\dialog.exe 1 optional +modules\rosapps\templates\mdi.exe 1 optional +modules\rosapps\winefile\winefile.exe 1 optional +modules\rosapps\winver\winver.exe 1 optional +modules\rosapps\write\write.exe 1 optional +modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional +modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional +modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional +modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional +modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional +modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional +modules\rostests\winetests\msi\msi_winetest.exe 7 optional +modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional +modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional +modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional +modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional +modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional +modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional +modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional +modules\rostests\winetests\user32\user32_winetest.exe 7 optional +modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional +modules\rostests\winetests\version\version_winetest.exe 7 optional +modules\wallpaper\lake.bmp 4 optional ; Native libraries -modules\windows\mfc42.dll 1 optional +modules\windows\mfc42.dll 1 optional Propchange: trunk/rosapps/applications/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild (added) +++ trunk/rosapps/applications/applications.rbuild Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="screensavers"> + <xi:include href="screensavers/screensavers.rbuild" /> + </directory> +</group> Propchange: trunk/rosapps/applications/applications.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/screensavers/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 30 00:30:02 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rosapps/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/screensavers.rbuild (added) +++ trunk/rosapps/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="cylfrac"> + <xi:include href="cylfrac/cylfrac.rbuild" /> + </directory> + <directory name="matrix"> + <xi:include href="matrix/matrix.rbuild" /> + </directory> + <directory name="scrnsave"> + <xi:include href="scrnsave/scrnsave.rbuild" /> + </directory> + <directory name="starfield"> + <xi:include href="starfield/starfield.rbuild" /> + </directory> +</group> Propchange: trunk/rosapps/applications/screensavers/screensavers.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29961… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Tue Oct 30 00:30:02 2007 @@ -7,6 +7,10 @@ </directory> --> + <directory name="applications"> + <xi:include href="applications/applications.rbuild" /> + </directory> + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory> @@ -120,4 +124,4 @@ <directory name="write"> <xi:include href="write/write.rbuild" /> </directory> -</group> +</group>

1 0

[hpoussin] 29960: Remove unneeded hack because host tools don't use target headers anymore
by hpoussin＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: hpoussin Date: Mon Oct 29 23:47:47 2007 New Revision: 29960 URL: http://svn.reactos.org/svn/reactos?rev=29960&view=rev Log: Remove unneeded hack because host tools don't use target headers anymore Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29960&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Mon Oct 29 23:47:47 2007 @@ -8,10 +8,6 @@ TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS) TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) - -# HACK: Remove those lines once host tools don't use target headers anymore -TOOLS_CFLAGS += -D__i386__ -TOOLS_CPPFLAGS += -D__i386__ $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

1 0

[dreimer] 29959: Update the Changelog once more. Remove Trailing Spaces. Version 1.0 Soon at your local nerd's house.
by dreimer＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: dreimer Date: Mon Oct 29 23:30:28 2007 New Revision: 29959 URL: http://svn.reactos.org/svn/reactos?rev=29959&view=rev Log: Update the Changelog once more. Remove Trailing Spaces. Version 1.0 Soon at your local nerd's house. Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Tools/chknewer.c Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 29 23:30:28 2007 @@ -1,50 +1,76 @@ *** XXX XXth, 200X - RosBE 1.0 Released -- Updated RosBE Configuration Tool. (Pierre Schweitzer) - - Added French translation. - - Added the possibility to choose MingW directory. - - Added check to see if MingW dir is right (look up gcc) - - Added support for WinXP style. - - Added the support of C99. - - Fixed warnings. - - Small Modification by Daniel Reimer: added -s and went from -O3 to -O2 in Makefile. - - Correct Button States and Whitespace changes. - - Save button is disabled until a parameter is changed - - Definitively fixed resources IDs - - Added check to test if log dir exists and if it doesn't, it's created - - Added check to avoid writing in a non-existant file - - Updated todo list - - Reorganized resources - - Added a basic font preview - - Continue dralnix code cleanup. - - Added checks to avoid buffers overflow. +- Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista. (Peter Ward, TODO: name of tamlin) +- Updated: Binutils 2.18.50 Build 20071015. (Peter Ward) +- Updated: NASM to 0.99.05 (Daniel Reimer) -- Added a very simple makefile for the RosBE tools. (Peter Ward) -- Updated: GCC 4.1.3 Build 20071015 with recent patches - to get makex run under Vista. (Peter Ward, TODO: name of tamlin) -- Updated: Binutils 2.18.50 Build 20071015. +- Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer) + - Added French translation. (Pierre Schweitzer) + - Added the possibility to choose MingW directory. (Pierre Schweitzer) + - Added check to see if MingW dir is right. (Pierre Schweitzer) + - Added support for WinXP style. (Pierre Schweitzer) + - Added the support of C99. (Pierre Schweitzer) + - Fixed warnings. (Pierre Schweitzer) + - Added -s and went from -O3 to -O2 in Makefile. (Daniel Reimer) + - Correct Button States and Whitespace changes. (Pierre Schweitzer) + - Save button is disabled until a parameter is changed. (Pierre Schweitzer) + - Definitively fixed resources IDs. (Pierre Schweitzer) + - Added check to test if log dir exists and if it doesn't, it's created. (Pierre Schweitzer) + - Added check to avoid writing in a non-existant file. (Pierre Schweitzer) + - Updated todo list. (Pierre Schweitzer) + - Reorganized resources. (Pierre Schweitzer) + - Added a basic font preview. (Pierre Schweitzer) + - Continue dralnix code cleanup. (Pierre Schweitzer) + - Added checks to avoid buffers overflow. (Pierre Schweitzer) + - Fixed a small regression with save button state introduced in rev 29850. (Pierre Schweitzer) + - Moved UINT i to loop as it was done previously. (Pierre Schweitzer) + - Fixed German RC File of Options.exe. (Daniel Reimer) + - Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more than one command to make. (Daniel Reimer) + - Fixed Russian RC File of options.exe (towerr) + - Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) + - Improve the GUI to be easier to understand and add two more settings. (Daniel Reimer) + - Make options.exe only write path variables if there is something to write. (Peter Ward) + +- Added a small utility (chknewer) to check if one file is newer than another. This removes the dependency on test from Config.cmd and Build.cmd. (Peter Ward) +- Added a small utility (chkslash) to check if a string contains a backslash '\', it's needed for the reladdr2line.cmd changes. +- Added the command 'chdefgcc' to allow easy switching of the current toolset. (Peter Ward) +- Added a minimal replacement for tee. (Peter Ward) +- Added ccache 2.4 to RosBE. (Daniel Reimer) +- Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) +- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) + +- Added a makefile for the RosBE tools. (Peter Ward) - Fix a warning in echoh.c. (Peter Ward) - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) -- Merge the three build.cmd files into one. (Peter Ward) -- Heaviliy cleaning up the .cmd files. (Peter Ward) -- Remove typos. (Peter Ward) -- Make variable names more consistent. (Peter Ward) - Merged the NSIS files back together. (Peter Ward) -- Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) -- Completely rewrote scut to work without *nix tools - and added a edit function (Parter Ward, Daniel Reimer) -- Updated to NASM 0.99.05 (Daniel Reimer) -- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) -- Make helpfile entries dependant on the installed optional files. (Daniel Reimer) -- Readd chdefdir due to popular Demand. (Daniel Reimer) -- Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) -- Added ccache 2.4 to RosBE. (Daniel Reimer) -- Remove trailing Spaces. (Daniel Reimer) -- Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more - than one command to make (Daniel Reimer) -- Fixed German RC File of Options.exe (Daniel Reimer) -- Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) -- Fixed Russian RC File of options.exe (towerr) + +- Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer) + - Remove typos. (Peter Ward, Daniel Reimer) + - Make variable names more consistent. (Peter Ward) + - Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) + - Merge the three build.cmd files into one. (Peter Ward) + - Remove the sed dependency from RosBE.cmd. (Peter Ward) + - Make some error messages a bit more consistent. (Peter Ward) + - Remove the need for cutz.cmd and delete it. (Peter Ward, Daniel Reimer) + - Remove the doskey macro for a component if it is not actually present. (Peter Ward) + - Remove the dependency on cut from sSVN.cmd. (Peter Ward) + - Completely rewrote scut to work without *nix tools and added a edit function (Parter Ward, Daniel Reimer) + - Fix one bug in ssvn. Now it does checkout in %CD% not %CD%/reactos (Daniel Reimer) + - Added more Error Messages to prevent confusion and stupid mistakes. (Daniel Reimer) + - Remove trailing Spaces. (Daniel Reimer) + - Make helpfile entries dependant on the installed optional files. (Daniel Reimer) + - Added echo Messages which tell a sucessful process. (Daniel Reimer) + - Sorted and fixed parts of the help. (Daniel Reimer, Peter Ward) + - Modify many "if" to "if /I" to ignore lower and upper case. (Daniel Reimer) + - Modify ERROR messages in scut to abort the process when Name and Path are specified by Shell Commands, too. (Daniel Reimer) + - Updated echo Messages a bit. (Daniel Reimer) + - Get rid of svnversion.exe and its need in ssvn.cmd. (Daniel Reimer) + - Modified reladdr2line so that you can now use 'raddr2line ntdll.dll 7c90e143' instead of 'raddr2line output-i386\dll\ntdll\ntdll.dll 7c90e143'. You can also use part of the file name ie. 'ntdll' instead of 'ntdll.dll' and it will match it. Searchs the current directory and all sub-directories. (Peter Ward) + - Add a Shortcut Listing Feature to scut.cmd. (Daniel Reimer) + +- Started to Update the Documentation. (Daniel Reimer) + *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Tools/chknewer.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/chknewer… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/chknewer.c (original) +++ trunk/tools/RosBE-Windows/Tools/chknewer.c Mon Oct 29 23:30:28 2007 @@ -53,7 +53,7 @@ fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[1]); return -1; } - file1time = getfmodtime(argv[1]); + file1time = getfmodtime(argv[1]); if (!file1time) { fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[1]); @@ -74,7 +74,7 @@ fprintf(stderr, "%s: Error closing file \"%s\"\n", argv[0], argv[2]); return -1; } - file2time = getfmodtime(argv[2]); + file2time = getfmodtime(argv[2]); if (!file2time) { fprintf(stderr, "%s: Error unable to aquire stats for file: %s\n", argv[0], argv[2]);

1 0

[fireball] 29958: - Actually create KCB where needed.
by fireball＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: fireball Date: Mon Oct 29 21:05:54 2007 New Revision: 29958 URL: http://svn.reactos.org/svn/reactos?rev=29958&view=rev Log: - Actually create KCB where needed. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Oct 29 21:05:54 2007 @@ -365,6 +365,7 @@ UNICODE_STRING TargetPath; UNICODE_STRING KeyName; PWSTR *Path = &RemainingName->Buffer; + PCM_KEY_CONTROL_BLOCK ParentKcb = NULL, Kcb; ParsedKey = ParsedObject; @@ -415,22 +416,25 @@ RtlFreeUnicodeString(&KeyName); return Status; } + + ParentKcb = ParsedKey->KeyControlBlock; + if (FoundObject == NULL) { - Status = CmiScanForSubKey(ParsedKey->RegistryHive, - ParsedKey->KeyCell, - &SubKeyCell, - &BlockOffset, - &KeyName, - 0, - Attributes); - if (!NT_SUCCESS(Status)) + /* Search for the subkey */ + BlockOffset = CmpFindSubKeyByName(&ParsedKey->RegistryHive->Hive, + ParsedKey->KeyCell, + &KeyName); + if (BlockOffset == HCELL_NIL) { ExReleaseResourceLite(&CmpRegistryLock); KeLeaveCriticalRegion(); RtlFreeUnicodeString(&KeyName); return(STATUS_UNSUCCESSFUL); } + + /* Get the node */ + SubKeyCell = (PCM_KEY_NODE)HvGetCell(&ParsedKey->RegistryHive->Hive, BlockOffset); if ((SubKeyCell->Flags & KEY_SYM_LINK) && !((Attributes & OBJ_OPENLINK) && (EndPtr == NULL))) @@ -514,7 +518,23 @@ /* Add the keep-alive reference */ ObReferenceObject(FoundObject); - + + /* Create the KCB */ + Kcb = CmpCreateKeyControlBlock(&ParsedKey->RegistryHive->Hive, + BlockOffset, + SubKeyCell, + ParentKcb, + 0, + &KeyName); + if (!Kcb) + { + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); + RtlFreeUnicodeString(&KeyName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + FoundObject->KeyControlBlock = Kcb; FoundObject->Flags = 0; FoundObject->KeyCell = SubKeyCell; FoundObject->KeyCellOffset = BlockOffset; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon Oct 29 21:05:54 2007 @@ -520,6 +520,7 @@ ULONG TimeStamp; LIST_ENTRY HiveList; CACHED_CHILD_LIST ValueCache; + PCM_KEY_CONTROL_BLOCK KeyControlBlock; } KEY_OBJECT, *PKEY_OBJECT; extern PCMHIVE CmiVolatileHive; extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Mon Oct 29 21:05:54 2007 @@ -96,6 +96,7 @@ ULONG StorageType; LARGE_INTEGER SystemTime; BOOLEAN Hack = FALSE; + PCM_KEY_CONTROL_BLOCK Kcb; /* ReactOS Hack */ if (Name->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) @@ -208,8 +209,27 @@ KeyNode->MaxClassLen = 0; KeyNode->NameLength = CmpCopyName(Hive, KeyNode->Name, Name); if (KeyNode->NameLength < Name->Length) KeyNode->Flags |= KEY_COMP_NAME; + + /* Create the KCB */ + Kcb = CmpCreateKeyControlBlock(Hive, + *KeyCell, + KeyNode, + Parent->KeyControlBlock, + 0, + Name); + if (!Kcb) + { + /* Fail */ + ObDereferenceObjectDeferDelete(*Object); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Sanity check */ + ASSERT(Kcb->RefCount == 1); /* Now fill out the Cm object */ + KeyBody->KeyControlBlock = Kcb; KeyBody->KeyCell = KeyNode; KeyBody->KeyCellOffset = *KeyCell; KeyBody->Flags = 0; 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 (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Mon Oct 29 21:05:54 2007 @@ -669,7 +669,6 @@ if (!CmpCreateRootNode(&CmiVolatileHive->Hive, L"REGISTRY", &RootIndex)) { /* We failed */ - DPRINT1("Fail\n"); return FALSE; } @@ -716,6 +715,7 @@ RootKey->ProcessID = PsGetCurrentProcessId(); #else RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); + RootKey->KeyControlBlock = Kcb; RootKey->RegistryHive = CmiVolatileHive; RootKey->KeyCellOffset = RootIndex; RootKey->KeyCell = KeyCell;

1 0

[fireball] 29957: So, finally, do that right... (re. 29956).
by fireball＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: fireball Date: Mon Oct 29 19:49:54 2007 New Revision: 29957 URL: http://svn.reactos.org/svn/reactos?rev=29957&view=rev Log: So, finally, do that right... (re. 29956). Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Mon Oct 29 19:49:54 2007 @@ -772,10 +772,10 @@ 4, 30000, NULL); - DPRINT1("CreateNamedPipeW(%S) done\n", NtControlPipeName); + DPRINT("CreateNamedPipeW(%S) done\n", NtControlPipeName); if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { - DPRINT("Failed to create control pipe!\n"); + DPRINT1("Failed to create control pipe!\n"); return GetLastError(); }

1 0

[gbrunmar] 29956: Removed debug spamming from previous checkin
by gbrunmar＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: gbrunmar Date: Mon Oct 29 19:42:36 2007 New Revision: 29956 URL: http://svn.reactos.org/svn/reactos?rev=29956&view=rev Log: Removed debug spamming from previous checkin Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Mon Oct 29 19:42:36 2007 @@ -775,7 +775,7 @@ DPRINT1("CreateNamedPipeW(%S) done\n", NtControlPipeName); if (Service->ControlPipeHandle == INVALID_HANDLE_VALUE) { - DPRINT1("Failed to create control pipe!\n"); + DPRINT("Failed to create control pipe!\n"); return GetLastError(); }

1 0

[hpoussin] 29955: Don't crash when starting a 2nd GUI application when booted in console mode
by hpoussin＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: hpoussin Date: Mon Oct 29 17:47:48 2007 New Revision: 29955 URL: http://svn.reactos.org/svn/reactos?rev=29955&view=rev Log: Don't crash when starting a 2nd GUI application when booted in console mode Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c Mon Oct 29 17:47:48 2007 @@ -96,8 +96,8 @@ { static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\"; static WCHAR DefaultExtension[] = L".DLL"; + PGD_ENABLEDRIVER ExistingDriver; SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; - GRAPHICS_DRIVER *Driver = DriverList; NTSTATUS Status; LPWSTR FullName; LPCWSTR p; @@ -152,22 +152,26 @@ } /* First see if the driver hasn't already been loaded */ - while (Driver && FullName) - { - if (!_wcsicmp( Driver->Name, FullName)) - { - return Driver->EnableDriver; - } - Driver = Driver->Next; + ExistingDriver = DRIVER_FindExistingDDIDriver(FullName); + if (ExistingDriver) + { + ExFreePool(FullName); + return ExistingDriver; } /* If not, then load it */ RtlInitUnicodeString (&GdiDriverInfo.DriverName, FullName); Status = ZwSetSystemInformation (SystemLoadGdiDriverInformation, &GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION)); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(FullName); + return NULL; + } + + DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); + DRIVER_RegisterDriver( FullName, GdiDriverInfo.EntryPoint); ExFreePool(FullName); - if (!NT_SUCCESS(Status)) return NULL; - - DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Mon Oct 29 17:47:48 2007 @@ -293,12 +293,11 @@ BOOL FASTCALL co_IntInitializeDesktopGraphics(VOID) { - UNICODE_STRING DriverName; + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); if (! IntCreatePrimarySurface()) { return FALSE; } - RtlInitUnicodeString(&DriverName, L"DISPLAY"); ScreenDeviceContext = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); if (NULL == ScreenDeviceContext) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Oct 29 17:47:48 2007 @@ -530,16 +530,17 @@ } } - RtlFreeUnicodeString(&DriverFileNames); - if (!GotDriver) { ObDereferenceObject(PrimarySurface.VideoFileObject); + RtlFreeUnicodeString(&DriverFileNames); DPRINT1("No suitable DDI driver found\n"); continue; } DPRINT("Display driver %S loaded\n", CurrentName); + + RtlFreeUnicodeString(&DriverFileNames); DPRINT("Building DDI Functions\n"); @@ -800,6 +801,8 @@ PrimarySurface.DriverFunctions.DisableSurface(PrimarySurface.PDev); PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.PDev); PrimarySurface.PreparedDriver = FALSE; + KeSetEvent(&VideoDriverNeedsPreparation, 1, FALSE); + KeResetEvent(&VideoDriverPrepared); DceEmptyCache();

1 0

[fireball] 29954: - Merge KCB/NCB code (and related delay alloc/free implementation) from cm-rewrite branch. Only "used" in one call so it shouldn't affect anything.
by fireball＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: fireball Date: Mon Oct 29 17:44:26 2007 New Revision: 29954 URL: http://svn.reactos.org/svn/reactos?rev=29954&view=rev Log: - Merge KCB/NCB code (and related delay alloc/free implementation) from cm-rewrite branch. Only "used" in one call so it shouldn't affect anything. Added: trunk/reactos/ntoskrnl/config/cmalloc.c (with props) trunk/reactos/ntoskrnl/config/cmdelay.c (with props) Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cm_x.h trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Oct 29 17:44:26 2007 @@ -226,8 +226,8 @@ /* Precondition: Must not hold the hive lock CmpRegistryLock */ VOID NTAPI -EnlistKeyBodyWithKCB(IN PKEY_OBJECT KeyObject, - IN ULONG Flags) +EnlistKeyBodyWithKeyObject(IN PKEY_OBJECT KeyObject, + IN ULONG Flags) { /* Acquire hive lock */ KeEnterCriticalRegion(); Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Mon Oct 29 17:44:26 2007 @@ -307,6 +307,15 @@ ULONG Reserved; PVOID AllocPage; } CM_ALLOC_PAGE, *PCM_ALLOC_PAGE; + +// +// Allocation Page Entry +// +typedef struct _CM_DELAY_ALLOC +{ + LIST_ENTRY ListEntry; + PCM_KEY_CONTROL_BLOCK Kcb; +} CM_DELAY_ALLOC, *PCM_DELAY_ALLOC; // // Delayed Close Entry @@ -788,6 +797,9 @@ VOID ); +// +// Delay Functions +// PVOID NTAPI CmpAllocateDelayItem( @@ -798,6 +810,29 @@ NTAPI CmpFreeDelayItem( PVOID Entry +); + +VOID +NTAPI +CmpDelayDerefKeyControlBlock( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI +CmpAddToDelayedClose( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively +); + +VOID +NTAPI +CmpRemoveFromDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb); + +VOID +NTAPI +CmpInitializeDelayedCloseTable( + VOID ); // @@ -814,22 +849,44 @@ IN PUNICODE_STRING KeyName ); -VOID -NTAPI -CmpDereferenceKcbWithLock( +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpAllocateKeyControlBlock( + VOID +); + +VOID +NTAPI +CmpFreeKeyControlBlock( + IN PCM_KEY_CONTROL_BLOCK Kcb +); + +VOID +NTAPI +CmpCleanUpKcbCacheWithLock( IN PCM_KEY_CONTROL_BLOCK Kcb, IN BOOLEAN LockHeldExclusively ); VOID NTAPI +CmpDereferenceKeyControlBlockWithLock( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively +); + +VOID +NTAPI EnlistKeyBodyWithKCB( -#if 0 IN PCM_KEY_BODY KeyObject, -#else - IN PKEY_OBJECT KeyObject, -#endif IN ULONG Flags +); + +VOID +NTAPI +EnlistKeyBodyWithKeyObject( + IN PKEY_OBJECT KeyObject, + IN ULONG Flags ); NTSTATUS @@ -1276,6 +1333,7 @@ extern BOOLEAN ExpInTextModeSetup; extern BOOLEAN InitIsWinPEMode; extern ULONG CmpHashTableSize; +extern ULONG CmpDelayedCloseSize, CmpDelayedCloseIndex; // // Inlined functions Modified: trunk/reactos/ntoskrnl/config/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm_x.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm_x.h (original) +++ trunk/reactos/ntoskrnl/config/cm_x.h Mon Oct 29 17:44:26 2007 @@ -200,6 +200,18 @@ } // +// Converts a KCB lock +// +FORCEINLINE +VOID +CmpConvertKcbSharedToExclusive(IN PCM_KEY_CONTROL_BLOCK k) +{ + ASSERT(CmpIsKcbLockedExclusive(k) == FALSE); + CmpReleaseKcbLock(k); + CmpAcquireKcbLockExclusive(k); +} + +// // Exclusively acquires an NCB // #define CmpAcquireNcbLockExclusive(n) \ @@ -209,6 +221,15 @@ } // +// Exclusively acquires an NCB by key +// +#define CmpAcquireNcbLockExclusiveByKey(k) \ +{ \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} + +// // Releases an exlusively or shared acquired NCB // #define CmpReleaseNcbLock(k) \ @@ -216,3 +237,12 @@ ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ (k)->ConvKey).Lock); \ } + +// +// Releases an exlusively or shared acquired NCB by key +// +#define CmpReleaseNcbLockByKey(k) \ +{ \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)).Lock); \ +} Added: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c (added) +++ trunk/reactos/ntoskrnl/config/cmalloc.c Mon Oct 29 17:44:26 2007 @@ -1,0 +1,305 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmalloc.c + * PURPOSE: Routines for allocating and freeing registry structures + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> +#include "cm.h" + +/* GLOBALS *******************************************************************/ + +BOOLEAN CmpAllocInited; +KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; + +LIST_ENTRY CmpFreeKCBListHead; +KGUARDED_MUTEX CmpDelayAllocBucketLock; +LIST_ENTRY CmpFreeDelayItemsListHead; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpInitCmPrivateAlloc(VOID) +{ + /* Make sure we didn't already do this */ + if (!CmpAllocInited) + { + /* Setup the lock and list */ + KeInitializeGuardedMutex(&CmpAllocBucketLock); + InitializeListHead(&CmpFreeKCBListHead); + CmpAllocInited = TRUE; + } +} + +VOID +NTAPI +CmpInitCmPrivateDelayAlloc(VOID) +{ + /* Initialize the delay allocation list and lock */ + KeInitializeGuardedMutex(&CmpDelayAllocBucketLock); + InitializeListHead(&CmpFreeDelayItemsListHead); +} + +VOID +NTAPI +CmpFreeKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + ULONG i; + PCM_ALLOC_PAGE AllocPage; + PAGED_CODE(); + + /* Sanity checks */ + ASSERT(IsListEmpty(&(Kcb->KeyBodyListHead)) == TRUE); + for (i = 0; i < 4; i++) ASSERT(Kcb->KeyBodyArray[i] == NULL); + + /* Check if it wasn't privately allocated */ + if (!Kcb->PrivateAlloc) + { + /* Free it from the pool */ + ExFreePool(Kcb); + return; + } + + /* Acquire the private allocation lock */ + KeAcquireGuardedMutex(&CmpAllocBucketLock); + + /* Sanity check on lock ownership */ + ASSERT((GET_HASH_ENTRY(CmpCacheTable, Kcb->ConvKey).Owner == + KeGetCurrentThread()) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Add us to the free list */ + InsertTailList(&CmpFreeKCBListHead, &Kcb->FreeListEntry); + + /* Get the allocation page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Kcb & 0xFFFFF000); + + /* Sanity check */ + ASSERT(AllocPage->FreeCount != CM_KCBS_PER_PAGE); + + /* Increase free count */ + if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) + { + /* Loop all the entries */ + for (i = CM_KCBS_PER_PAGE; i; i--) + { + /* Get the KCB */ + Kcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); + + /* Remove the entry */ + RemoveEntryList(&Kcb->FreeListEntry); + } + + /* Free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); +} + +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpAllocateKeyControlBlock(VOID) +{ + PLIST_ENTRY NextEntry; + PCM_KEY_CONTROL_BLOCK CurrentKcb; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PAGED_CODE(); + + /* Check if private allocations are initialized */ + if (CmpAllocInited) + { + /* They are, acquire the bucket lock */ + KeAcquireGuardedMutex(&CmpAllocBucketLock); + + /* See if there's something on the free KCB list */ +SearchKcbList: + if (!IsListEmpty(&CmpFreeKCBListHead)) + { + /* Remove the entry */ + NextEntry = RemoveHeadList(&CmpFreeKCBListHead); + + /* Get the KCB */ + CurrentKcb = CONTAINING_RECORD(NextEntry, + CM_KEY_CONTROL_BLOCK, + FreeListEntry); + + /* Get the allocation page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)CurrentKcb & 0xFFFFF000); + + /* Decrease the free count */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Make sure this KCB is privately allocated */ + ASSERT(CurrentKcb->PrivateAlloc == 1); + + /* Release the allocation lock */ + KeReleaseGuardedMutex(&CmpAllocBucketLock); + + /* Return the KCB */ + return CurrentKcb; + } + + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_KCBS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_KCBS_PER_PAGE; i++) + { + /* Get this entry */ + CurrentKcb = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_KEY_CONTROL_BLOCK)); + + /* Set it up */ + CurrentKcb->PrivateAlloc = TRUE; + CurrentKcb->DelayCloseEntry = NULL; + InsertHeadList(&CmpFreeKCBListHead, + &CurrentKcb->FreeListEntry); + } + + /* Now go back and search the list */ + goto SearchKcbList; + } + } + + /* Allocate a KCB only */ + CurrentKcb = ExAllocatePoolWithTag(PagedPool, + sizeof(CM_KEY_CONTROL_BLOCK), + TAG_CM); + if (CurrentKcb) + { + /* Set it up */ + CurrentKcb->PrivateAlloc = 0; + CurrentKcb->DelayCloseEntry = NULL; + } + + /* Return it */ + return CurrentKcb; +} + +PVOID +NTAPI +CmpAllocateDelayItem(VOID) +{ + PCM_DELAY_ALLOC Entry; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Lock the allocation buckets */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + + /* Look for an item on the free list */ +SearchList: + if (!IsListEmpty(&CmpFreeDelayItemsListHead)) + { + /* Get the current entry in the list */ + NextEntry = RemoveHeadList(&CmpFreeDelayItemsListHead); + + /* Grab the item */ + Entry = CONTAINING_RECORD(NextEntry, CM_DELAY_ALLOC, ListEntry); + + /* Clear the list */ + Entry->ListEntry.Flink = Entry->ListEntry.Blink = NULL; + + /* Grab the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } + + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + { + /* Get this entry and link it */ + Entry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + InsertTailList(&CmpFreeDelayItemsListHead, + &Entry->ListEntry); + + /* Clear the KCB pointer */ + Entry->Kcb = NULL; + } + } + else + { + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return NULL; + } + + /* Do the search again */ + goto SearchList; +} + +VOID +NTAPI +CmpFreeDelayItem(PVOID Entry) +{ + PCM_DELAY_ALLOC AllocEntry = (PCM_DELAY_ALLOC)Entry; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PAGED_CODE(); + + /* Lock the table */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + + /* Add the entry at the end */ + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->ListEntry); + + /* Get the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); + + /* Increase the number of free items */ + if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) + { + /* Page is totally free now, loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + { + /* Get the entry and unlink it */ + AllocEntry = (PVOID)((ULONG_PTR)AllocPage + + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + + i * sizeof(CM_DELAY_ALLOC)); + RemoveEntryList(&AllocEntry->ListEntry); + } + + /* Now free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); +} Propchange: trunk/reactos/ntoskrnl/config/cmalloc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c (added) +++ trunk/reactos/ntoskrnl/config/cmdelay.c Mon Oct 29 17:44:26 2007 @@ -1,0 +1,307 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmdelay.c + * PURPOSE: Routines for handling delay close and allocate. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> +#include "cm.h" + +/* GLOBALS *******************************************************************/ + +WORK_QUEUE_ITEM CmpDelayDerefKCBWorkItem; +LIST_ENTRY CmpFreeDelayItemsListHead; + +ULONG CmpDelayedCloseSize = 2048; +ULONG CmpDelayedCloseElements; +KGUARDED_MUTEX CmpDelayedCloseTableLock; +BOOLEAN CmpDelayCloseWorkItemActive; +WORK_QUEUE_ITEM CmpDelayCloseWorkItem; +LIST_ENTRY CmpDelayedLRUListHead; +ULONG CmpDelayCloseIntervalInSeconds = 5; +KDPC CmpDelayCloseDpc; +KTIMER CmpDelayCloseTimer; + +KGUARDED_MUTEX CmpDelayDerefKCBLock; +BOOLEAN CmpDelayDerefKCBWorkItemActive; +LIST_ENTRY CmpDelayDerefKCBListHead; +ULONG CmpDelayDerefKCBIntervalInSeconds = 5; +KDPC CmpDelayDerefKCBDpc; +KTIMER CmpDelayDerefKCBTimer; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpDelayCloseDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Sanity check */ + ASSERT(CmpDelayCloseWorkItemActive); + + /* Queue the work item */ + ExQueueWorkItem(&CmpDelayCloseWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +CmpDelayCloseWorker(IN PVOID Context) +{ + PAGED_CODE(); + + /* Sanity check */ + ASSERT(CmpDelayCloseWorkItemActive); + + /* FIXME: TODO */ + ASSERT(FALSE); +} + +VOID +NTAPI +CmpInitializeDelayedCloseTable(VOID) +{ + + /* Setup the delayed close lock */ + KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); + + /* Setup the work item */ + ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); + + /* Setup the list head */ + InitializeListHead(&CmpDelayedLRUListHead); + + /* Setup the DPC and its timer */ + KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); + KeInitializeTimer(&CmpDelayCloseTimer); +} + +VOID +NTAPI +CmpDelayDerefKCBDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + /* Sanity check */ + ASSERT(CmpDelayDerefKCBWorkItemActive); + + /* Queue the work item */ + ExQueueWorkItem(&CmpDelayDerefKCBWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +CmpDelayDerefKCBWorker(IN PVOID Context) +{ + PAGED_CODE(); + + /* Sanity check */ + ASSERT(CmpDelayDerefKCBWorkItemActive); + + /* FIXME: TODO */ + ASSERT(FALSE); +} + +VOID +NTAPI +CmpInitDelayDerefKCBEngine(VOID) +{ + /* Initialize lock and list */ + KeInitializeGuardedMutex(&CmpDelayDerefKCBLock); + InitializeListHead(&CmpDelayDerefKCBListHead); + + /* Setup the work item */ + ExInitializeWorkItem(&CmpDelayDerefKCBWorkItem, + CmpDelayDerefKCBWorker, + NULL); + + /* Setup the DPC and timer for it */ + KeInitializeDpc(&CmpDelayDerefKCBDpc, CmpDelayDerefKCBDpcRoutine, NULL); + KeInitializeTimer(&CmpDelayDerefKCBTimer); +} + +VOID +NTAPI +CmpDelayDerefKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + USHORT OldRefCount, NewRefCount; + LARGE_INTEGER Timeout; + PCM_DELAY_DEREF_KCB_ITEM Entry; + PAGED_CODE(); + + /* Get the previous reference count */ + OldRefCount = Kcb->RefCount; + + /* Write the new one */ + NewRefCount = (USHORT)InterlockedCompareExchange((PLONG)&Kcb->RefCount, + OldRefCount - 1, + OldRefCount); + if (NewRefCount != OldRefCount) return; + + /* Allocate a delay item */ + Entry = CmpAllocateDelayItem(); + if (!Entry) return; + + /* Set the KCB */ + Entry->Kcb = Kcb; + + /* Acquire the delayed deref table lock */ + KeAcquireGuardedMutex(&CmpDelayDerefKCBLock); + + /* Insert the entry into the list */ + InsertTailList(&CmpDelayDerefKCBListHead, &Entry->ListEntry); + + /* Check if we need to enable anything */ + if (!CmpDelayDerefKCBWorkItemActive) + { + /* Yes, we have no work item, setup the interval */ + Timeout.QuadPart = CmpDelayDerefKCBIntervalInSeconds * -10000000; + KeSetTimer(&CmpDelayDerefKCBTimer, Timeout, &CmpDelayDerefKCBDpc); + } + + /* Release the table lock */ + KeReleaseGuardedMutex(&CmpDelayDerefKCBLock); +} + +VOID +NTAPI +CmpArmDelayedCloseTimer(VOID) +{ + LARGE_INTEGER Timeout; + PAGED_CODE(); + + /* Setup the interval */ + Timeout.QuadPart = CmpDelayCloseIntervalInSeconds * -10000000; + KeSetTimer(&CmpDelayCloseTimer, Timeout, &CmpDelayCloseDpc); +} + +VOID +NTAPI +CmpAddToDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) +{ + ULONG i; + ULONG OldRefCount, NewRefCount; + PCM_DELAYED_CLOSE_ENTRY Entry; + PAGED_CODE(); + + /* Sanity check */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Make sure it's valid */ + if (Kcb->DelayedCloseIndex != CmpDelayedCloseSize) ASSERT(FALSE); + + /* Sanity checks */ + ASSERT(Kcb->RefCount == 0); + ASSERT(IsListEmpty(&Kcb->KeyBodyListHead) == TRUE); + for (i = 0; i < 4; i++) ASSERT(Kcb->KeyBodyArray[i] == NULL); + + /* Allocate a delay item */ + Entry = CmpAllocateDelayItem(); + if (!Entry) + { + /* Cleanup immediately */ + CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); + return; + } + + /* Sanity check */ + if (Kcb->InDelayClose) ASSERT(FALSE); + + /* Get the previous reference count */ + OldRefCount = Kcb->InDelayClose; + ASSERT(OldRefCount == 0); + + /* Write the new one */ + NewRefCount = InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, + 1, + OldRefCount); + if (NewRefCount != OldRefCount) ASSERT(FALSE); + + /* Reset the delayed close index */ + Kcb->DelayedCloseIndex = 0; + + /* Set up the close entry */ + Kcb->DelayCloseEntry = Entry; + Entry->KeyControlBlock = Kcb; + + /* Increase the number of elements */ + InterlockedIncrement((PLONG)&CmpDelayedCloseElements); + + /* Acquire the delayed close table lock */ + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Insert the entry into the list */ + InsertHeadList(&CmpDelayedLRUListHead, &Entry->DelayedLRUList); + + /* Check if we need to enable anything */ + if ((CmpDelayedCloseElements > CmpDelayedCloseSize) && + !(CmpDelayCloseWorkItemActive)) + { + /* Yes, we have too many elements to close, and no work item */ + CmpArmDelayedCloseTimer(); + } + + /* Release the table lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); +} + +VOID +NTAPI +CmpRemoveFromDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + PCM_DELAYED_CLOSE_ENTRY Entry; + ULONG NewRefCount, OldRefCount; + PAGED_CODE(); + + /* Sanity checks */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + if (Kcb->DelayedCloseIndex == CmpDelayedCloseSize) ASSERT(FALSE); + + /* Get the entry and lock the table */ + Entry = Kcb->DelayCloseEntry; + ASSERT(Entry); + KeAcquireGuardedMutex(&CmpDelayedCloseTableLock); + + /* Remove the entry */ + RemoveEntryList(&Entry->DelayedLRUList); + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayedCloseTableLock); + + /* Free the entry */ + CmpFreeDelayItem(Entry); + + /* Reduce the number of elements */ + InterlockedDecrement((PLONG)&CmpDelayedCloseElements); + + /* Sanity check */ + if (!Kcb->InDelayClose) ASSERT(FALSE); + + /* Get the old reference count */ + OldRefCount = Kcb->InDelayClose; + ASSERT(OldRefCount == 1); + + /* Set it to 0 */ + NewRefCount = InterlockedCompareExchange((PLONG)&Kcb->InDelayClose, + 0, + OldRefCount); + if (NewRefCount != OldRefCount) ASSERT(FALSE); + + /* Remove the link to the entry */ + Kcb->DelayCloseEntry = NULL; + + /* Set new delay size and remove the delete flag */ + Kcb->DelayedCloseIndex = CmpDelayedCloseSize; +} + Propchange: trunk/reactos/ntoskrnl/config/cmdelay.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Mon Oct 29 17:44:26 2007 @@ -2,16 +2,16 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/config/cmkcbncb.c - * PURPOSE: Configuration Manager - Key Control and Name Control Blocks + * PURPOSE: Routines for handling KCBs, NCBs, as well as key hashes. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ -#include "ntoskrnl.h" +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> #include "cm.h" -#define NDEBUG -#include "debug.h" /* GLOBALS *******************************************************************/ @@ -19,159 +19,530 @@ PCM_KEY_HASH_TABLE_ENTRY CmpCacheTable; PCM_NAME_HASH_TABLE_ENTRY CmpNameCacheTable; -LIST_ENTRY CmpFreeKCBListHead; - -BOOLEAN CmpAllocInited; -KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; -WORK_QUEUE_ITEM CmpDelayDerefKCBWorkItem; -LIST_ENTRY CmpFreeDelayItemsListHead; - -ULONG CmpDelayedCloseSize; -ULONG CmpDelayedCloseElements; -KGUARDED_MUTEX CmpDelayedCloseTableLock; -BOOLEAN CmpDelayCloseWorkItemActive; -WORK_QUEUE_ITEM CmpDelayCloseWorkItem; -LIST_ENTRY CmpDelayedLRUListHead; -ULONG CmpDelayCloseIntervalInSeconds = 5; -KDPC CmpDelayCloseDpc; -KTIMER CmpDelayCloseTimer; - -KGUARDED_MUTEX CmpDelayDerefKCBLock; -BOOLEAN CmpDelayDerefKCBWorkItemActive; -LIST_ENTRY CmpDelayDerefKCBListHead; -ULONG CmpDelayDerefKCBIntervalInSeconds = 5; -KDPC CmpDelayDerefKCBDpc; -KTIMER CmpDelayDerefKCBTimer; - BOOLEAN CmpHoldLazyFlush; /* FUNCTIONS *****************************************************************/ VOID NTAPI -CmpDelayCloseDpcRoutine(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - /* Sanity check */ - ASSERT(CmpDelayCloseWorkItemActive); - - /* Queue the work item */ - ExQueueWorkItem(&CmpDelayCloseWorkItem, DelayedWorkQueue); -} - -VOID -NTAPI -CmpDelayCloseWorker(IN PVOID Context) -{ - PAGED_CODE(); - - /* Sanity check */ - ASSERT(CmpDelayCloseWorkItemActive); - - /* FIXME: TODO */ -} - -VOID -NTAPI CmpInitializeCache(VOID) { - ULONG Length; - + ULONG Length, i; + /* Calculate length for the table */ - Length = CmpHashTableSize * sizeof(PCM_KEY_HASH); - + Length = CmpHashTableSize * sizeof(CM_KEY_HASH_TABLE_ENTRY); + /* Allocate it */ CmpCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); + if (!CmpCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 1, 0, 0); + } + + /* Zero out the table */ RtlZeroMemory(CmpCacheTable, Length); - + + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpCacheTable[i].Lock); + } + /* Calculate length for the name cache */ - Length = CmpHashTableSize * sizeof(PCM_NAME_HASH); - + Length = CmpHashTableSize * sizeof(CM_NAME_HASH_TABLE_ENTRY); + /* Now allocate the name cache table */ CmpNameCacheTable = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); - if (!CmpCacheTable) KeBugCheck(CONFIG_INITIALIZATION_FAILED); + if (!CmpNameCacheTable) + { + /* Take the system down */ + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 3, 3, 0, 0); + } + + /* Zero out the table */ RtlZeroMemory(CmpNameCacheTable, Length); - /* Setup the delayed close lock */ - KeInitializeGuardedMutex(&CmpDelayedCloseTableLock); - - /* Setup the work item */ - ExInitializeWorkItem(&CmpDelayCloseWorkItem, CmpDelayCloseWorker, NULL); - - /* Setup the DPC and its timer */ - KeInitializeDpc(&CmpDelayCloseDpc, CmpDelayCloseDpcRoutine, NULL); - KeInitializeTimer(&CmpDelayCloseTimer); -} - -VOID -NTAPI -CmpInitCmPrivateDelayAlloc(VOID) -{ - /* Initialize the delay allocation list and lock */ - KeInitializeGuardedMutex(&CmpDelayAllocBucketLock); - InitializeListHead(&CmpFreeDelayItemsListHead); -} - -VOID -NTAPI -CmpInitCmPrivateAlloc(VOID) -{ - /* Make sure we didn't already do this */ - if (!CmpAllocInited) - { - /* Setup the lock and list */ - KeInitializeGuardedMutex(&CmpAllocBucketLock); - InitializeListHead(&CmpFreeKCBListHead); - CmpAllocInited = TRUE; - } -} - -VOID -NTAPI -CmpDelayDerefKCBDpcRoutine(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ + /* Initialize the locks */ + for (i = 0;i < CmpHashTableSize; i++) + { + /* Setup the pushlock */ + ExInitializePushLock((PULONG_PTR)&CmpNameCacheTable[i].Lock); + } + + /* Setup the delayed close table */ + CmpInitializeDelayedCloseTable(); +} + +VOID +NTAPI +CmpRemoveKeyHash(IN PCM_KEY_HASH KeyHash) +{ + PCM_KEY_HASH *Prev; + PCM_KEY_HASH Current; + + /* Lookup all the keys in this index entry */ + Prev = &GET_HASH_ENTRY(CmpCacheTable, KeyHash->ConvKey).Entry; + while (TRUE) + { + /* Save the current one and make sure it's valid */ + Current = *Prev; + ASSERT(Current != NULL); + + /* Check if it matches */ + if (Current == KeyHash) + { + /* Then write the previous one */ + *Prev = Current->NextHash; + break; + } + + /* Otherwise, keep going */ + Prev = &Current->NextHash; + } +} + +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpInsertKeyHash(IN PCM_KEY_HASH KeyHash, + IN BOOLEAN IsFake) +{ + ULONG i; + PCM_KEY_HASH Entry; + + /* Get the hash index */ + i = GET_HASH_INDEX(KeyHash->ConvKey); + + /* If this is a fake key, increase the key cell to use the parent data */ + if (IsFake) KeyHash->KeyCell++; + + /* Loop the hash table */ + Entry = CmpCacheTable[i].Entry; + while (Entry) + { + /* Check if this matches */ + if ((KeyHash->ConvKey == Entry->ConvKey) && + (KeyHash->KeyCell == Entry->KeyCell) && + (KeyHash->KeyHive == Entry->KeyHive)) + { + /* Return it */ + return CONTAINING_RECORD(Entry, CM_KEY_CONTROL_BLOCK, KeyHash); + } + + /* Keep looping */ + Entry = Entry->NextHash; + } + + /* No entry found, add this one and return NULL since none existed */ + KeyHash->NextHash = CmpCacheTable[i].Entry; + CmpCacheTable[i].Entry = KeyHash; + return NULL; +} + +PCM_NAME_CONTROL_BLOCK +NTAPI +CmpGetNameControlBlock(IN PUNICODE_STRING NodeName) +{ + PCM_NAME_CONTROL_BLOCK Ncb = NULL; + ULONG ConvKey = 0; + PWCHAR p, pp; + ULONG i; + BOOLEAN IsCompressed = TRUE, Found = FALSE; + PCM_NAME_HASH HashEntry; + ULONG Length, NcbSize; + + /* Loop the name */ + p = NodeName->Buffer; + for (i = 0; i < NodeName->Length; i += sizeof(WCHAR)) + { + /* Make sure it's not a slash */ + if (*p != OBJ_NAME_PATH_SEPARATOR) + { + /* Add it to the hash */ + ConvKey = 37 * ConvKey + RtlUpcaseUnicodeChar(*p); + } + + /* Next character */ + p++; + } + + /* Set assumed lengh and loop to check */ + Length = NodeName->Length / sizeof(WCHAR); + for (i = 0; i < (NodeName->Length / sizeof(WCHAR)); i++) + { + /* Check if this is a valid character */ + if (*NodeName->Buffer > (UCHAR)-1) + { + /* This is the actual size, and we know we're not compressed */ + Length = NodeName->Length; + IsCompressed = FALSE; + } + } + + /* Lock the NCB entry */ + CmpAcquireNcbLockExclusiveByKey(ConvKey); + + /* Get the hash entry */ + HashEntry = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; + while (HashEntry) + { + /* Get the current NCB */ + Ncb = CONTAINING_RECORD(HashEntry, CM_NAME_CONTROL_BLOCK, NameHash); + + /* Check if the hash matches */ + if ((ConvKey = HashEntry->ConvKey) && (Length = Ncb->NameLength)) + { + /* Assume success */ + Found = TRUE; + + /* If the NCB is compressed, do a compressed name compare */ + if (Ncb->Compressed) + { + /* Compare names */ + if (CmpCompareCompressedName(NodeName, Ncb->Name, Length)) + { + /* We failed */ + Found = FALSE; + } + } + else + { + /* Do a manual compare */ + p = NodeName->Buffer; + pp = Ncb->Name; + for (i = 0; i < Ncb->NameLength; i += sizeof(WCHAR)) + { + /* Compare the character */ + if (RtlUpcaseUnicodeChar(*p) != RtlUpcaseUnicodeChar(*pp)) + { + /* Failed */ + Found = FALSE; + break; + } + + /* Next chars */ + p++; + pp++; + } + } + + /* Check if we found a name */ + if (Found) + { + /* Reference it */ + Ncb->RefCount++; + } + } + + /* Go to the next hash */ + HashEntry = HashEntry->NextHash; + } + + /* Check if we didn't find it */ + if (!Found) + { + /* Allocate one */ + NcbSize = FIELD_OFFSET(CM_NAME_CONTROL_BLOCK, Name) + Length; + Ncb = ExAllocatePoolWithTag(PagedPool, NcbSize, TAG_CM); + if (!Ncb) + { + /* Release the lock and fail */ + CmpReleaseNcbLockByKey(ConvKey); + return NULL; + } + + /* Clear it out */ + RtlZeroMemory(Ncb, NcbSize); + + /* Check if the name was compressed */ + if (IsCompressed) + { + /* Copy the compressed name */ + Ncb->Compressed = TRUE; + for (i = 0; i < Length; i++) + { + /* Copy Unicode to ANSI */ + ((PCHAR)Ncb->Name)[i] = (CHAR)RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + else + { + /* Copy the name directly */ + Ncb->Compressed = FALSE; + for (i = 0; i < Length; i++) + { + /* Copy each unicode character */ + Ncb->Name[i] = RtlUpcaseUnicodeChar(NodeName->Buffer[i]); + } + } + + /* Setup the rest of the NCB */ + Ncb->ConvKey = ConvKey; + Ncb->RefCount++; + Ncb->NameLength = Length; + + /* Insert the name in the hash table */ + HashEntry = &Ncb->NameHash; + HashEntry->NextHash = GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry; + GET_HASH_ENTRY(CmpNameCacheTable, ConvKey).Entry = HashEntry; + } + + /* Release NCB lock */ + CmpReleaseNcbLockByKey(ConvKey); + + /* Return the NCB found */ + return Ncb; +} + +VOID +NTAPI +CmpRemoveKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + /* Make sure that the registry and KCB are utterly locked */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Remove the key hash */ + CmpRemoveKeyHash(&Kcb->KeyHash); +} + +VOID +NTAPI +CmpDereferenceNameControlBlockWithLock(IN PCM_NAME_CONTROL_BLOCK Ncb) +{ + PCM_NAME_HASH Current, *Next; + + /* Lock the NCB */ + CmpAcquireNcbLockExclusive(Ncb); + + /* Decrease the reference count */ + if (!(--Ncb->RefCount)) + { + /* Find the NCB in the table */ + Next = &GET_HASH_ENTRY(CmpNameCacheTable, Ncb->ConvKey).Entry; + while (TRUE) + { + /* Check the current entry */ + Current = *Next; + ASSERT(Current != NULL); + if (Current == &Ncb->NameHash) + { + /* Unlink it */ + *Next = Current->NextHash; + break; + } + + /* Get to the next one */ + Next = &Current->NextHash; + } + + /* Found it, now free it */ + ExFreePool(Ncb); + } + + /* Release the lock */ + CmpReleaseNcbLock(Ncb); +} + +BOOLEAN +NTAPI +CmpReferenceKeyControlBlock(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + /* Check if this is the KCB's first reference */ + if (Kcb->RefCount == 0) + { + /* Check if the KCB is locked in shared mode */ + if (!CmpIsKcbLockedExclusive(Kcb)) + { + /* Convert it to exclusive */ + if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) + { + /* Set the delayed close index so that we can be ignored */ + Kcb->DelayedCloseIndex = 1; + + /* Increase the reference count while we release the lock */ + InterlockedIncrement((PLONG)&Kcb->RefCount); + + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); + + /* Decrement the reference count; the lock is now held again */ + InterlockedDecrement((PLONG)&Kcb->RefCount); + + /* Check if we still control the index */ + if (Kcb->DelayedCloseIndex == 1) + { + /* Reset it */ + Kcb->DelayedCloseIndex = 0; + } + else + { + /* Sanity check */ + ASSERT((Kcb->DelayedCloseIndex == CmpDelayedCloseSize) || + (Kcb->DelayedCloseIndex == 0)); + } + } + } + } + + /* Increase the reference count */ + if (InterlockedIncrement((PLONG)&Kcb->RefCount) == 0) + { + /* We've overflown to 64K references, bail out */ + InterlockedDecrement((PLONG)&Kcb->RefCount); + return FALSE; + } + + /* Check if this was the last close index */ + if (!Kcb->DelayedCloseIndex) + { + /* Check if the KCB is locked in shared mode */ + if (!CmpIsKcbLockedExclusive(Kcb)) + { + /* Convert it to exclusive */ + if (!CmpTryToConvertKcbSharedToExclusive(Kcb)) + { + /* Go from shared to exclusive */ + CmpConvertKcbSharedToExclusive(Kcb); + } + } + + /* If we're still the last entry, remove us */ + if (!Kcb->DelayedCloseIndex) CmpRemoveFromDelayedClose(Kcb); + } + + /* Return success */ + return TRUE; +} + +VOID +NTAPI +CmpCleanUpKcbValueCache(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + PULONG_PTR CachedList; + ULONG i; + /* Sanity check */ - ASSERT(CmpDelayDerefKCBWorkItemActive); - - /* Queue the work item */ - ExQueueWorkItem(&CmpDelayDerefKCBWorkItem, DelayedWorkQueue); -} - -VOID -NTAPI -CmpDelayDerefKCBWorker(IN PVOID Context) -{ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Check if the value list is cached */ + if (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList)) + { + /* Get the cache list */ + CachedList = (PULONG_PTR)CMP_GET_CACHED_DATA(Kcb->ValueCache.ValueList); + for (i = 0; i < Kcb->ValueCache.Count; i++) + { + /* Check if this cell is cached */ + if (CMP_IS_CELL_CACHED(CachedList[i])) + { + /* Free it */ + ExFreePool((PVOID)CMP_GET_CACHED_CELL(CachedList[i])); + } + } + + /* Now free the list */ + ExFreePool((PVOID)CMP_GET_CACHED_CELL(Kcb->ValueCache.ValueList)); + Kcb->ValueCache.ValueList = HCELL_NIL; + } + else if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* This is a sym link, check if there's only one reference left */ + if ((((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->RefCount == 1) && + !(((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->Delete)) + { + /* Disable delay close for the KCB */ + ((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb)->ExtFlags |= CM_KCB_NO_DELAY_CLOSE; + } + + /* Dereference the KCB */ + CmpDelayDerefKeyControlBlock((PCM_KEY_CONTROL_BLOCK)Kcb->ValueCache.RealKcb); + Kcb->ExtFlags &= ~CM_KCB_SYM_LINK_FOUND; + } +} + +VOID +NTAPI +CmpCleanUpKcbCacheWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) +{ + PCM_KEY_CONTROL_BLOCK Parent; PAGED_CODE(); + /* Sanity checks */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + ASSERT(Kcb->RefCount == 0); + + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Reference the NCB */ + CmpDereferenceNameControlBlockWithLock(Kcb->NameBlock); + + /* Check if we have an index hint block and free it */ + if (Kcb->ExtFlags & CM_KCB_SUBKEY_HINT) ExFreePool(Kcb->IndexHint); + + /* Check if we were already deleted */ + Parent = Kcb->ParentKcb; + if (!Kcb->Delete) CmpRemoveKeyControlBlock(Kcb); + + /* Free the KCB as well */ + CmpFreeKeyControlBlock(Kcb); + + /* Check if we have a parent */ + if (Parent) + { + /* Dereference the parent */ + LockHeldExclusively ? + CmpDereferenceKeyControlBlockWithLock(Kcb,LockHeldExclusively) : + CmpDelayDerefKeyControlBlock(Kcb); + } +} + +VOID +NTAPI +CmpDereferenceKeyControlBlockWithLock(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively) +{ /* Sanity check */ - ASSERT(CmpDelayDerefKCBWorkItemActive); - - /* FIXME: TODO */ - ASSERT(FALSE); -} - -VOID -NTAPI -CmpInitDelayDerefKCBEngine(VOID) -{ - /* Initialize lock and list */ - KeInitializeGuardedMutex(&CmpDelayDerefKCBLock); - InitializeListHead(&CmpDelayDerefKCBListHead); - - /* Setup the work item */ - ExInitializeWorkItem(&CmpDelayDerefKCBWorkItem, - CmpDelayDerefKCBWorker, - NULL); - - /* Setup the DPC and timer for it */ - KeInitializeDpc(&CmpDelayDerefKCBDpc, CmpDelayDerefKCBDpcRoutine, NULL); - KeInitializeTimer(&CmpDelayDerefKCBTimer); + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + + /* Check if this is the last reference */ + if (InterlockedDecrement((PLONG)&Kcb->RefCount) == 0) + { + /* Check if we should do a direct delete */ + if (((CmpHoldLazyFlush) && + !(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) && + !(Kcb->Flags & KEY_SYM_LINK)) || + (Kcb->ExtFlags & CM_KCB_NO_DELAY_CLOSE) || + (Kcb->Delete)) + { + /* Clean up the KCB*/ + CmpCleanUpKcbCacheWithLock(Kcb, LockHeldExclusively); + } + else + { + /* Otherwise, use delayed close */ + CmpAddToDelayedClose(Kcb, LockHeldExclusively); + } + } +} + +VOID +NTAPI +InitializeKCBKeyBodyList(IN PCM_KEY_CONTROL_BLOCK Kcb) +{ + /* Initialize the list */ + InitializeListHead(&Kcb->KeyBodyListHead); + + /* Clear the bodies */ + Kcb->KeyBodyArray[0] = + Kcb->KeyBodyArray[1] = + Kcb->KeyBodyArray[2] = + Kcb->KeyBodyArray[3] = NULL; } PCM_KEY_CONTROL_BLOCK @@ -183,6 +554,213 @@ IN ULONG Flags, IN PUNICODE_STRING KeyName) { - /* Temporary hack */ - return (PVOID)1; -} + PCM_KEY_CONTROL_BLOCK Kcb, FoundKcb = NULL; + UNICODE_STRING NodeName; + ULONG ConvKey = 0, i; + BOOLEAN IsFake, HashLock; + PWCHAR p; + + /* Make sure we own this hive in case it's being unloaded */ + if ((Hive->HiveFlags & HIVE_IS_UNLOADING) && + (((PCMHIVE)Hive)->CreatorOwner != KeGetCurrentThread())) + { + /* Fail */ + return NULL; + } + + /* Check if this is a fake KCB */ + IsFake = Flags & CMP_CREATE_FAKE_KCB ? TRUE : FALSE; + + /* If we have a parent, use its ConvKey */ + if (Parent) ConvKey = Parent->ConvKey; + + /* Make a copy of the name */ + NodeName = *KeyName; + + /* Remove leading slash */ + while ((NodeName.Length) && (*NodeName.Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + /* Move the buffer by one */ + NodeName.Buffer++; + NodeName.Length -= sizeof(WCHAR); + } + + /* Make sure we didn't get just a slash or something */ + ASSERT(NodeName.Length > 0); + + /* Now setup the hash */ + p = NodeName.Buffer; + for (i = 0; i < NodeName.Length; i += sizeof(WCHAR)) + { + /* Make sure it's a valid character */ + if (*p != OBJ_NAME_PATH_SEPARATOR) + { + /* Add this key to the hash */ + ConvKey = 37 * ConvKey + RtlUpcaseUnicodeChar(*p); + } + + /* Move on */ + p++; + } + + /* Allocate the KCB */ + Kcb = CmpAllocateKeyControlBlock(); + if (!Kcb) return NULL; + + /* Initailize the key list */ + InitializeKCBKeyBodyList(Kcb); + + /* Set it up */ + Kcb->Delete = FALSE; + Kcb->RefCount = 1; + Kcb->KeyHive = Hive; + Kcb->KeyCell = Index; + Kcb->ConvKey = ConvKey; + Kcb->DelayedCloseIndex = CmpDelayedCloseSize; + Kcb->InDelayClose = 0; + + /* Check if we have two hash entires */ + HashLock = Flags & CMP_LOCK_HASHES_FOR_KCB ? TRUE : FALSE; + if (HashLock) + { + /* Not yet implemented */ + KeBugCheck(0); + } + + /* Check if we already have a KCB */ + FoundKcb = CmpInsertKeyHash(&Kcb->KeyHash, IsFake); + if (FoundKcb) + { + /* Sanity check */ + ASSERT(!FoundKcb->Delete); + + /* Free the one we allocated and reference this one */ + CmpFreeKeyControlBlock(Kcb); + Kcb = FoundKcb; + if (!CmpReferenceKeyControlBlock(Kcb)) + { + /* We got too many handles */ + ASSERT(Kcb->RefCount + 1 != 0); + Kcb = NULL; + } + else + { + /* Check if we're not creating a fake one, but it used to be fake */ + if ((Kcb->ExtFlags & CM_KCB_KEY_NON_EXIST) && !(IsFake)) + { + /* Set the hive and cell */ + Kcb->KeyHive = Hive; + Kcb->KeyCell = Index; + + /* This means that our current information is invalid */ + Kcb->ExtFlags = CM_KCB_INVALID_CACHED_INFO; + } + + /* Check if we didn't have any valid data */ + if (!(Kcb->ExtFlags & (CM_KCB_NO_SUBKEY | + CM_KCB_SUBKEY_ONE | + CM_KCB_SUBKEY_HINT))) + { + /* Calculate the index hint */ + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; + + /* Cached information is now valid */ + Kcb->ExtFlags &= ~CM_KCB_INVALID_CACHED_INFO; + } + + /* Setup the other data */ + Kcb->KcbLastWriteTime = Node->LastWriteTime; + Kcb->KcbMaxNameLen = (USHORT)Node->MaxNameLen; + Kcb->KcbMaxValueNameLen = (USHORT)Node->MaxValueNameLen; + Kcb->KcbMaxValueDataLen = Node->MaxValueDataLen; + } + } + else + { + /* No KCB, do we have a parent? */ + if (Parent) + { + /* Reference the parent */ + if (((Parent->TotalLevels + 1) < 512) && + (CmpReferenceKeyControlBlock(Parent))) + { + /* Link it */ + Kcb->ParentKcb = Parent; + Kcb->TotalLevels = Parent->TotalLevels + 1; + } + else + { + /* Remove the KCB and free it */ + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); + Kcb = NULL; + } + } + else + { + /* No parent, this is the root node */ + Kcb->ParentKcb = NULL; + Kcb->TotalLevels = 1; + } + + /* Check if we have a KCB */ + if (Kcb) + { + /* Get the NCB */ + Kcb->NameBlock = CmpGetNameControlBlock(&NodeName); + if (Kcb->NameBlock) + { + /* Fill it out */ + Kcb->ValueCache.Count = Node->ValueList.Count; + Kcb->ValueCache.ValueList = Node->ValueList.List; + Kcb->Flags = Node->Flags; + Kcb->ExtFlags = 0; + Kcb->DelayedCloseIndex = CmpDelayedCloseSize; + + /* Remember if this is a fake key */ + if (IsFake) Kcb->ExtFlags |= CM_KCB_KEY_NON_EXIST; + + /* Setup the other data */ + Kcb->SubKeyCount = Node->SubKeyCounts[Stable] + + Node->SubKeyCounts[Volatile]; + Kcb->KcbLastWriteTime = Node->LastWriteTime; + Kcb->KcbMaxNameLen = (USHORT)Node->MaxNameLen; + Kcb->KcbMaxValueNameLen = (USHORT)Node->MaxValueNameLen; + Kcb->KcbMaxValueDataLen = (USHORT)Node->MaxValueDataLen; + } + else + { + /* Dereference the KCB */ + CmpDereferenceKeyControlBlockWithLock(Parent, FALSE); + + /* Remove the KCB and free it */ + CmpRemoveKeyControlBlock(Kcb); + CmpFreeKeyControlBlock(Kcb); + Kcb = NULL; + } + } + } + + /* Sanity check */ + ASSERT((!Kcb) || (Kcb->Delete == FALSE)); + + /* Check if we had locked the hashes */ + if (HashLock) + { + /* Not yet implemented: Unlock hashes */ + KeBugCheck(0); + } + + /* Return the KCB */ + return Kcb; +} + +VOID +NTAPI +EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, + IN ULONG Flags) +{ + ASSERT(FALSE); +} + 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 (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Mon Oct 29 17:44:26 2007 @@ -17,6 +17,12 @@ LIST_ENTRY CmpSelfHealQueueListHead; PEPROCESS CmpSystemProcess; BOOLEAN HvShutdownComplete; +PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; +BOOLEAN CmpFlushStarveWriters; +BOOLEAN CmpFlushOnLockRelease; +BOOLEAN CmpSpecialBootCondition; +BOOLEAN CmpNoWrite; +BOOLEAN CmpForceForceFlush; /* FUNCTIONS *****************************************************************/ @@ -704,7 +710,7 @@ /* Initialize the object */ #if 0 - RootKey->Type = TAG('k', 'v', '0', '2'; + RootKey->Type = TAG('k', 'v', '0', '2'); RootKey->KeyControlBlock = Kcb; RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); @@ -721,7 +727,7 @@ #endif /* Insert it into the object list head */ - EnlistKeyBodyWithKCB(RootKey, 0); + EnlistKeyBodyWithKeyObject(RootKey, 0); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -978,3 +984,80 @@ /* If we got here, all went well */ return TRUE; } + +VOID +NTAPI +CmpLockRegistryExclusive(VOID) +{ + /* Enter a critical region and lock the registry */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Sanity check */ + ASSERT(CmpFlushStarveWriters == 0); + RtlGetCallersAddress(&CmpRegistryLockCaller, &CmpRegistryLockCallerCaller); +} + +BOOLEAN +NTAPI +CmpTestRegistryLock(VOID) +{ + /* Test the lock */ + return (BOOLEAN)ExIsResourceAcquiredSharedLite(&CmpRegistryLock); +} + +BOOLEAN +NTAPI +CmpTestRegistryLockExclusive(VOID) +{ + /* Test the lock */ + return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); +} + +VOID +NTAPI +CmpUnlockRegistry(VOID) +{ + /* Sanity check */ + CMP_ASSERT_REGISTRY_LOCK(); + + /* Check if we should flush the registry */ + if (CmpFlushOnLockRelease) + { + /* The registry should be exclusively locked for this */ + CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); + + /* Flush the registry */ + CmpFlushEntireRegistry(TRUE); + CmpFlushOnLockRelease = FALSE; + } + + /* Release the lock and leave the critical region */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); +} + +BOOLEAN +NTAPI +CmpFlushEntireRegistry(IN BOOLEAN ForceFlush) +{ + BOOLEAN Flushed = TRUE; + + /* Make sure that the registry isn't read-only now */ + if (CmpNoWrite) return TRUE; + + /* Otherwise, acquire the hive list lock and disable force flush */ + CmpForceForceFlush = FALSE; + ExAcquirePushLockShared(&CmpHiveListHeadLock); + + /* Check if the hive list isn't empty */ + if (!IsListEmpty(&CmpHiveListHead)) + { + /* FIXME: TODO */ + ASSERT(FALSE); + } + + /* Release the lock and return the flush state */ + ExReleasePushLock(&CmpHiveListHeadLock); + return Flushed; +} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Oct 29 17:44:26 2007 @@ -110,12 +110,14 @@ <file>cmhardwr.c</file> </directory> </if> + <file>cmalloc.c</file> <file>cmapi.c</file> <file>cmboot.c</file> <file>cmcheck.c</file> <file>cmcontrl.c</file> <file>cmconfig.c</file> <file>cmdata.c</file> + <file>cmdelay.c</file> <file>cmindex.c</file> <file>cminit.c</file> <file>cmhook.c</file>

1 0

[gedmurphy] 29953: we don't need the 0xff
by gedmurphy＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: gedmurphy Date: Mon Oct 29 16:34:51 2007 New Revision: 29953 URL: http://svn.reactos.org/svn/reactos?rev=29953&view=rev Log: we don't need the 0xff Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Oct 29 16:34:51 2007 @@ -1553,9 +1553,9 @@ Alpha = ((BYTE)(Pixel >> 24) & 0xff); - Red = (((BYTE)(Pixel >> 0) & 0xff) * Alpha) / 0xff; - Green = (((BYTE)(Pixel >> 8) & 0xff) * Alpha) / 0xff; - Blue = (((BYTE)(Pixel >> 16) & 0xff) * Alpha) / 0xff; + Red = (((BYTE)(Pixel >> 0)) * Alpha) / 0xff; + Green = (((BYTE)(Pixel >> 8)) * Alpha) / 0xff; + Blue = (((BYTE)(Pixel >> 16)) * Alpha) / 0xff; *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24));

1 0

[gedmurphy] 29952: speed up the DrawIconEx alpha maths a little bit
by gedmurphy＠svn.reactos.org 29 Oct '07

29 Oct '07

Author: gedmurphy Date: Mon Oct 29 16:29:26 2007 New Revision: 29952 URL: http://svn.reactos.org/svn/reactos?rev=29952&view=rev Log: speed up the DrawIconEx alpha maths a little bit Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Oct 29 16:29:26 2007 @@ -1520,6 +1520,7 @@ BITMAPOBJ *BitmapObj = NULL; PBYTE pBits = NULL; BLENDFUNCTION BlendFunc; + DWORD Pixel; BYTE Red, Green, Blue, Alpha; DWORD Count = 0; INT i, j; @@ -1548,23 +1549,16 @@ { for (j = 0; j < cxWidth; j++) { - DWORD OrigPixel = 0; - DWORD AlphaPixel = 0; - - OrigPixel = *(DWORD *)(pBits + Count); - - Red = (BYTE)((OrigPixel >> 0) & 0xff); - Green = (BYTE)((OrigPixel >> 8) & 0xff); - Blue = (BYTE)((OrigPixel >> 16) & 0xff); - Alpha = (BYTE)((OrigPixel >> 24) & 0xff); - - Red = (Red * Alpha) / 0xff; - Green = (Green * Alpha) / 0xff; - Blue = (Blue * Alpha) / 0xff; - - AlphaPixel = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); - - *(DWORD *)(pBits + Count) = AlphaPixel; + Pixel = *(DWORD *)(pBits + Count); + + Alpha = ((BYTE)(Pixel >> 24) & 0xff); + + Red = (((BYTE)(Pixel >> 0) & 0xff) * Alpha) / 0xff; + Green = (((BYTE)(Pixel >> 8) & 0xff) * Alpha) / 0xff; + Blue = (((BYTE)(Pixel >> 16) & 0xff) * Alpha) / 0xff; + + *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); + Count += sizeof (DWORD); } }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007