Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 30709: fix stupied bug in GetDeviceIdentifier/GetDeviceIdentifier7, spotted by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth)
by greatlrd＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: greatlrd Date: Sat Nov 24 02:36:53 2007 New Revision: 30709 URL: http://svn.reactos.org/svn/reactos?rev=30709&view=rev Log: fix stupied bug in GetDeviceIdentifier/GetDeviceIdentifier7, spotted by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Sat Nov 24 02:36:53 2007 @@ -98,7 +98,7 @@ break; } - if (!_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName)) + if (_stricmp(DisplayDeviceA.DeviceName, This->lpLcl->lpGbl->cDriverName) != 0) { /* if we got another device like hardware mpeg decoder or video card or another drv */ found = TRUE;

1 0

[peterw] 30708: - Make the MinGW prompt start in the users dir instead of My Documents like the real windows propt does.
by peterw＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: peterw Date: Sat Nov 24 01:52:42 2007 New Revision: 30708 URL: http://svn.reactos.org/svn/reactos?rev=30708&view=rev Log: - Make the MinGW prompt start in the users dir instead of My Documents like the real windows propt does. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 24 01:52:42 2007 @@ -225,7 +225,7 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $DOCUMENTS + SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ @@ -243,7 +243,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $DOCUMENTS + SetOutPath $PROFILE CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd @@ -255,7 +255,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $DOCUMENTS + SetOutPath $PROFILE CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd

1 0

[peterw] 30707: - Switch default install directory back to Program Files\RosBE. - Remove the installation directory on uninstall which wasn't being removed. - Bump the version to 1.1. - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon.
by peterw＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: peterw Date: Sat Nov 24 01:34:50 2007 New Revision: 30707 URL: http://svn.reactos.org/svn/reactos?rev=30707&view=rev Log: - Switch default install directory back to Program Files\RosBE. - Remove the installation directory on uninstall which wasn't being removed. - Bump the version to 1.1. - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon. Added: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico (with props) trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile Added: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Icons/mi… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/Icons/mingw.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Nov 24 01:34:50 2007 @@ -1,0 +1,34 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See LICENSE.txt in the top level directory. +:: FILE: Root/RosBE.cmd +:: PURPOSE: This script provides/sets up a standard MinGW build environment. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: Peter Ward <dralnix(a)gmail.com> +:: +:: +@echo off + +color 0A +set PATH=%SystemRoot%\system32;%SystemRoot% +set _ROSBE_BASEDIR=%~dp0 +set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% +set _ROSBE_MODE=MinGW +set _ROSBE_ORIGINALPATH=%PATH% +set _ROSBE_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 + +if not "%1" == "" ( + cls + echo Unknown parameter specified. Exiting. + goto :EOC +) + +echo. +echo. +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +echo. +echo. + +doskey MAKE = "%_ROSBE_MINGWMAKE%" $* + +:EOC Propchange: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Nov 24 01:34:50 2007 @@ -10,15 +10,22 @@ :: @echo off +if not "%1" == "" ( + cls + echo Unknown parameter specified. Exiting. + goto :EOC +) + :: :: Set defaults to work with and override them if edited by :: the options utility. :: color 0A set PATH=%SystemRoot%\system32;%SystemRoot% -set _ROSBE_VERSION=1.0 +set _ROSBE_VERSION=1.1 set _ROSBE_BASEDIR=%~dp0 set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1% +set _ROSBE_MODE=RosBE set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_ORIGINALPATH=%PATH% set _ROSBE_SHOWTIME=1 @@ -46,21 +53,6 @@ ) title ReactOS Build Environment %_ROSBE_VERSION% - -:: -:: Make sure RosBE was initialized right. -:: -if /i "%1" == "oldmode" ( - cls - set _ROSBE_OLDMODE="" - call :RosBE4 - goto :EndCommandParse -) -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOC -) cls call :RosBE4 Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Nov 24 01:34:50 2007 @@ -14,9 +14,7 @@ :: initialize GCC for the current directory. :: if not defined _ROSBE_MINGWPATH ( - if /i "%1" == "oldmode" ( - set _ROSBE_OLDMODE="" - ) + set _ROSBE_MODE=MinGW set _ROSBE_MINGWPATH=%CD% set _ROSBE_ORIGINALPATH=%PATH% ) @@ -29,12 +27,13 @@ for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe -if defined _ROSBE_OLDMODE ( +if "%_ROSBE_MODE%" == "MinGW" ( set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include +) else ( + set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" ) -set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" -set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION% :: Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 24 01:34:50 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.0" +!define PRODUCT_VERSION "1.1" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -10,6 +10,7 @@ ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "RosBE-${PRODUCT_VERSION}.exe" +InstallDir "$PROGRAMFILES\RosBE" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -17,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.1.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.0.0.0" +VIProductVersion "1.1.0.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -41,9 +42,6 @@ ;; Read our custom page ini, remove previous version. ;; Function .onInit - var /global SYSTEMDRIVE - StrCpy $SYSTEMDRIVE $WINDIR 2 - StrCpy $INSTDIR "$SYSTEMDRIVE\RosBE" Call UninstallPrevious !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" FunctionEnd @@ -104,11 +102,13 @@ SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try + File /r Icons\mingw.ico File /r Icons\rosbe.ico File /r Root\readme.pdf File /r Root\RosBE.mac File /r Root\changelog.txt File /r Root\LICENSE.txt + File /r Root\MinGW.cmd File /r Root\README.txt File /r Root\Build.cmd File /r Root\Clean.cmd @@ -118,12 +118,12 @@ File /r Root\TimeDate.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Root\Tools\buildtime.exe - File /r Root\Tools\chknewer.exe - File /r Root\Tools\cpucount.exe - File /r Root\Tools\flash.exe - File /r Root\Tools\getdate.exe - File /r Root\Tools\tee.exe + File /r Components\Tools\buildtime.exe + File /r Components\Tools\chknewer.exe + File /r Components\Tools\cpucount.exe + File /r Components\Tools\flash.exe + File /r Components\Tools\getdate.exe + File /r Components\Tools\tee.exe SectionEnd Section -MinGWGCCNASM SEC02 @@ -139,7 +139,7 @@ File /r Root\options.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Root\Tools\options.exe + File /r Components\Tools\options.exe !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY @@ -155,17 +155,17 @@ File /r Root\sSVN.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Root\Tools\svn.exe - File /r Root\Tools\intl3_svn.dll - File /r Root\Tools\libapr.dll - File /r Root\Tools\libeay32.dll - File /r Root\Tools\ssleay32.dll - File /r Root\Tools\libaprutil.dll - File /r Root\Tools\libapriconv.dll - File /r Root\Tools\libdb44.dll + File /r Components\Tools\svn.exe + File /r Components\Tools\intl3_svn.dll + File /r Components\Tools\libapr.dll + File /r Components\Tools\libeay32.dll + File /r Components\Tools\ssleay32.dll + File /r Components\Tools\libaprutil.dll + File /r Components\Tools\libapriconv.dll + File /r Components\Tools\libdb44.dll SetOutPath "$INSTDIR\Tools\licenses" SetOverwrite try - File /r Root\Tools\licenses\*.* + File /r Components\Tools\licenses\*.* SectionEnd Section "Shortcut Tool (scut)" SEC05 @@ -175,23 +175,23 @@ File /r Root\scut.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Root\Tools\scut.exe + File /r Components\Tools\scut.exe SectionEnd Section "ccache - Compiler Cache" SEC06 SetShellVarContext current SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try - File /r Root\Tools\ccache.exe - File /r Root\Tools\cygwin1.dll + File /r Components\Tools\ccache.exe + File /r Components\Tools\cygwin1.dll SectionEnd Section "GDB - The GNU Project Debugger" SEC07 SetShellVarContext current SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try - File /r Root\Tools\gdb.exe - File /r Root\Tools\gdbserver.exe + File /r Components\Tools\gdb.exe + File /r Components\Tools\gdbserver.exe SectionEnd Section "relAddr2Line Tool" SEC08 @@ -201,9 +201,9 @@ File /r Root\reladdr2line.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try - File /r Root\Tools\echoh.exe - File /r Root\Tools\raddr2line.exe - File /r Root\Tools\chkslash.exe + File /r Components\Tools\echoh.exe + File /r Components\Tools\raddr2line.exe + File /r Components\Tools\chkslash.exe SectionEnd Section "Other Tools (chdefdir, chdefgcc and config)" SEC09 @@ -225,6 +225,8 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + SetOutPath $DOCUMENTS + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" @@ -241,6 +243,8 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + SetOutPath $DOCUMENTS + CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC12 @@ -251,6 +255,8 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + SetOutPath $DOCUMENTS + CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SectionEnd Section -Post SEC13 @@ -303,14 +309,21 @@ Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt" + Delete /REBOOTOK "$INSTDIR\MinGW.cmd" + Delete /REBOOTOK "$INSTDIR\mingw.ico" Delete /REBOOTOK "$INSTDIR\README.txt" Delete /REBOOTOK "$INSTDIR\srclist.txt" Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + RMDir /r /REBOOTOK "$INSTDIR" IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" + IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" + IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" ;; ;; Clean up the registry. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/makefile Sat Nov 24 01:34:50 2007 @@ -5,7 +5,7 @@ all: $(TARGET) CC=gcc -CFLAGS := $(HOST_CFLAGS) -DWIN32 -DUNICODE -O2 -std=c99 +CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 LFLAGS := -mwindows -s LIBS := @@ -21,7 +21,7 @@ $(CC) $(CFLAGS) -c $< -o $@ $(RC:.rc=.coff): - windres $(HOST_CFLAGS) $(RCFLAGS) -o $@ $(RC) + windres $(RCFLAGS) -o $@ $(RC) .PHONY: clean clean:

1 0

[greatlrd] 30706: fix return code in ddraw.dll GetCaps.cbug spotted by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth)
by greatlrd＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: greatlrd Date: Sat Nov 24 01:02:43 2007 New Revision: 30706 URL: http://svn.reactos.org/svn/reactos?rev=30706&view=rev Log: fix return code in ddraw.dll GetCaps.cbug spotted by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Sat Nov 24 01:02:43 2007 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS DirectX - * FILE: ddraw/ddraw/ddraw_main.c + * FILE: ddraw/ddraw/GetCaps.c * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen * @@ -139,6 +139,8 @@ myCaps->ddsCaps.dwCaps4 = 0; myCaps->dwSize = sizeof(DDCAPS_DX7); + retVal = DD_OK; + } break; @@ -246,6 +248,8 @@ myCaps->ddsCaps.dwCaps3 = 0; myCaps->ddsCaps.dwCaps4 = 0; myCaps->dwSize = sizeof(DDCAPS_DX7); + + retVal = DD_OK; } break;

1 0

[fireball] 30705: - Cleanup NtCreateKey and NtOpenKey to make it simpler for the final steps of the rewirte. - Remove SEH and callbacks (yes this is "bad", but won't break anything, and it will be added back). - Try to make the code as similar as possible to isolate broken-Ob calls from proper Cm behavior.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 23:32:38 2007 New Revision: 30705 URL: http://svn.reactos.org/svn/reactos?rev=30705&view=rev Log: - Cleanup NtCreateKey and NtOpenKey to make it simpler for the final steps of the rewirte. - Remove SEH and callbacks (yes this is "bad", but won't break anything, and it will be added back). - Try to make the code as similar as possible to isolate broken-Ob calls from proper Cm behavior. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Fri Nov 23 23:32:38 2007 @@ -23,107 +23,16 @@ /* GLOBALS ******************************************************************/ -extern POBJECT_TYPE CmpKeyObjectType; -static BOOLEAN CmiRegistryInitialized = FALSE; - -/* FUNCTIONS ****************************************************************/ - NTSTATUS NTAPI CmpCreateHandle(PVOID ObjectBody, ACCESS_MASK GrantedAccess, ULONG HandleAttributes, - PHANDLE HandleReturn) - /* - * FUNCTION: Add a handle referencing an object - * ARGUMENTS: - * obj = Object body that the handle should refer to - * RETURNS: The created handle - * NOTE: The handle is valid only in the context of the current process - */ -{ - HANDLE_TABLE_ENTRY NewEntry; - PEPROCESS CurrentProcess; - PVOID HandleTable; - POBJECT_HEADER ObjectHeader; - HANDLE Handle; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - - PAGED_CODE(); - - DPRINT("CmpCreateHandle(obj %p)\n",ObjectBody); - - ASSERT(ObjectBody); - - CurrentProcess = PsGetCurrentProcess(); - - ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - - /* check that this is a valid kernel pointer */ - //ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); - - if (GrantedAccess & MAXIMUM_ALLOWED) - { - GrantedAccess &= ~MAXIMUM_ALLOWED; - GrantedAccess |= GENERIC_ALL; - } - - if (GrantedAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&GrantedAccess, - &ObjectHeader->Type->TypeInfo.GenericMapping); - } - - NewEntry.Object = ObjectHeader; - if(HandleAttributes & OBJ_INHERIT) - NewEntry.ObAttributes |= OBJ_INHERIT; - else - NewEntry.ObAttributes &= ~OBJ_INHERIT; - NewEntry.GrantedAccess = GrantedAccess; - - if ((HandleAttributes & OBJ_KERNEL_HANDLE) && - ExGetPreviousMode() == KernelMode) - { - HandleTable = ObpKernelHandleTable; - if (PsGetCurrentProcess() != PsInitialSystemProcess) - { - KeStackAttachProcess(&PsInitialSystemProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - HandleTable = PsGetCurrentProcess()->ObjectTable; - } - - Handle = ExCreateHandle(HandleTable, - &NewEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - if(Handle != NULL) - { - if (HandleAttributes & OBJ_KERNEL_HANDLE) - { - /* mark the handle value */ - Handle = ObMarkHandleAsKernelHandle(Handle); - } - - InterlockedIncrement(&ObjectHeader->HandleCount); - ObReferenceObject(ObjectBody); - - *HandleReturn = Handle; - - return STATUS_SUCCESS; - } - - return STATUS_UNSUCCESSFUL; -} + PHANDLE HandleReturn); + +static BOOLEAN CmiRegistryInitialized = FALSE; + +/* FUNCTIONS ****************************************************************/ NTSTATUS NTAPI @@ -137,228 +46,137 @@ { UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; ULONG LocalDisposition; - PKEY_OBJECT KeyObject; + PKEY_OBJECT KeyObject, Parent; NTSTATUS Status = STATUS_SUCCESS; - PVOID Object = NULL; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; - unsigned int i; - REG_PRE_CREATE_KEY_INFORMATION PreCreateKeyInfo; - REG_POST_CREATE_KEY_INFORMATION PostCreateKeyInfo; - KPROCESSOR_MODE PreviousMode; - UNICODE_STRING CapturedClass = {0}; + ULONG i; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); HANDLE hKey; PCM_KEY_NODE Node, ParentNode; - PAGED_CODE(); - DPRINT("NtCreateKey(TI 0x%x, DA 0x%x, Class '%wZ', OA 0x%p, OA->ON '%wZ'\n", - TitleIndex, DesiredAccess, Class, ObjectAttributes, - ObjectAttributes ? ObjectAttributes->ObjectName : NULL); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeAndZeroHandle(KeyHandle); - if (Disposition != NULL) - { - ProbeForWriteUlong(Disposition); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - if (Class != NULL) - { - Status = ProbeAndCaptureUnicodeString(&CapturedClass, - PreviousMode, - Class); - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, FALSE, &ObjectCreateInfo, &ObjectName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - - PostCreateKeyInfo.CompleteName = &ObjectName; - PreCreateKeyInfo.CompleteName = &ObjectName; - Status = CmiCallRegisteredCallbacks(RegNtPreCreateKey, &PreCreateKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - goto Cleanup; - } - + if (!NT_SUCCESS(Status)) return Status; + + /* Find the key object */ Status = CmFindObject(&ObjectCreateInfo, &ObjectName, - (PVOID*)&Object, + (PVOID*)&Parent, &ReturnedPath, CmpKeyObjectType, NULL, NULL); - if (!NT_SUCCESS(Status)) - { - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - - DPRINT1("CmpFindObject failed, Status: 0x%x\n", Status); - goto Cleanup; - } - + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Check if we found the entire path */ RemainingPath = ReturnedPath; - DPRINT("RemainingPath (preparse) %wZ\n", &RemainingPath); - - if (RemainingPath.Length == 0) - { - /* Fail if the key has been deleted */ - if (((PKEY_OBJECT) Object)->KeyControlBlock->Delete) + if (!RemainingPath.Length) + { + /* Check if the parent has been deleted */ + if (Parent->KeyControlBlock->Delete) { - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - + /* Fail */ DPRINT1("Object marked for delete!\n"); Status = STATUS_UNSUCCESSFUL; goto Cleanup; } - Status = CmpCreateHandle(Object, + /* Create a new handle to the parent */ + Status = CmpCreateHandle(Parent, DesiredAccess, ObjectCreateInfo.Attributes, &hKey); - - if (!NT_SUCCESS(Status)) - DPRINT1("CmpCreateHandle failed Status 0x%x\n", Status); - - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Tell the caller we did this */ LocalDisposition = REG_OPENED_EXISTING_KEY; goto SuccessReturn; } - /* If RemainingPath contains \ we must return error - because NtCreateKey doesn't create trees */ - while (RemainingPath.Length && *RemainingPath.Buffer == L'\\') - { + /* Loop every leading slash */ + while ((RemainingPath.Length) && + (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + /* And remove it */ RemainingPath.Length -= sizeof(WCHAR); RemainingPath.MaximumLength -= sizeof(WCHAR); RemainingPath.Buffer++; } - while (RemainingPath.Length && - RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == L'\\') - { + /* Loop every terminating slash */ + while ((RemainingPath.Length) && + (RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == + OBJ_NAME_PATH_SEPARATOR)) + { + /* And remove it */ RemainingPath.Length -= sizeof(WCHAR); RemainingPath.MaximumLength -= sizeof(WCHAR); } + /* Now loop the entire path */ for (i = 0; i < RemainingPath.Length / sizeof(WCHAR); i++) { - if (L'\\' == RemainingPath.Buffer[i]) + /* And check if we found slahes */ + if (RemainingPath.Buffer[i] == OBJ_NAME_PATH_SEPARATOR) { - DPRINT("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); - - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - + /* We don't create trees -- parent key doesn't exist, so fail */ Status = STATUS_OBJECT_NAME_NOT_FOUND; goto Cleanup; } } - DPRINT("RemainingPath %wZ ParentObject 0x%p\n", &RemainingPath, Object); - - // - if (RemainingPath.Length == 0 || RemainingPath.Buffer[0] == UNICODE_NULL) - { + /* Now check if we're left with no name by this point */ + if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) + { + /* Then fail since we can't do anything */ Status = STATUS_OBJECT_NAME_NOT_FOUND; goto Cleanup; } - - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); /* Create the key */ - Status = CmpDoCreate(((PKEY_OBJECT)Object)->KeyControlBlock->KeyHive, - ((PKEY_OBJECT)Object)->KeyControlBlock->KeyCell, + Status = CmpDoCreate(Parent->KeyControlBlock->KeyHive, + Parent->KeyControlBlock->KeyCell, NULL, &RemainingPath, KernelMode, Class, CreateOptions, - ((PKEY_OBJECT)Object)->KeyControlBlock, + Parent->KeyControlBlock, NULL, (PVOID*)&KeyObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CmiAddSubKey() failed (Status %lx)\n", Status); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = STATUS_UNSUCCESSFUL; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - - Status = STATUS_UNSUCCESSFUL; - goto Cleanup; - } - - RtlDuplicateUnicodeString - (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &RemainingPath, &KeyObject->Name); - DPRINT("Key Name: %wZ\n", &KeyObject->Name); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* If we got here, this is a new key */ + LocalDisposition = REG_CREATED_NEW_KEY; + + /* Now save the key name */ + RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &RemainingPath, + &KeyObject->Name); + + /* Get the parent node and the child node */ ParentNode = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->ParentKcb->KeyHive, KeyObject->KeyControlBlock->ParentKcb->KeyCell); - Node = (PCM_KEY_NODE)HvGetCell(KeyObject->KeyControlBlock->KeyHive, KeyObject->KeyControlBlock->KeyCell); - + + /* Inherit some information */ Node->Parent = KeyObject->KeyControlBlock->ParentKcb->KeyCell; Node->Security = ParentNode->Security; - KeyObject->KeyControlBlock->ValueCache.ValueList = Node->ValueList.List; KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; - DPRINT("RemainingPath: %wZ\n", &RemainingPath); - - CmiAddKeyToList(((PKEY_OBJECT)Object), KeyObject); - - VERIFY_KEY_OBJECT(KeyObject); - + /* Link child to parent */ + CmiAddKeyToList(Parent, KeyObject); + + /* Create the actual handle to the object */ Status = CmpCreateHandle(KeyObject, DesiredAccess, ObjectCreateInfo.Attributes, @@ -367,58 +185,25 @@ /* Free the create information */ ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo); OBJECT_TO_OBJECT_HEADER(KeyObject)->ObjectCreateInfo = NULL; - - if (!NT_SUCCESS(Status)) - { - DPRINT1("ObInsertObject() failed!\n"); - - PostCreateKeyInfo.Object = NULL; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - - goto Cleanup; - } + if (!NT_SUCCESS(Status)) goto Cleanup; /* Add the keep-alive reference */ ObReferenceObject(KeyObject); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - - PostCreateKeyInfo.Object = KeyObject; - PostCreateKeyInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostCreateKey, &PostCreateKeyInfo); - + + /* Force a lazy flush */ CmpLazyFlush(); - - LocalDisposition = REG_CREATED_NEW_KEY; SuccessReturn: - _SEH_TRY - { - *KeyHandle = hKey; - if (Disposition != NULL) - { - *Disposition = LocalDisposition; - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Return data to user */ + *KeyHandle = hKey; + if (Disposition) *Disposition = LocalDisposition; Cleanup: + /* Cleanup */ ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (Class != NULL) - { - ReleaseCapturedUnicodeString(&CapturedClass, - PreviousMode); - } if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); RtlFreeUnicodeString(&ReturnedPath); - if (Object != NULL) ObDereferenceObject(Object); - + if (Parent) ObDereferenceObject(Parent); return Status; } @@ -428,88 +213,34 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - UNICODE_STRING RemainingPath; - KPROCESSOR_MODE PreviousMode; - PVOID Object = NULL; + UNICODE_STRING RemainingPath = {0}; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PKEY_OBJECT Object = NULL; HANDLE hKey = NULL; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; - REG_PRE_OPEN_KEY_INFORMATION PreOpenKeyInfo; - REG_POST_OPEN_KEY_INFORMATION PostOpenKeyInfo; - PAGED_CODE(); - - DPRINT("NtOpenKey(KH 0x%p DA %x OA 0x%p OA->ON '%wZ'\n", - KeyHandle, - DesiredAccess, - ObjectAttributes, - ObjectAttributes ? ObjectAttributes->ObjectName : NULL); - - /* Check place for result handle, if it's null - return immediately */ - if (KeyHandle == NULL) - return(STATUS_INVALID_PARAMETER); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeAndZeroHandle(KeyHandle); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - /* WINE checks for the length also */ - /*if (ObjectAttributes->ObjectName->Length > MAX_NAME_LENGTH) - return(STATUS_BUFFER_OVERFLOW);*/ - + /* Capture all the info */ - DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, PreviousMode, FALSE, &ObjectCreateInfo, &ObjectName); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - - if (ObjectName.Buffer && - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == '\\') - { - ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + if (!NT_SUCCESS(Status)) return Status; + + /* Loop every terminating slash */ + while ((ObjectName.Length) && + (ObjectName.Buffer[(ObjectName.Length / sizeof(WCHAR)) - 1] == + OBJ_NAME_PATH_SEPARATOR)) + { + /* And remove it */ ObjectName.Length -= sizeof(WCHAR); ObjectName.MaximumLength -= sizeof(WCHAR); } - - PostOpenKeyInfo.CompleteName = &ObjectName; - PreOpenKeyInfo.CompleteName = &ObjectName; - Status = CmiCallRegisteredCallbacks(RegNtPreOpenKey, &PreOpenKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOpenKeyInfo.Object = NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - return Status; - } - - RemainingPath.Buffer = NULL; - + + /* Find the key */ Status = CmFindObject(&ObjectCreateInfo, &ObjectName, (PVOID*)&Object, @@ -517,64 +248,39 @@ CmpKeyObjectType, NULL, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmpFindObject() returned 0x%08lx\n", Status); - Status = STATUS_INVALID_HANDLE; /* Because ObFindObject returns STATUS_UNSUCCESSFUL */ - goto openkey_cleanup; - } - - VERIFY_KEY_OBJECT((PKEY_OBJECT) Object); - - DPRINT("RemainingPath '%wZ'\n", &RemainingPath); - - if ((RemainingPath.Buffer != NULL) && (RemainingPath.Buffer[0] != 0)) - { - RtlFreeUnicodeString(&RemainingPath); + if (!NT_SUCCESS(Status)) goto openkey_cleanup; + + /* Make sure we don't have any remaining path */ + if ((RemainingPath.Buffer) && (RemainingPath.Buffer[0] != UNICODE_NULL)) + { + /* Fail */ Status = STATUS_OBJECT_NAME_NOT_FOUND; goto openkey_cleanup; } - RtlFreeUnicodeString(&RemainingPath); - - /* Fail if the key has been deleted */ - if (((PKEY_OBJECT)Object)->KeyControlBlock->Delete) - { + /* Check if the key has been deleted */ + if (Object->KeyControlBlock->Delete) + { + /* Fail */ Status = STATUS_UNSUCCESSFUL; goto openkey_cleanup; } + /* Create the actual handle */ Status = CmpCreateHandle(Object, DesiredAccess, ObjectCreateInfo.Attributes, &hKey); openkey_cleanup: - + /* Cleanup */ ObpReleaseCapturedAttributes(&ObjectCreateInfo); - PostOpenKeyInfo.Object = NT_SUCCESS(Status) ? (PVOID)Object : NULL; - PostOpenKeyInfo.Status = Status; - CmiCallRegisteredCallbacks (RegNtPostOpenKey, &PostOpenKeyInfo); if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - if (Object) - { - ObDereferenceObject(Object); - } - - if (NT_SUCCESS(Status)) - { - _SEH_TRY - { - *KeyHandle = hKey; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - + RtlFreeUnicodeString(&RemainingPath); + if (Object) ObDereferenceObject(Object); + + /* Return information and status to user */ + *KeyHandle = hKey; return Status; } Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Nov 23 23:32:38 2007 @@ -26,6 +26,103 @@ PUNICODE_STRING TargetPath); /* FUNCTONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateHandle(PVOID ObjectBody, + ACCESS_MASK GrantedAccess, + ULONG HandleAttributes, + PHANDLE HandleReturn) +/* + * FUNCTION: Add a handle referencing an object + * ARGUMENTS: + * obj = Object body that the handle should refer to + * RETURNS: The created handle + * NOTE: The handle is valid only in the context of the current process + */ +{ + HANDLE_TABLE_ENTRY NewEntry; + PEPROCESS CurrentProcess; + PVOID HandleTable; + POBJECT_HEADER ObjectHeader; + HANDLE Handle; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + + PAGED_CODE(); + + DPRINT("CmpCreateHandle(obj %p)\n",ObjectBody); + + ASSERT(ObjectBody); + + CurrentProcess = PsGetCurrentProcess(); + + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); + + /* check that this is a valid kernel pointer */ + //ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + + if (GrantedAccess & MAXIMUM_ALLOWED) + { + GrantedAccess &= ~MAXIMUM_ALLOWED; + GrantedAccess |= GENERIC_ALL; + } + + if (GrantedAccess & GENERIC_ACCESS) + { + RtlMapGenericMask(&GrantedAccess, + &ObjectHeader->Type->TypeInfo.GenericMapping); + } + + NewEntry.Object = ObjectHeader; + if(HandleAttributes & OBJ_INHERIT) + NewEntry.ObAttributes |= OBJ_INHERIT; + else + NewEntry.ObAttributes &= ~OBJ_INHERIT; + NewEntry.GrantedAccess = GrantedAccess; + + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && + ExGetPreviousMode() == KernelMode) + { + HandleTable = ObpKernelHandleTable; + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + Handle = ExCreateHandle(HandleTable, + &NewEntry); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + + if(Handle != NULL) + { + if (HandleAttributes & OBJ_KERNEL_HANDLE) + { + /* mark the handle value */ + Handle = ObMarkHandleAsKernelHandle(Handle); + } + + InterlockedIncrement(&ObjectHeader->HandleCount); + ObReferenceObject(ObjectBody); + + *HandleReturn = Handle; + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} PVOID NTAPI

1 0

[fireball] 30704: - Huge cleanup of cm.h -- remove stuff that's not needed/used anymore - Get rid of registry.c. - Move CmpLinkHiveToMaster to cmsysini.c since it now uses new config code and works properly. - Move CmpRosGetHardwareHive to cmsysini.c since it's an initialization function (will go away eventually).
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 22:29:45 2007 New Revision: 30704 URL: http://svn.reactos.org/svn/reactos?rev=30704&view=rev Log: - Huge cleanup of cm.h -- remove stuff that's not needed/used anymore - Get rid of registry.c. - Move CmpLinkHiveToMaster to cmsysini.c since it now uses new config code and works properly. - Move CmpRosGetHardwareHive to cmsysini.c since it's an initialization function (will go away eventually). Removed: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=30704… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Fri Nov 23 22:29:45 2007 @@ -3,64 +3,10 @@ #include "ntoskrnl/config/cm.h" -#ifdef DBG -#define CHECKED 1 -#else -#define CHECKED 0 -#endif - -#define REG_ROOT_KEY_NAME L"\\Registry" -#define REG_MACHINE_KEY_NAME L"\\Registry\\Machine" -#define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" -#define REG_DESCRIPTION_KEY_NAME L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION" -#define REG_DEVICEMAP_KEY_NAME L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP" -#define REG_RESOURCEMAP_KEY_NAME L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP" -#define REG_CLASSES_KEY_NAME L"\\Registry\\Machine\\Software\\Classes" -#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" -#define REG_SOFTWARE_KEY_NAME L"\\Registry\\Machine\\SOFTWARE" -#define REG_SAM_KEY_NAME L"\\Registry\\Machine\\SAM" -#define REG_SEC_KEY_NAME L"\\Registry\\Machine\\SECURITY" -#define REG_USER_KEY_NAME L"\\Registry\\User" -#define REG_DEFAULT_USER_KEY_NAME L"\\Registry\\User\\.Default" -#define REG_CURRENT_USER_KEY_NAME L"\\Registry\\User\\CurrentUser" - -#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" -#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" -#define SOFTWARE_REG_FILE L"\\SystemRoot\\System32\\Config\\SOFTWARE" -#define DEFAULT_USER_REG_FILE L"\\SystemRoot\\System32\\Config\\DEFAULT" -#define SAM_REG_FILE L"\\SystemRoot\\System32\\Config\\SAM" -#define SEC_REG_FILE L"\\SystemRoot\\System32\\Config\\SECURITY" - -#define REG_SYSTEM_FILE_NAME L"\\system" -#define REG_SOFTWARE_FILE_NAME L"\\software" -#define REG_DEFAULT_USER_FILE_NAME L"\\default" -#define REG_SAM_FILE_NAME L"\\sam" -#define REG_SEC_FILE_NAME L"\\security" - -/* Bits 31-22 (top 10 bits) of the cell index is the directory index */ -#define CmiDirectoryIndex(CellIndex)(CellIndex & 0xffc000000) -/* Bits 21-12 (middle 10 bits) of the cell index is the table index */ -#define CmiTableIndex(Cellndex)(CellIndex & 0x003ff000) -/* Bits 11-0 (bottom 12 bits) of the cell index is the byte offset */ -#define CmiByteOffset(Cellndex)(CellIndex & 0x00000fff) - - extern POBJECT_TYPE CmpKeyObjectType; extern KSPIN_LOCK CmiKeyListLock; - extern ERESOURCE CmpRegistryLock; extern EX_PUSH_LOCK CmpHiveListHeadLock; - -/* Registry Callback Function */ -typedef struct _REGISTRY_CALLBACK -{ - LIST_ENTRY ListEntry; - EX_RUNDOWN_REF RundownRef; - PEX_CALLBACK_FUNCTION Function; - PVOID Context; - LARGE_INTEGER Cookie; - BOOLEAN PendingDelete; -} REGISTRY_CALLBACK, *PREGISTRY_CALLBACK; NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, @@ -74,39 +20,4 @@ #define VERIFY_KEY_OBJECT(x) #define VERIFY_REGISTRY_HIVE(x) -NTSTATUS STDCALL -CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function, - IN PVOID Context, - IN OUT PLARGE_INTEGER Cookie - ); - -NTSTATUS STDCALL -CmUnRegisterCallback(IN LARGE_INTEGER Cookie); - -VOID -CmiAddKeyToList(IN PKEY_OBJECT ParentKey, - IN PKEY_OBJECT NewKey); -VOID -NTAPI -CmpLazyFlush(VOID); - -NTSTATUS -CmiInitHives(BOOLEAN SetupBoot); - -NTSTATUS -NTAPI -CmFindObject( - POBJECT_CREATE_INFORMATION ObjectCreateInfo, - PUNICODE_STRING ObjectName, - PVOID* ReturnedObject, - PUNICODE_STRING RemainingPath, - POBJECT_TYPE ObjectType, - IN PACCESS_STATE AccessState, - IN PVOID ParseContext -); - -// Some Ob definitions for debug messages in Cm -#define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount -#define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount - #endif /*__INCLUDE_CM_H*/ Removed: 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 (removed) @@ -1,233 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/cm/registry.c - * PURPOSE: Registry functions - * - * PROGRAMMERS: Hartmut Birr - * Alex Ionescu - * Rex Jolliff - * Eric Kohl - * Matt Pyne - * Jean Michault - * Art Yerkes - */ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#include "cm.h" - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, CmInitSystem1) -#endif - -/* GLOBALS ******************************************************************/ - -extern BOOLEAN ExpInTextModeSetup; - -POBJECT_TYPE CmpKeyObjectType = NULL; -PCMHIVE CmiVolatileHive = NULL; - -LIST_ENTRY CmpHiveListHead; - -ERESOURCE CmpRegistryLock; - -LIST_ENTRY CmiKeyObjectListHead; -LIST_ENTRY CmiConnectedHiveList; - -extern LIST_ENTRY CmiCallbackHead; -extern FAST_MUTEX CmiCallbackLock; - -PVOID -NTAPI -CmpRosGetHardwareHive(OUT PULONG Length) -{ - PLIST_ENTRY ListHead, NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; - - /* Loop the memory descriptors */ - ListHead = &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the current block */ - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Check if this is an registry block */ - if (MdBlock->MemoryType == LoaderRegistryData) - { - /* Check if it's not the SYSTEM hive that we already initialized */ - if ((MdBlock->BasePage) != - (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) - { - /* Hardware hive break out */ - break; - } - } - - /* Go to the next block */ - NextEntry = MdBlock->ListEntry.Flink; - } - - /* We need a hardware hive */ - ASSERT(MdBlock); - *Length = MdBlock->PageCount << PAGE_SHIFT; - return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); -} - -/* Precondition: Must not hold the hive lock CmpRegistryLock */ -VOID -NTAPI -EnlistKeyBodyWithKeyObject(IN PKEY_OBJECT KeyObject, - IN ULONG Flags) -{ - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - /* Insert it into the global list (we don't have KCBs here) */ - InsertTailList(&CmiKeyObjectListHead, &KeyObject->KeyBodyList); - - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); -} - -NTSTATUS -NTAPI -CmpLinkHiveToMaster(IN PUNICODE_STRING LinkName, - IN HANDLE RootDirectory, - IN PCMHIVE RegistryHive, - IN BOOLEAN Allocate, - IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; - NTSTATUS Status; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - CM_PARSE_CONTEXT ParseContext = {0}; - PAGED_CODE(); - - /* Setup the object attributes */ - InitializeObjectAttributes(&ObjectAttributes, - LinkName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - RootDirectory, - SecurityDescriptor); - - /* Setup the parse context */ - ParseContext.CreateLink = TRUE; - ParseContext.CreateOperation = TRUE; - ParseContext.ChildHive.KeyHive = &RegistryHive->Hive; - - /* Check if we have a root keycell or if we need to create it */ - if (Allocate) - { - /* Create it */ - ParseContext.ChildHive.KeyCell = HCELL_NIL; - } - else - { - /* We have one */ - ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; - } - - /* Capture all the info */ - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - KernelMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) return Status; - - /* Do the parse */ - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&ParentKey, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - - /* Let go of captured attributes and name */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - /* Get out of here if we failed */ - if (!NT_SUCCESS(Status)) return Status; - - /* Scan for no name */ - if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) - { - /* Fail */ - ObDereferenceObject(ParentKey); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* Scan for leading backslash */ - while ((RemainingPath.Length) && - (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) - { - /* Ignore it */ - RemainingPath.Length -= sizeof(WCHAR); - RemainingPath.MaximumLength -= sizeof(WCHAR); - RemainingPath.Buffer++; - } - - /* Create the link node */ - Status = CmpCreateLinkNode(ParentKey->KeyControlBlock->KeyHive, - ParentKey->KeyControlBlock->KeyCell, - NULL, - RemainingPath, - KernelMode, - 0, - &ParseContext, - ParentKey->KeyControlBlock, - (PVOID*)&NewKey); - if (!NT_SUCCESS(Status)) - { - /* Failed */ - DPRINT1("CmpLinkHiveToMaster failed: %lx\n", Status); - ObDereferenceObject(ParentKey); - return Status; - } - - /* Free the create information */ - ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo); - OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo = NULL; - - /* Mark the hive as clean */ - RegistryHive->Hive.DirtyFlag = FALSE; - - /* Update KCB information */ - NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; - - /* Build the key name */ - RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &RemainingPath, - &NewKey->Name); - - /* Reference the new key */ - ObReferenceObject(NewKey); - - /* Link this key to the parent */ - CmiAddKeyToList(ParentKey, NewKey); - return STATUS_SUCCESS; -} - -VOID -NTAPI -CmShutdownRegistry(VOID) -{ - CmShutdownSystem(); -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri Nov 23 22:29:45 2007 @@ -501,10 +501,6 @@ // // BUGBUG Old Hive Stuff for Temporary Support // -#define SYSTEM_REG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM" -#define SYSTEM_LOG_FILE L"\\SystemRoot\\System32\\Config\\SYSTEM.log" -#define REG_SYSTEM_KEY_NAME L"\\Registry\\Machine\\SYSTEM" -#define REG_HARDWARE_KEY_NAME L"\\Registry\\Machine\\HARDWARE" typedef struct _KEY_OBJECT { ULONG Type; @@ -515,10 +511,19 @@ struct _KEY_OBJECT **SubKeys; PCM_KEY_CONTROL_BLOCK KeyControlBlock; } KEY_OBJECT, *PKEY_OBJECT; -extern PCMHIVE CmiVolatileHive; -extern LIST_ENTRY CmiKeyObjectListHead, CmiConnectedHiveList; -PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); +NTSTATUS +NTAPI +CmFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, + PUNICODE_STRING ObjectName, + PVOID* ReturnedObject, + PUNICODE_STRING RemainingPath, + POBJECT_TYPE ObjectType, + IN PACCESS_STATE AccessState, + IN PVOID ParseContext); NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); +VOID +CmiAddKeyToList(IN PKEY_OBJECT ParentKey, + IN PKEY_OBJECT NewKey); /////////////////////////////////////////////////////////////////////////////// // @@ -1399,6 +1404,8 @@ extern BOOLEAN CmpNoWrite; extern BOOLEAN CmpForceForceFlush; extern BOOLEAN CmpWasSetupBoot; +extern PCMHIVE CmiVolatileHive; +extern LIST_ENTRY CmiKeyObjectListHead; // // Inlined functions 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 Fri Nov 23 22:29:45 2007 @@ -13,6 +13,12 @@ #define NDEBUG #include "debug.h" +POBJECT_TYPE CmpKeyObjectType; +PCMHIVE CmiVolatileHive; +LIST_ENTRY CmpHiveListHead; +ERESOURCE CmpRegistryLock; +LIST_ENTRY CmiKeyObjectListHead; +LIST_ENTRY CmiConnectedHiveList; KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; KEVENT CmpLoadWorkerEvent; @@ -28,6 +34,45 @@ BOOLEAN CmpWasSetupBoot; /* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +CmpRosGetHardwareHive(OUT PULONG Length) +{ + PLIST_ENTRY ListHead, NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; + + /* Loop the memory descriptors */ + ListHead = &KeLoaderBlock->MemoryDescriptorListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the current block */ + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Check if this is an registry block */ + if (MdBlock->MemoryType == LoaderRegistryData) + { + /* Check if it's not the SYSTEM hive that we already initialized */ + if ((MdBlock->BasePage) != + (((ULONG_PTR)KeLoaderBlock->RegistryBase &~ KSEG0_BASE) >> PAGE_SHIFT)) + { + /* Hardware hive break out */ + break; + } + } + + /* Go to the next block */ + NextEntry = MdBlock->ListEntry.Flink; + } + + /* We need a hardware hive */ + ASSERT(MdBlock); + *Length = MdBlock->PageCount << PAGE_SHIFT; + return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); +} NTSTATUS NTAPI @@ -443,6 +488,132 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +CmpLinkHiveToMaster(IN PUNICODE_STRING LinkName, + IN HANDLE RootDirectory, + IN PCMHIVE RegistryHive, + IN BOOLEAN Allocate, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING RemainingPath; + PKEY_OBJECT ParentKey; + PKEY_OBJECT NewKey; + NTSTATUS Status; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + CM_PARSE_CONTEXT ParseContext = {0}; + PAGED_CODE(); + + /* Setup the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + LinkName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + RootDirectory, + SecurityDescriptor); + + /* Setup the parse context */ + ParseContext.CreateLink = TRUE; + ParseContext.CreateOperation = TRUE; + ParseContext.ChildHive.KeyHive = &RegistryHive->Hive; + + /* Check if we have a root keycell or if we need to create it */ + if (Allocate) + { + /* Create it */ + ParseContext.ChildHive.KeyCell = HCELL_NIL; + } + else + { + /* We have one */ + ParseContext.ChildHive.KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + } + + /* Capture all the info */ + Status = ObpCaptureObjectAttributes(&ObjectAttributes, + KernelMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) return Status; + + /* Do the parse */ + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&ParentKey, + &RemainingPath, + CmpKeyObjectType, + NULL, + NULL); + + /* Let go of captured attributes and name */ + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); + + /* Get out of here if we failed */ + if (!NT_SUCCESS(Status)) return Status; + + /* Scan for no name */ + if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) + { + /* Fail */ + ObDereferenceObject(ParentKey); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Scan for leading backslash */ + while ((RemainingPath.Length) && + (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + /* Ignore it */ + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + RemainingPath.Buffer++; + } + + /* Create the link node */ + Status = CmpCreateLinkNode(ParentKey->KeyControlBlock->KeyHive, + ParentKey->KeyControlBlock->KeyCell, + NULL, + RemainingPath, + KernelMode, + 0, + &ParseContext, + ParentKey->KeyControlBlock, + (PVOID*)&NewKey); + if (!NT_SUCCESS(Status)) + { + /* Failed */ + DPRINT1("CmpLinkHiveToMaster failed: %lx\n", Status); + ObDereferenceObject(ParentKey); + return Status; + } + + /* Free the create information */ + ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo); + OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo = NULL; + + /* Mark the hive as clean */ + RegistryHive->Hive.DirtyFlag = FALSE; + + /* Update KCB information */ + NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; + NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; + + /* Build the key name */ + RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &RemainingPath, + &NewKey->Name); + + /* Reference the new key */ + ObReferenceObject(NewKey); + + /* Link this key to the parent */ + CmiAddKeyToList(ParentKey, NewKey); + return STATUS_SUCCESS; +} + BOOLEAN NTAPI CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -499,7 +670,8 @@ CmPrepareHive(&SystemHive->Hive); /* Set the hive filename */ - RtlCreateUnicodeString(&SystemHive->FileFullPath, SYSTEM_REG_FILE); + RtlCreateUnicodeString(&SystemHive->FileFullPath, + L"\\SystemRoot\\System32\\Config\\SYSTEM"); /* We imported, no need to create a new hive */ Allocate = FALSE; @@ -523,7 +695,8 @@ if (!NT_SUCCESS(Status)) return FALSE; /* Set the hive filename */ - RtlCreateUnicodeString(&SystemHive->FileFullPath, SYSTEM_REG_FILE); + RtlCreateUnicodeString(&SystemHive->FileFullPath, + L"\\SystemRoot\\System32\\Config\\SYSTEM"); /* Tell CmpLinkHiveToMaster to allocate a hive */ Allocate = TRUE; @@ -552,7 +725,7 @@ SecurityDescriptor = CmpHiveRootSecurityDescriptor(); /* Attach it to the system key */ - RtlInitUnicodeString(&KeyName, REG_SYSTEM_KEY_NAME); + RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM"); Status = CmpLinkHiveToMaster(&KeyName, NULL, (PCMHIVE)SystemHive, @@ -736,7 +909,7 @@ #endif /* Insert it into the object list head */ - EnlistKeyBodyWithKeyObject(RootKey, 0); + InsertTailList(&CmiKeyObjectListHead, &RootKey->KeyBodyList); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -1309,7 +1482,7 @@ CmpMachineHiveList[0].CmHive = (PCMHIVE)HardwareHive; /* Attach it to the machine key */ - RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); + RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE"); Status = CmpLinkHiveToMaster(&KeyName, NULL, (PCMHIVE)HardwareHive, Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Fri Nov 23 22:29:45 2007 @@ -170,7 +170,7 @@ Waittime.QuadPart = (LONGLONG)-10000000; /* 1sec */ KeDelayExecutionThread(KernelMode, FALSE, &Waittime); - CmShutdownRegistry(); + CmShutdownSystem(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Fri Nov 23 22:29:45 2007 @@ -72,9 +72,7 @@ */ BOOLEAN NTAPI ObInit(VOID); BOOLEAN NTAPI CmInitSystem1(VOID); -VOID NTAPI CmShutdownRegistry(VOID); -//BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); -//BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); +VOID NTAPI CmShutdownSystem(VOID); BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); /* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */ 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 Fri Nov 23 22:29:45 2007 @@ -140,7 +140,6 @@ </directory> <directory name="cm"> <file>ntfunc.c</file> - <file>registry.c</file> <file>regobj.c</file> </directory> <directory name="dbgk">

1 0

[fireball] 30703: - Remove CmiInitHives. - Enable parallel hive loading, this speeds up boot by loading the registry in 6 threads instead of just one (once we start having large registries and MP support this will be more evident). - Added some little hacks to make this work for now. - Fix a memory leak in CmInit1. - Add hardware hive to machine hive list so it can be properly loaded after.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 21:52:46 2007 New Revision: 30703 URL: http://svn.reactos.org/svn/reactos?rev=30703&view=rev Log: - Remove CmiInitHives. - Enable parallel hive loading, this speeds up boot by loading the registry in 6 threads instead of just one (once we start having large registries and MP support this will be more evident). - Added some little hacks to make this work for now. - Fix a memory leak in CmInit1. - Add hardware hive to machine hive list so it can be properly loaded after. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Fri Nov 23 21:52:46 2007 @@ -582,8 +582,6 @@ NTAPI NtInitializeRegistry (IN USHORT Flag) { - NTSTATUS Status; - PAGED_CODE(); if (CmiRegistryInitialized == TRUE) @@ -591,13 +589,11 @@ /* Save boot log file */ IopSaveBootLogToFile(); - - Status = CmiInitHives (Flag); - + CmpCmdInit(Flag); CmiRegistryInitialized = TRUE; - return Status; + return STATUS_SUCCESS; } /* EOF */ 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 Fri Nov 23 21:52:46 2007 @@ -223,165 +223,6 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -CmpGetRegistryPath(IN PWCHAR ConfigPath); - -NTSTATUS -CmiInitHives(BOOLEAN SetupBoot) -{ - NTSTATUS Status; - WCHAR ConfigPath[MAX_PATH]; - PWSTR EndPtr; - PCMHIVE CmHive; - BOOLEAN Allocate = TRUE; - UNICODE_STRING FileName, KeyName; - - DPRINT("CmiInitHives() called\n"); - - CmpGetRegistryPath(ConfigPath); - DPRINT("ConfigPath: %S\n", ConfigPath); - EndPtr = ConfigPath + wcslen(ConfigPath); - - /* Setup the file name for the SECURITY hive */ - wcscpy(EndPtr, REG_SEC_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); - - /* Load the hive */ - Status = CmpInitHiveFromFile(&FileName, - 0, - &CmHive, - &Allocate, - 0); - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString(&KeyName, REG_SEC_KEY_NAME); - - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - CmHive, - FALSE, - NULL); - - /* Connect the SOFTWARE hive */ - wcscpy(EndPtr, REG_SOFTWARE_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); - - /* Load the hive */ - Status = CmpInitHiveFromFile(&FileName, - 0, - &CmHive, - &Allocate, - 0); - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString (&KeyName, REG_SOFTWARE_KEY_NAME); - - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - CmHive, - FALSE, - NULL); - - /* Connect the SYSTEM hive only if it has been created */ - if (SetupBoot == TRUE) - { - HANDLE PrimaryHandle, LogHandle; - ULONG PrimaryDisposition, SecondaryDisposition; - ULONG ClusterSize, Length; - - /* Build the file name */ - wcscpy(EndPtr, REG_SYSTEM_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); - - /* Hive already exists */ - CmHive = CmpMachineHiveList[3].CmHive; - - /* Open the hive file and log */ - Status = CmpOpenHiveFiles(&FileName, - L".LOG", - &PrimaryHandle, - &LogHandle, - &PrimaryDisposition, - &SecondaryDisposition, - TRUE, - TRUE, - FALSE, - &ClusterSize); - if (!(NT_SUCCESS(Status)) || !(LogHandle)) - { - /* Bugcheck */ - KeBugCheck(BAD_SYSTEM_CONFIG_INFO); - } - - /* Save the file handles */ - CmHive->FileHandles[HFILE_TYPE_LOG] = LogHandle; - CmHive->FileHandles[HFILE_TYPE_PRIMARY] = PrimaryHandle; - - /* Allow lazy flushing since the handles are there */ - //ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); - CmHive->Hive.HiveFlags &= ~HIVE_NOLAZYFLUSH; - - /* Get the real size of the hive */ - Length = CmHive->Hive.Storage[Stable].Length + HBLOCK_SIZE; - - /* Check if the cluster size doesn't match */ - if (CmHive->Hive.Cluster != ClusterSize) ASSERT(FALSE); - - /* Set the file size */ - if (!CmpFileSetSize((PHHIVE)CmHive, HFILE_TYPE_PRIMARY, Length, Length)) - { - /* This shouldn't fail */ - ASSERT(FALSE); - } - } - - /* Connect the DEFAULT hive */ - wcscpy(EndPtr, REG_DEFAULT_USER_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); - - /* Load the hive */ - Status = CmpInitHiveFromFile(&FileName, - 0, - &CmHive, - &Allocate, - 0); - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString (&KeyName, REG_DEFAULT_USER_KEY_NAME); - - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - CmHive, - FALSE, - NULL); - - /* Connect the SAM hive */ - wcscpy(EndPtr, REG_SAM_FILE_NAME); - RtlInitUnicodeString(&FileName, ConfigPath); - DPRINT ("ConfigPath: %S\n", ConfigPath); - - /* Load the hive */ - Status = CmpInitHiveFromFile(&FileName, - 0, - &CmHive, - &Allocate, - 0); - - /* Setup the key name for the SECURITY hive */ - RtlInitUnicodeString(&KeyName, REG_SAM_KEY_NAME); - Status = CmpLinkHiveToMaster(&KeyName, - NULL, - CmHive, - FALSE, - NULL); - return Status; -} - VOID NTAPI CmShutdownRegistry(VOID) 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 Fri Nov 23 21:52:46 2007 @@ -826,7 +826,7 @@ } /* Add registry path */ - wcscat(ConfigPath, L"\\System32\\Config"); + wcscat(ConfigPath, L"\\System32\\Config\\"); /* Done */ return STATUS_SUCCESS; @@ -888,13 +888,11 @@ RtlAppendStringToString((PSTRING)&FileName, (PSTRING)&TempName); if (!CmpMachineHiveList[i].CmHive) { - /* We need to allocate a ne whive structure */ + /* We need to allocate a new hive structure */ CmpMachineHiveList[i].Allocate = TRUE; /* Load the hive file */ DPRINT1("[HiveLoad]: Load from file %wZ\n", &FileName); - CmpMachineHiveList[i].CmHive2 = (PVOID)0xBAADBEEF; - goto Later; Status = CmpInitHiveFromFile(&FileName, CmpMachineHiveList[i].HHiveFlags, &CmHive, @@ -918,13 +916,12 @@ } else { + if (ExpInTextModeSetup) { /* We already have a hive, is it volatile? */ CmHive = CmpMachineHiveList[i].CmHive; if (!(CmHive->Hive.HiveFlags & HIVE_VOLATILE)) { DPRINT1("[HiveLoad]: Open from file %wZ\n", &FileName); - CmpMachineHiveList[i].CmHive2 = CmHive; - goto Later; /* It's now, open the hive file and log */ Status = CmpOpenHiveFiles(&FileName, @@ -957,7 +954,7 @@ CmHive->FileHandles[HFILE_TYPE_PRIMARY] = PrimaryHandle; /* Allow lazy flushing since the handles are there -- remove sync hacks */ - ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); + //ASSERT(CmHive->Hive.HiveFlags & HIVE_NOLAZYFLUSH); CmHive->Hive.HiveFlags &= ~HIVE_NOLAZYFLUSH; /* Get the real size of the hive */ @@ -979,17 +976,15 @@ /* Finally, set our allocated hive to the same hive we've had */ CmpMachineHiveList[i].CmHive2 = CmHive; ASSERT(CmpMachineHiveList[i].CmHive == CmpMachineHiveList[i].CmHive2); - } + }} } /* We're done */ -Later: CmpMachineHiveList[i].ThreadFinished = TRUE; /* Check if we're the last worker */ WorkerCount = InterlockedIncrement(&CmpLoadWorkerIncrement); if (WorkerCount == CM_NUMBER_OF_MACHINE_HIVES) - { /* Signal the event */ KeSetEvent(&CmpLoadWorkerEvent, 0, FALSE); @@ -1003,7 +998,7 @@ NTAPI CmpInitializeHiveList(IN USHORT Flag) { - WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH]; + WCHAR FileBuffer[MAX_PATH], RegBuffer[MAX_PATH], ConfigPath[MAX_PATH]; UNICODE_STRING TempName, FileName, RegName; HANDLE Thread; NTSTATUS Status; @@ -1019,7 +1014,8 @@ RtlInitEmptyUnicodeString(&RegName, RegBuffer, MAX_PATH); /* Now build the system root path */ - RtlInitUnicodeString(&TempName, L"\\SystemRoot\\System32\\Config\\"); + CmpGetRegistryPath(ConfigPath); + RtlInitUnicodeString(&TempName, ConfigPath); RtlAppendStringToString((PSTRING)&FileName, (PSTRING)&TempName); FileStart = FileName.Length; @@ -1105,11 +1101,10 @@ /* Now link the hive to its master */ DPRINT1("[HiveLoad]: Link %wZ\n", &RegName); -#if 0 Status = CmpLinkHiveToMaster(&RegName, NULL, CmpMachineHiveList[i].CmHive2, - CmpMachineHiveList[i].Allocate, + FALSE, //CmpMachineHiveList[i].Allocate, SecurityDescriptor); if (Status != STATUS_SUCCESS) { @@ -1121,9 +1116,8 @@ if (CmpMachineHiveList[i].Allocate) { /* Sync the new hive */ - HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2)); - } -#endif + //HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2)); + } } /* Check if we created a new hive */ @@ -1310,19 +1304,27 @@ /* Bugcheck */ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); } + + /* Add the hive to the hive list */ + CmpMachineHiveList[0].CmHive = (PCMHIVE)HardwareHive; /* Attach it to the machine key */ RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); Status = CmpLinkHiveToMaster(&KeyName, NULL, (PCMHIVE)HardwareHive, - FALSE, + FALSE, // TRUE SecurityDescriptor); if (!NT_SUCCESS(Status)) { /* Bugcheck */ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); } + + /* FIXME: Add to HiveList key */ + + /* Free the security descriptor */ + ExFreePool(SecurityDescriptor); /* Fill out the Hardware key with the ARC Data from the Loader */ Status = CmpInitializeHardwareConfiguration(KeLoaderBlock);

1 0

[peterw] 30702: - No need to clear these here anymore.
by peterw＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: peterw Date: Fri Nov 23 21:13:03 2007 New Revision: 30702 URL: http://svn.reactos.org/svn/reactos?rev=30702&view=rev Log: - No need to clear these here anymore. Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Nov 23 21:13:03 2007 @@ -11,12 +11,6 @@ @echo off title reladdr2line... - -:: -:: Clear variables before use. -:: -set _1= -set _2= :: :: Receive the Parameters and decide what to do.

1 0

[arty] 30701: Mostly revert my earlier attempt at fixing IRP cancellation. I'll attack it again later.
by arty＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: arty Date: Fri Nov 23 21:06:07 2007 New Revision: 30701 URL: http://svn.reactos.org/svn/reactos?rev=30701&view=rev Log: Mostly revert my earlier attempt at fixing IRP cancellation. I'll attack it again later. Modified: trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c Fri Nov 23 21:06:07 2007 @@ -46,7 +46,7 @@ BOOLEAN Write, BOOLEAN LockAddress ) { UINT i; /* Copy the buffer array so we don't lose it */ - UINT Lock = LockAddress ? 2 : 0; + UINT Lock = (LockAddress && AddressLen) ? 2 : 0; UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); PMDL NewMdl; @@ -58,16 +58,13 @@ _SEH_TRY { RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count ); - if( LockAddress && AddressLen ) { + if( LockAddress ) { NewBuf[Count].buf = AddressBuf; NewBuf[Count].len = *AddressLen; Count++; NewBuf[Count].buf = (PVOID)AddressLen; NewBuf[Count].len = sizeof(*AddressLen); Count++; - } else if( LockAddress ) { - RtlZeroMemory(NewBuf, sizeof(*NewBuf) * 2); - Count += 2; } } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE,("Access violation copying buffer info " Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c (original) +++ trunk/reactos/drivers/network/afd/afd/main.c Fri Nov 23 21:06:07 2007 @@ -152,7 +152,50 @@ } VOID DestroySocket( PAFD_FCB FCB ) { + UINT i; + BOOLEAN ReturnEarly = FALSE; + PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; + AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); + + if( !SocketAcquireStateLock( FCB ) ) return; + + FCB->State = SOCKET_STATE_CLOSED; + + InFlightRequest[0] = &FCB->ListenIrp; + InFlightRequest[1] = &FCB->ReceiveIrp; + InFlightRequest[2] = &FCB->SendIrp; + + /* Return early here because we might be called in the mean time. */ + if( FCB->Critical || + FCB->ListenIrp.InFlightRequest || + FCB->ReceiveIrp.InFlightRequest || + FCB->SendIrp.InFlightRequest ) { + AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", + FCB->ListenIrp.InFlightRequest, + FCB->ReceiveIrp.InFlightRequest, + FCB->SendIrp.InFlightRequest)); + ReturnEarly = TRUE; + } + + /* After PoolReeval, this FCB should not be involved in any outstanding + * poll requests */ + + /* Cancel our pending requests */ + for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { + NTSTATUS Status = STATUS_NO_SUCH_FILE; + if( InFlightRequest[i]->InFlightRequest ) { + AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", + i, InFlightRequest[i]->InFlightRequest)); + InFlightRequest[i]->InFlightRequest->IoStatus.Status = Status; + InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; + IoCancelIrp( InFlightRequest[i]->InFlightRequest ); + } + } + + SocketStateUnlock( FCB ); + + if( ReturnEarly ) return; if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); @@ -175,12 +218,8 @@ AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp) { - UINT i; - AFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - - if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp, FALSE); AFD_DbgPrint(MID_TRACE, ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -194,56 +233,15 @@ if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); FileObject->FsContext = NULL; - - FCB->State = SOCKET_STATE_CLOSED; - SocketStateUnlock(FCB); - - InFlightRequest[0] = FCB->ListenIrp; - InFlightRequest[1] = FCB->ReceiveIrp; - InFlightRequest[2] = FCB->SendIrp; - - /* Return early here because we might be called in the mean time. */ - if( !(FCB->Critical || - FCB->ListenIrp.InFlightRequest || - FCB->ReceiveIrp.InFlightRequest || - FCB->SendIrp.InFlightRequest) ) { - AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", - FCB->ListenIrp.InFlightRequest, - FCB->ReceiveIrp.InFlightRequest, - FCB->SendIrp.InFlightRequest)); - SocketStateUnlock(FCB); - DestroySocket(FCB); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - else - { - /* After PoolReeval, this FCB should not be involved in any outstanding - * poll requests */ - - /* Cancel our pending requests */ - for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { - NTSTATUS Status = STATUS_NO_SUCH_FILE; - if( InFlightRequest[i].InFlightRequest ) { - AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", - i, InFlightRequest[i].InFlightRequest)); - InFlightRequest[i].InFlightRequest->IoStatus.Status = Status; - InFlightRequest[i].InFlightRequest->IoStatus.Information = 0; - IoCancelIrp( InFlightRequest[i].InFlightRequest ); - } - } - - FCB->PendingClose = Irp; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - DestroySocket( FCB ); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + AFD_DbgPrint(MID_TRACE, ("Returning success.\n")); - return Irp->IoStatus.Status; + return STATUS_SUCCESS; } static NTSTATUS STDCALL Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c (original) +++ trunk/reactos/drivers/network/afd/afd/read.c Fri Nov 23 21:06:07 2007 @@ -231,6 +231,7 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); SocketStateUnlock( FCB ); + DestroySocket( FCB ); return STATUS_SUCCESS; } else if( FCB->State == SOCKET_STATE_LISTENING ) { AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); @@ -434,12 +435,13 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); + if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; + FCB->ReceiveIrp.InFlightRequest = NULL; - - if( !SocketAcquireStateLock( FCB ) ) return STATUS_UNSUCCESSFUL; if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); + DestroySocket( FCB ); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c Fri Nov 23 21:06:07 2007 @@ -165,6 +165,54 @@ return Status; } +NTSTATUS +TdiBuildConnectionInfoPair +( PTDI_CONNECTION_INFO_PAIR ConnectionInfo, + PTRANSPORT_ADDRESS From, PTRANSPORT_ADDRESS To ) + /* + * FUNCTION: Fill a TDI_CONNECTION_INFO_PAIR struct will the two addresses + * given. + * ARGUMENTS: + * ConnectionInfo: The pair + * From: The from address + * To: The to address + * RETURNS: + * Status of the operation + */ +{ + PCHAR LayoutFrame; + UINT SizeOfEntry; + ULONG TdiAddressSize; + PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn; + + /* FIXME: Get from socket information */ + TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType); + SizeOfEntry = TdiAddressSize + sizeof(TDI_CONNECTION_INFORMATION); + + LayoutFrame = (PCHAR)ExAllocatePool(NonPagedPool, 2 * SizeOfEntry); + + if (!LayoutFrame) { + AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry ); + + FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame; + ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry; + + if (From != NULL) { + TdiBuildConnectionInfoInPlace( FromTdiConn, From ); + } else { + TdiBuildNullConnectionInfoInPlace( FromTdiConn, + From->Address[0].AddressType ); + } + + TdiBuildConnectionInfoInPlace( ToTdiConn, To ); + + return STATUS_SUCCESS; +} + PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn ) /* * Convenience function that rounds out the abstraction of Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c (original) +++ trunk/reactos/drivers/network/afd/afd/write.c Fri Nov 23 21:06:07 2007 @@ -47,6 +47,7 @@ if( FCB->State == SOCKET_STATE_CLOSED ) { SocketStateUnlock( FCB ); + DestroySocket( FCB ); return STATUS_SUCCESS; } @@ -177,6 +178,12 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ + if( FCB->State == SOCKET_STATE_CLOSED ) { + SocketStateUnlock( FCB ); + DestroySocket( FCB ); + return STATUS_SUCCESS; + } + SocketStateUnlock( FCB ); return STATUS_SUCCESS; Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h (original) +++ trunk/reactos/drivers/network/afd/include/afd.h Fri Nov 23 21:06:07 2007 @@ -147,7 +147,6 @@ PVOID Context; DWORD PollState; UINT ContextSize; - PIRP PendingClose; LIST_ENTRY PendingIrpList[MAX_FUNCTIONS]; LIST_ENTRY DatagramList; LIST_ENTRY PendingConnections; Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Fri Nov 23 21:06:07 2007 @@ -53,6 +53,34 @@ return IRPFinish(Irp, STATUS_CANCELLED); } + + +VOID DispCancelComplete( + PVOID Context) +/* + * FUNCTION: Completes a cancel request + * ARGUMENTS: + * Context = Pointer to context information (FILE_OBJECT) + */ +{ + /*KIRQL OldIrql;*/ + PFILE_OBJECT FileObject; + PTRANSPORT_CONTEXT TranContext; + + TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + + FileObject = (PFILE_OBJECT)Context; + TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext; + + /* Set the cleanup event */ + KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); + + /* We are expected to release the cancel spin lock */ + /*IoReleaseCancelSpinLock(OldIrql);*/ + + TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); +} + VOID DispDataRequestComplete( PVOID Context, @@ -128,14 +156,8 @@ TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); -} - -VOID DispDoPacketCancel( PVOID Data ) { - TI_DbgPrint(DEBUG_IRP, ("Called.\n")); - PIRP *IrpP = (PIRP *)Data, Irp = *IrpP; - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + + DispCancelComplete(DisType->FileObject); } VOID NTAPI DispCancelRequest( @@ -154,7 +176,6 @@ UCHAR MinorFunction; DISCONNECT_TYPE DisType; PVOID WorkItem; - PADDRESS_FILE AddrFile; /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -188,26 +209,26 @@ if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE), DispDoDisconnect, &DisType ) ) ASSERT(0); - return; + break; case TDI_SEND_DATAGRAM: - AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); break; } - /* Nothing to do. We don't keep them around. */ + + /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/ break; case TDI_RECEIVE_DATAGRAM: - AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; Irp->IoStatus.Status = STATUS_CANCELLED; if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) { TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n")); break; } - DGRemoveIRP(AddrFile, Irp); + + /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/ break; default: @@ -215,9 +236,11 @@ break; } + if( Irp->IoStatus.Status == STATUS_PENDING ) + IoMarkIrpPending(Irp); + IoReleaseCancelSpinLock(Irp->CancelIrql); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -261,6 +284,9 @@ IoReleaseCancelSpinLock(Irp->CancelIrql); DispDataRequestComplete(Irp, STATUS_CANCELLED, 0); + + DispCancelComplete(FileObject); + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -796,6 +822,7 @@ return Status; } + NTSTATUS DispTdiReceiveDatagram( PIRP Irp) /* @@ -812,7 +839,6 @@ TDI_REQUEST Request; NTSTATUS Status; ULONG BytesReceived; - PADDRESS_FILE AddrFile; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -826,8 +852,6 @@ return STATUS_INVALID_ADDRESS; } - AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; - /* Initialize a receive request */ Request.Handle.AddressHandle = TranContext->Handle.AddressHandle; Request.RequestNotifyObject = DispDataRequestComplete; @@ -847,21 +871,21 @@ &DataBuffer, &BufferSize ); - Status = DGReceiveDatagram( - AddrFile, - DgramInfo->ReceiveDatagramInformation, - DataBuffer, - DgramInfo->ReceiveLength, - DgramInfo->ReceiveFlags, - DgramInfo->ReturnDatagramInformation, - &BytesReceived, - (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete, - Irp, - Irp); - if (Status != STATUS_PENDING) { - DispDataRequestComplete(Irp, Status, BytesReceived); - } else - IoMarkIrpPending(Irp); + Status = DGReceiveDatagram( + Request.Handle.AddressHandle, + DgramInfo->ReceiveDatagramInformation, + DataBuffer, + DgramInfo->ReceiveLength, + DgramInfo->ReceiveFlags, + DgramInfo->ReturnDatagramInformation, + &BytesReceived, + (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete, + Irp, + Irp); + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, BytesReceived); + } else + IoMarkIrpPending(Irp); } TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Fri Nov 23 21:06:07 2007 @@ -146,6 +146,7 @@ } CP Context->CancelIrps = FALSE; + KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE); CP IrpSp = IoGetCurrentIrpStackLocation(Irp); IrpSp->FileObject->FsContext = Context; @@ -273,11 +274,20 @@ { PIRP Irp; PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TranContext; + KIRQL OldIrql; Irp = (PIRP)Context; IrpSp = IoGetCurrentIrpStackLocation(Irp); + TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; Irp->IoStatus.Status = Status; + + IoAcquireCancelSpinLock(&OldIrql); + + KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); + + IoReleaseCancelSpinLock(OldIrql); } @@ -311,6 +321,7 @@ IoAcquireCancelSpinLock(&OldIrql); Context->CancelIrps = TRUE; + KeResetEvent(&Context->CleanupEvent); IoReleaseCancelSpinLock(OldIrql); @@ -344,6 +355,12 @@ return STATUS_INVALID_PARAMETER; } + + if (Status != STATUS_PENDING) + TiCleanupFileObjectComplete(Irp, Status); + + KeWaitForSingleObject(&Context->CleanupEvent, + UserRequest, KernelMode, FALSE, NULL); return Irp->IoStatus.Status; }

1 0

[arty] 30700: We need an address within the stack in order for freeing it to work properly.
by arty＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: arty Date: Fri Nov 23 20:33:29 2007 New Revision: 30700 URL: http://svn.reactos.org/svn/reactos?rev=30700&view=rev Log: We need an address within the stack in order for freeing it to work properly. Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Fri Nov 23 20:33:29 2007 @@ -836,7 +836,7 @@ if (AllocatedStack) { /* Delete the stack */ - MmDeleteKernelStack(Thread->StackBase, FALSE); + MmDeleteKernelStack((PVOID)Thread->StackLimit, FALSE); Thread->InitialStack = NULL; } } @@ -878,7 +878,7 @@ KeUninitThread(IN PKTHREAD Thread) { /* Delete the stack */ - MmDeleteKernelStack(Thread->StackBase, FALSE); + MmDeleteKernelStack((PVOID)Thread->StackLimit, FALSE); Thread->InitialStack = NULL; }

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