Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[ion] 26675: - Add i386/cmhardwr.c and start implementing CmpInitializeMachineDependentConfiguration. Currently it only detects and writes the key for PAE. - Call the API from CmInitSystem1.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 20:42:24 2007 New Revision: 26675 URL: http://svn.reactos.org/svn/reactos?rev=26675&view=rev Log: - Add i386/cmhardwr.c and start implementing CmpInitializeMachineDependentConfiguration. Currently it only detects and writes the key for PAE. - Call the API from CmInitSystem1. Added: trunk/reactos/ntoskrnl/config/i386/ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Modified: trunk/reactos/ntoskrnl/cm/registry.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 Thu May 10 20:42:24 2007 @@ -73,6 +73,10 @@ NTSTATUS NTAPI CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock); static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -508,6 +512,14 @@ { /* Bugcheck */ KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); + } + + /* Initialize machine-dependent information into the registry */ + Status = CmpInitializeMachineDependentConfiguration(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 14, Status, 0); } /* Initialize volatile registry settings */ Added: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c (added) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c Thu May 10 20:42:24 2007 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/i386/cmhardwr.c + * PURPOSE: Configuration Manager - Hardware-Specific Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "../cm.h" +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNICODE_STRING KeyName, ValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG HavePae; + NTSTATUS Status; + HANDLE KeyHandle; + + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\" + L"Control\\Session Manager\\Memory Management"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Detect if PAE is enabled */ + HavePae = SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]; + + /* Set the value */ + RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension"); + NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_DWORD, + &HavePae, + sizeof(HavePae)); + + /* Close the key */ + NtClose(KeyHandle); + } + + /* All done*/ + return STATUS_SUCCESS; +} 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 Thu May 10 20:42:24 2007 @@ -84,6 +84,11 @@ <file>view.c</file> </directory> <directory name="config"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cmhardwr.c</file> + </directory> + </if> <file>cmboot.c</file> <file>cmcontrl.c</file> <file>cmdata.c</file>

17 years, 7 months

[mbosma] 26674: Renamed RosBE to RosBE-Windows on request of Colin_Finck who is working on a linux version.

by mbosma＠svn.reactos.org

Author: mbosma Date: Thu May 10 20:41:58 2007 New Revision: 26674 URL: http://svn.reactos.org/svn/reactos?rev=26674&view=rev Log: Renamed RosBE to RosBE-Windows on request of Colin_Finck who is working on a linux version. Added: trunk/tools/RosBE-Windows/ - copied from r26673, trunk/tools/RosBE/ Removed: trunk/tools/RosBE/

17 years, 7 months

[mbosma] 26673: Config dialog for RosBE.

by mbosma＠svn.reactos.org

Author: mbosma Date: Thu May 10 20:38:32 2007 New Revision: 26673 URL: http://svn.reactos.org/svn/reactos?rev=26673&view=rev Log: Config dialog for RosBE. Added: trunk/tools/RosBE/Tools/config/ trunk/tools/RosBE/Tools/config/en.rc trunk/tools/RosBE/Tools/config/makefile trunk/tools/RosBE/Tools/config/options.c (with props) trunk/tools/RosBE/Tools/config/options.rc trunk/tools/RosBE/Tools/config/resources.h (with props) trunk/tools/RosBE/Tools/config/todo.txt (with props) Added: trunk/tools/RosBE/Tools/config/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/en.rc?rev… ============================================================================== --- trunk/tools/RosBE/Tools/config/en.rc (added) +++ trunk/tools/RosBE/Tools/config/en.rc Thu May 10 20:38:32 2007 @@ -1,0 +1,20 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +ID_DIALOG DIALOG DISCARDABLE 0, 0, 304, 220 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "RosBE Settings" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Reactos Build Envirement Settings", 0x0, 15, 12, 114, 13 + LTEXT "Font Color", 0x0, 12, 45, 114, 13 + COMBOBOX IDC_FONT, 100, 45, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Background Color", 0x0, 12, 81, 114, 13 + COMBOBOX IDC_BACK, 100, 81, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 123, 110, 21 + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 123, 60, 21 + EDITTEXT ID_LOGDIR, 34, 140, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 250, 140, 32, 13, WS_TABSTOP + PUSHBUTTON "Save", ID_OK, 92, 191, 59, 26, WS_TABSTOP + PUSHBUTTON "Cancel", ID_CANCEL, 162, 191, 59, 26, WS_TABSTOP +} Added: trunk/tools/RosBE/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/makefile?… ============================================================================== --- trunk/tools/RosBE/Tools/config/makefile (added) +++ trunk/tools/RosBE/Tools/config/makefile Thu May 10 20:38:32 2007 @@ -1,0 +1,29 @@ +TARGET := options.exe + +.PHONY: all + +all: $(TARGET) + +CPP=mingw32-gcc +CFLAGS := -DWIN32 -DUNICODE -O3 +LFLAGS := -mwindows +LIBS := + +SRCS := options.c +RC := options.rc + +OBJS := $(SRCS:.c=.o) $(RC:.rc=.coff) + +$(TARGET): $(OBJS) + $(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS) + +.c.o: $< + $(CPP) $(CFLAGS) -c $< -o $@ + +$(RC:.rc=.coff): + windres $(RCFLAGS) -o $@ $(RC) + +.PHONY: clean +clean: + -@del $(TARGET) + -@del $(OBJS) Added: trunk/tools/RosBE/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/options.c… ============================================================================== --- trunk/tools/RosBE/Tools/config/options.c (added) +++ trunk/tools/RosBE/Tools/config/options.c Thu May 10 20:38:32 2007 @@ -1,0 +1,116 @@ +/* + * RosBE Options Dialog (options.c) + * + * Copyright 2007 by Maarten Bosma + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program ; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <windows.h> +#include <stdio.h> +#include <shlobj.h> +#include "resources.h" + +// note: do not change the order - theses are the color under winxp they might differ in another OSes +WCHAR* Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"violett", + L"olive", L"light grey", L"dark grey", L"light blue", L"light green", + L"don't know what this color is called", L"light red", L"pink", L"yellow", L"white" }; + +int WriteSettings (HWND hwnd) +{ + int foreground, background; + BOOL showtime, writelog; + WCHAR logpath [MAX_PATH]; + + showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; + writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); + background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); + GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + + FILE * pFile = fopen ("options.cmd","w"); + + fprintf (pFile, "REM This file has been automatically created by RosBE Options Dialog\n\n"); + fprintf (pFile, "color %X%X\n",background,foreground); + fprintf (pFile, "set ROSBE_SHOWTIME=%d\n",showtime); + fprintf (pFile, "set ROSBE_WRITELOG=%d\n",writelog); + fprintf (pFile, "set ROSBE_LOGPATH=%S\n",logpath); + + fclose (pFile); +} + +INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + int i = 0; + switch (Msg) + { + case WM_INITDIALOG: + { + for(i = 0; i < sizeof(Colors)/sizeof(char*); i++) + { + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM)(Colors[i])); + } + SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); + SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); + EnableWindow (GetDlgItem(Dlg, ID_BROWSE), FALSE); + EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), FALSE); + return TRUE; + } + + case WM_COMMAND: + { + if (wParam == ID_CANCEL) + { + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_OK) + { + WriteSettings(Dlg); + PostMessage(Dlg, WM_CLOSE, 0, 0); + } + else if (wParam == ID_BROWSE) + { + WCHAR Path [MAX_PATH]; + BROWSEINFO PathInfo = {0}; + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; + LPITEMIDLIST pidl = SHBrowseForFolder ( &PathInfo ); + if(pidl && SHGetPathFromIDList ( pidl, Path )) + SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_SAVELOGS) + { + BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; + EnableWindow (GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); + EnableWindow (GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); + } + return FALSE; + } + + case WM_CLOSE: + { + EndDialog(Dlg, 0); + return TRUE; + } + } + return FALSE; +} + +int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +{ + DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + return 0; +} Propchange: trunk/tools/RosBE/Tools/config/options.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/Tools/config/options.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/tools/RosBE/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/options.r… ============================================================================== --- trunk/tools/RosBE/Tools/config/options.rc (added) +++ trunk/tools/RosBE/Tools/config/options.rc Thu May 10 20:38:32 2007 @@ -1,0 +1,4 @@ +#include <windows.h> +#include "resources.h" + +#include "en.rc" Added: trunk/tools/RosBE/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/resources… ============================================================================== --- trunk/tools/RosBE/Tools/config/resources.h (added) +++ trunk/tools/RosBE/Tools/config/resources.h Thu May 10 20:38:32 2007 @@ -1,0 +1,9 @@ +#define ID_DIALOG 0x10 +#define ID_OK 0x1 +#define ID_CANCEL 0x2 +#define IDC_FONT 0x1 +#define IDC_BACK 0x2 +#define ID_SAVELOGS 0x5 +#define ID_SHOWBUILDTIME 0x6 +#define ID_LOGDIR 0x7 +#define ID_BROWSE 0x7 Propchange: trunk/tools/RosBE/Tools/config/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/RosBE/Tools/config/resources.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/tools/RosBE/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/config/todo.txt?… ============================================================================== --- trunk/tools/RosBE/Tools/config/todo.txt (added) +++ trunk/tools/RosBE/Tools/config/todo.txt Thu May 10 20:38:32 2007 @@ -1,0 +1,11 @@ +ToDo: +- Load old settings +- Disable Save button if there are no changes +- Check Log path before saving +- Exe and dialog icon +- Fix control size / positions +- Use styled controls (uxtheme) for dialog +- Find out how to disable +- Font preview +- ;abye cool logo as Bitmap +- find out the name of color 0xB Propchange: trunk/tools/RosBE/Tools/config/todo.txt ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 7 months

[dgorbachev] 26672: Fix a bug in ScServiceMainStub(), add more checks.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu May 10 14:13:01 2007 New Revision: 26672 URL: http://svn.reactos.org/svn/reactos?rev=26672&view=rev Log: Fix a bug in ScServiceMainStub(), add more checks. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Thu May 10 14:13:01 2007 @@ -101,7 +101,7 @@ lpPtr = lpService->Arguments; while (*lpPtr) { - DPRINT("arg: %S\n", *lpPtr); + DPRINT("arg: %S\n", lpPtr); dwLen = wcslen(lpPtr) + 1; dwArgCount++; dwLength += dwLen; @@ -153,9 +153,15 @@ 0, NULL, NULL); + if (AnsiLength == 0) + return ERROR_INVALID_PARAMETER; /* ? */ + AnsiString = HeapAlloc(GetProcessHeap(), 0, - AnsiLength); + AnsiLength + 1); + if (AnsiString == NULL) + return ERROR_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, lpService->Arguments, @@ -165,9 +171,13 @@ NULL, NULL); + AnsiString[AnsiLength] = ANSI_NULL; + lpArgVector = HeapAlloc(GetProcessHeap(), 0, (dwArgCount + 1) * sizeof(LPSTR)); + if (lpArgVector == NULL) + return ERROR_OUTOFMEMORY; dwArgCount = 0; Ptr = AnsiString;

17 years, 7 months

[ion] 26671: - Remove/deprecate some certain chunks of Cm which are not critical to booting and not even to applications (such as NtSaveKey, which didn't even have NtRestoreKey) and mark them as unimplemented functions. - This doesn't do much but clean up some of our code to make it easier to see what the critical parts are and reduce bug surface exposure. - Move and slightly reformat (without touching any of the actual code) registry callback/notification code to cmhook.c.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 13:14:15 2007 New Revision: 26671 URL: http://svn.reactos.org/svn/reactos?rev=26671&view=rev Log: - Remove/deprecate some certain chunks of Cm which are not critical to booting and not even to applications (such as NtSaveKey, which didn't even have NtRestoreKey) and mark them as unimplemented functions. - This doesn't do much but clean up some of our code to make it easier to see what the critical parts are and reduce bug surface exposure. - Move and slightly reformat (without touching any of the actual code) registry callback/notification code to cmhook.c. Added: trunk/reactos/ntoskrnl/config/cmhook.c Modified: trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c Thu May 10 13:14:15 2007 @@ -91,20 +91,9 @@ { *RegistryHive = NULL; - DPRINT ("CmImportSystemHive() called\n"); - - if (strncmp (ChunkBase, "regf", 4)) - { - DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase); - return FALSE; - } - - DPRINT ("Found '%.*s' magic\n", 4, ChunkBase); - /* Import the binary system hive (non-volatile, offset-based, permanent) */ if (!CmImportBinaryHive (ChunkBase, ChunkSize, 0, RegistryHive)) { - DPRINT1 ("CmiImportBinaryHive() failed\n"); return FALSE; } @@ -125,123 +114,11 @@ ULONG ChunkSize, OUT PEREGISTRY_HIVE *RegistryHive) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - HANDLE HardwareKey; - ULONG Disposition; - NTSTATUS Status; *RegistryHive = NULL; - - DPRINT ("CmImportHardwareHive() called\n"); - - if (ChunkBase == NULL && - ChunkSize == 0) - { - /* Create '\Registry\Machine\HARDWARE' key. */ - RtlInitUnicodeString (&KeyName, - REG_HARDWARE_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwCreateKey (&HardwareKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); - return FALSE; - } - ZwClose (HardwareKey); - - /* Create '\Registry\Machine\HARDWARE\DESCRIPTION' key. */ - RtlInitUnicodeString(&KeyName, - REG_DESCRIPTION_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwCreateKey (&HardwareKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); - return FALSE; - } - ZwClose (HardwareKey); - - /* Create '\Registry\Machine\HARDWARE\DEVICEMAP' key. */ - RtlInitUnicodeString (&KeyName, - REG_DEVICEMAP_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwCreateKey (&HardwareKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); - return FALSE; - } - ZwClose (HardwareKey); - - /* Create '\Registry\Machine\HARDWARE\RESOURCEMAP' key. */ - RtlInitUnicodeString(&KeyName, - REG_RESOURCEMAP_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwCreateKey (&HardwareKey, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); - return FALSE; - } - ZwClose (HardwareKey); - - return TRUE; - } - - /* Check the hive magic */ - if (strncmp (ChunkBase, "regf", 4)) - { - DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase); - return FALSE; - } - - DPRINT ("Found '%.*s' magic\n", 4, ChunkBase); - DPRINT ("ChunkBase %lx ChunkSize %lu\n", ChunkBase, ChunkSize); /* Import the binary system hive (volatile, offset-based, permanent) */ if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_NO_FILE, RegistryHive)) { - DPRINT1 ("CmiImportBinaryHive() failed\n"); return FALSE; } Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 10 13:14:15 2007 @@ -29,9 +29,6 @@ static BOOLEAN CmiRegistryInitialized = FALSE; -LIST_ENTRY CmiCallbackHead; -FAST_MUTEX CmiCallbackLock; - /* FUNCTIONS ****************************************************************/ NTSTATUS @@ -130,151 +127,6 @@ return STATUS_UNSUCCESSFUL; } - -/* - * @implemented - */ -NTSTATUS STDCALL -CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function, - IN PVOID Context, - IN OUT PLARGE_INTEGER Cookie) -{ - PREGISTRY_CALLBACK Callback; - - PAGED_CODE(); - - ASSERT(Function && Cookie); - - Callback = ExAllocatePoolWithTag(PagedPool, - sizeof(REGISTRY_CALLBACK), - TAG('C', 'M', 'c', 'b')); - if(Callback != NULL) - { - /* initialize the callback */ - ExInitializeRundownProtection(&Callback->RundownRef); - Callback->Function = Function; - Callback->Context = Context; - Callback->PendingDelete = FALSE; - - /* add it to the callback list and receive a cookie for the callback */ - ExAcquireFastMutex(&CmiCallbackLock); - /* FIXME - to receive a unique cookie we'll just return the pointer to the - callback object */ - Callback->Cookie.QuadPart = (ULONG_PTR)Callback; - InsertTailList(&CmiCallbackHead, &Callback->ListEntry); - - ExReleaseFastMutex(&CmiCallbackLock); - - *Cookie = Callback->Cookie; - return STATUS_SUCCESS; - } - - return STATUS_INSUFFICIENT_RESOURCES; -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -CmUnRegisterCallback(IN LARGE_INTEGER Cookie) -{ - PLIST_ENTRY CurrentEntry; - - PAGED_CODE(); - - ExAcquireFastMutex(&CmiCallbackLock); - - for(CurrentEntry = CmiCallbackHead.Flink; - CurrentEntry != &CmiCallbackHead; - CurrentEntry = CurrentEntry->Flink) - { - PREGISTRY_CALLBACK CurrentCallback; - - CurrentCallback = CONTAINING_RECORD(CurrentEntry, REGISTRY_CALLBACK, ListEntry); - if(CurrentCallback->Cookie.QuadPart == Cookie.QuadPart) - { - if(!CurrentCallback->PendingDelete) - { - /* found the callback, don't unlink it from the list yet so we don't screw - the calling loop */ - CurrentCallback->PendingDelete = TRUE; - ExReleaseFastMutex(&CmiCallbackLock); - - /* if the callback is currently executing, wait until it finished */ - ExWaitForRundownProtectionRelease(&CurrentCallback->RundownRef); - - /* time to unlink it. It's now safe because every attempt to acquire a - runtime protection on this callback will fail */ - ExAcquireFastMutex(&CmiCallbackLock); - RemoveEntryList(&CurrentCallback->ListEntry); - ExReleaseFastMutex(&CmiCallbackLock); - - /* free the callback */ - ExFreePool(CurrentCallback); - return STATUS_SUCCESS; - } - else - { - /* pending delete, pretend like it already is deleted */ - ExReleaseFastMutex(&CmiCallbackLock); - return STATUS_UNSUCCESSFUL; - } - } - } - - ExReleaseFastMutex(&CmiCallbackLock); - - return STATUS_UNSUCCESSFUL; -} - - -NTSTATUS -CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, - IN PVOID Argument2) -{ - PLIST_ENTRY CurrentEntry; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - ExAcquireFastMutex(&CmiCallbackLock); - - for(CurrentEntry = CmiCallbackHead.Flink; - CurrentEntry != &CmiCallbackHead; - CurrentEntry = CurrentEntry->Flink) - { - PREGISTRY_CALLBACK CurrentCallback; - - CurrentCallback = CONTAINING_RECORD(CurrentEntry, REGISTRY_CALLBACK, ListEntry); - if(!CurrentCallback->PendingDelete && - ExAcquireRundownProtection(&CurrentCallback->RundownRef)) - { - /* don't hold locks during the callbacks! */ - ExReleaseFastMutex(&CmiCallbackLock); - - Status = CurrentCallback->Function(CurrentCallback->Context, - (PVOID)Argument1, - Argument2); - - ExAcquireFastMutex(&CmiCallbackLock); - /* don't release the rundown protection before holding the callback lock - so the pointer to the next callback isn't cleared in case this callback - get's deleted */ - ExReleaseRundownProtection(&CurrentCallback->RundownRef); - if(!NT_SUCCESS(Status)) - { - /* one callback returned failure, don't call any more callbacks */ - break; - } - } - } - - ExReleaseFastMutex(&CmiCallbackLock); - - return Status; -} - NTSTATUS STDCALL NtCreateKey(OUT PHANDLE KeyHandle, @@ -2219,22 +2071,6 @@ return Status; } - -/* - * NOTE: - * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and - * KeyObjectAttributes->Name specifies the name of the key to load. - */ -NTSTATUS STDCALL -NtLoadKey (IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN POBJECT_ATTRIBUTES FileObjectAttributes) -{ - return NtLoadKey2 (KeyObjectAttributes, - FileObjectAttributes, - 0); -} - - /* * NOTE: * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and @@ -2357,52 +2193,6 @@ return Status; } - -NTSTATUS STDCALL -NtNotifyChangeKey (IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchSubtree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - -#if 0 -NTSTATUS STDCALL -NtNotifyChangeKey (IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchSubtree, - OUT PVOID Buffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) -{ - return NtNotifyChangeMultipleKeys(KeyHandle, - 0, - NULL, - Event, - ApcRoutine, - ApcContext, - IoStatusBlock, - CompletionFilter, - WatchTree, - Buffer, - Length, - Asynchronous); -} - -#endif - NTSTATUS STDCALL NtQueryMultipleValueKey (IN HANDLE KeyHandle, IN OUT PKEY_VALUE_ENTRY ValueList, @@ -2542,269 +2332,6 @@ return Status; } - -NTSTATUS STDCALL -NtReplaceKey (IN POBJECT_ATTRIBUTES ObjectAttributes, - IN HANDLE Key, - IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - - -NTSTATUS STDCALL -NtRestoreKey (IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG RestoreFlags) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - - -NTSTATUS STDCALL -NtSaveKey (IN HANDLE KeyHandle, - IN HANDLE FileHandle) -{ - PEREGISTRY_HIVE TempHive; - PKEY_OBJECT KeyObject; - NTSTATUS Status; - - PAGED_CODE(); - - DPRINT ("NtSaveKey() called\n"); - -#if 0 - if (!SeSinglePrivilegeCheck (SeBackupPrivilege, ExGetPreviousMode ())) - return STATUS_PRIVILEGE_NOT_HELD; -#endif - - Status = ObReferenceObjectByHandle (KeyHandle, - 0, - CmiKeyType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObReferenceObjectByHandle() failed (Status %lx)\n", Status); - return Status; - } - - /* Acquire hive lock exclucively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - /* Refuse to save a volatile key */ - if (KeyObject->KeyCell->Flags & REG_KEY_VOLATILE_CELL) - { - DPRINT1 ("Cannot save a volatile key\n"); - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - ObDereferenceObject (KeyObject); - return STATUS_ACCESS_DENIED; - } - - Status = CmiCreateTempHive(&TempHive); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiCreateTempHive() failed (Status %lx)\n", Status); - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - ObDereferenceObject (KeyObject); - return(Status); - } - - Status = CmiCopyKey (TempHive, - NULL, - KeyObject->RegistryHive, - KeyObject->KeyCell); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiCopyKey() failed (Status %lx)\n", Status); - CmiRemoveRegistryHive (TempHive); - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - ObDereferenceObject (KeyObject); - return(Status); - } - - Status = CmiSaveTempHive (TempHive, - FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiSaveTempHive() failed (Status %lx)\n", Status); - } - - CmiRemoveRegistryHive (TempHive); - - /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - - ObDereferenceObject (KeyObject); - - DPRINT ("NtSaveKey() done\n"); - - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -NtSaveKeyEx( - IN HANDLE KeyHandle, - IN HANDLE FileHandle, - IN ULONG Flags // REG_STANDARD_FORMAT, etc.. - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -NTSTATUS STDCALL -NtSetInformationKey (IN HANDLE KeyHandle, - IN KEY_SET_INFORMATION_CLASS KeyInformationClass, - IN PVOID KeyInformation, - IN ULONG KeyInformationLength) -{ - PKEY_OBJECT KeyObject; - NTSTATUS Status; - REG_SET_INFORMATION_KEY_INFORMATION SetInformationKeyInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - - PAGED_CODE(); - - /* Verify that the handle is valid and is a registry key */ - Status = ObReferenceObjectByHandle (KeyHandle, - KEY_SET_VALUE, - CmiKeyType, - ExGetPreviousMode(), - (PVOID *)&KeyObject, - NULL); - if (!NT_SUCCESS (Status)) - { - DPRINT ("ObReferenceObjectByHandle() failed with status %x\n", Status); - return Status; - } - - PostOperationInfo.Object = (PVOID)KeyObject; - SetInformationKeyInfo.Object = (PVOID)KeyObject; - SetInformationKeyInfo.KeySetInformationClass = KeyInformationClass; - SetInformationKeyInfo.KeySetInformation = KeyInformation; - SetInformationKeyInfo.KeySetInformationLength = KeyInformationLength; - - Status = CmiCallRegisteredCallbacks(RegNtPreSetInformationKey, &SetInformationKeyInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetInformationKey, &PostOperationInfo); - ObDereferenceObject (KeyObject); - return Status; - } - - if (KeyInformationClass != KeyWriteTimeInformation) - { - Status = STATUS_INVALID_INFO_CLASS; - } - - else if (KeyInformationLength != sizeof (KEY_WRITE_TIME_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - VERIFY_KEY_OBJECT(KeyObject); - - KeyObject->KeyCell->LastWriteTime.QuadPart = - ((PKEY_WRITE_TIME_INFORMATION)KeyInformation)->LastWriteTime.QuadPart; - - HvMarkCellDirty (&KeyObject->RegistryHive->Hive, - KeyObject->KeyCellOffset); - - /* Release hive lock */ - ExReleaseResourceLite(&CmiRegistryLock); - KeLeaveCriticalRegion(); - } - - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostSetInformationKey, &PostOperationInfo); - - ObDereferenceObject (KeyObject); - - if (NT_SUCCESS(Status)) - { - CmiSyncHives (); - } - - DPRINT ("NtSaveKey() done\n"); - - return STATUS_SUCCESS; -} - - -/* - * NOTE: - * KeyObjectAttributes->RootDirectory specifies the handle to the parent key and - * KeyObjectAttributes->Name specifies the name of the key to unload. - */ -NTSTATUS STDCALL -NtUnloadKey (IN POBJECT_ATTRIBUTES KeyObjectAttributes) -{ - PEREGISTRY_HIVE RegistryHive; - NTSTATUS Status; - - PAGED_CODE(); - - DPRINT ("NtUnloadKey() called\n"); - -#if 0 - if (!SeSinglePrivilegeCheck (SeRestorePrivilege, ExGetPreviousMode ())) - return STATUS_PRIVILEGE_NOT_HELD; -#endif - - /* Acquire registry lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - Status = CmiDisconnectHive (KeyObjectAttributes, - &RegistryHive); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CmiDisconnectHive() failed (Status %lx)\n", Status); - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - return Status; - } - - DPRINT ("RegistryHive %p\n", RegistryHive); - -#if 0 - /* Flush hive */ - if (!IsNoFileHive (RegistryHive)) - CmiFlushRegistryHive (RegistryHive); -#endif - - CmiRemoveRegistryHive (RegistryHive); - - /* Release registry lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - DPRINT ("NtUnloadKey() done\n"); - - return STATUS_SUCCESS; -} - - NTSTATUS STDCALL NtInitializeRegistry (IN BOOLEAN SetUpBoot) { @@ -2840,6 +2367,14 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtLoadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN POBJECT_ATTRIBUTES FileObjectAttributes) +{ + return NtLoadKey2(KeyObjectAttributes, FileObjectAttributes, 0); } NTSTATUS @@ -2894,6 +2429,33 @@ NTSTATUS NTAPI +NtNotifyChangeKey(IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchTree, + OUT PVOID Buffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + return NtNotifyChangeMultipleKeys(KeyHandle, + 0, + NULL, + Event, + ApcRoutine, + ApcContext, + IoStatusBlock, + CompletionFilter, + WatchTree, + Buffer, + Length, + Asynchronous); +} + +NTSTATUS +NTAPI NtQueryOpenSubKeys(IN POBJECT_ATTRIBUTES TargetKey, IN ULONG HandleCount) { @@ -2914,9 +2476,67 @@ NTSTATUS NTAPI +NtReplaceKey(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN HANDLE Key, + IN POBJECT_ATTRIBUTES ReplacedObjectAttributes) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtRestoreKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG RestoreFlags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKey(IN HANDLE KeyHandle, + IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSaveKeyEx(IN HANDLE KeyHandle, + IN HANDLE FileHandle, + IN ULONG Flags) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtSaveMergedKeys(IN HANDLE HighPrecedenceKeyHandle, IN HANDLE LowPrecedenceKeyHandle, IN HANDLE FileHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtSetInformationKey(IN HANDLE KeyHandle, + IN KEY_SET_INFORMATION_CLASS KeyInformationClass, + IN PVOID KeyInformation, + IN ULONG KeyInformationLength) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +NtUnloadKey(IN POBJECT_ATTRIBUTES KeyObjectAttributes) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; 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 Thu May 10 13:14:15 2007 @@ -497,13 +497,6 @@ BaseAddress = CmpRosGetHardwareHive(&Length); if (!CmImportHardwareHive(BaseAddress, Length, &HardwareHive)) { - /* Create dummy keys if no hardware hive was found */ - if (!CmImportHardwareHive (NULL, 0, &HardwareHive)) - { - /* Bugcheck */ - KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); - } - /* Don't actually link anything below */ Allocate = TRUE; } @@ -687,108 +680,6 @@ return STATUS_SUCCESS; } - -NTSTATUS -CmiDisconnectHive (IN POBJECT_ATTRIBUTES KeyObjectAttributes, - OUT PEREGISTRY_HIVE *RegistryHive) -{ - PKEY_OBJECT KeyObject; - PEREGISTRY_HIVE Hive; - HANDLE KeyHandle; - NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; - PLIST_ENTRY CurrentEntry; - PKEY_OBJECT CurrentKey; - - DPRINT("CmiDisconnectHive() called\n"); - - *RegistryHive = NULL; - - Status = ObOpenObjectByName (KeyObjectAttributes, - CmiKeyType, - KernelMode, - NULL, - STANDARD_RIGHTS_REQUIRED, - NULL, - &KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObOpenObjectByName() failed (Status %lx)\n", Status); - return Status; - } - - Status = ObReferenceObjectByHandle (KeyHandle, - STANDARD_RIGHTS_REQUIRED, - CmiKeyType, - KernelMode, - (PVOID*)&KeyObject, - NULL); - ZwClose (KeyHandle); - - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObReferenceObjectByName() failed (Status %lx)\n", Status); - return Status; - } - DPRINT ("KeyObject %p Hive %p\n", KeyObject, KeyObject->RegistryHive); - - /* Acquire registry lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - - Hive = KeyObject->RegistryHive; - - CurrentEntry = CmiKeyObjectListHead.Flink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); - if (CurrentKey->RegistryHive == Hive && - 1 == ObGetObjectPointerCount(CurrentKey) && - !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) - { - ObDereferenceObject(CurrentKey); - CurrentEntry = CmiKeyObjectListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; - } - } - - /* FN1 */ - ObDereferenceObject (KeyObject); - - if (ObGetObjectHandleCount (KeyObject) != 0 || - ObGetObjectPointerCount (KeyObject) != 2) - { - DPRINT1 ("Hive is still in use (hc %d, rc %d)\n", ObGetObjectHandleCount (KeyObject), ObGetObjectPointerCount (KeyObject)); - ObDereferenceObject (KeyObject); - - /* Release registry lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - return STATUS_UNSUCCESSFUL; - } - - /* Dereference KeyObject twice to delete it */ - ObDereferenceObject (KeyObject); - ObDereferenceObject (KeyObject); - - *RegistryHive = Hive; - - /* Release registry lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - /* Release reference above */ - ObDereferenceObject (KeyObject); - - DPRINT ("CmiDisconnectHive() done\n"); - - return Status; -} - - static NTSTATUS CmiInitControlSetLink (VOID) { Added: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c (added) +++ trunk/reactos/ntoskrnl/config/cmhook.c Thu May 10 13:14:15 2007 @@ -1,0 +1,173 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmhook.c + * PURPOSE: Configuration Manager - Registry Notifications/Callbacks + * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +LIST_ENTRY CmiCallbackHead; +FAST_MUTEX CmiCallbackLock; + +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; + +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, + IN PVOID Argument2) +{ + PLIST_ENTRY CurrentEntry; + NTSTATUS Status = STATUS_SUCCESS; + PREGISTRY_CALLBACK CurrentCallback; + PAGED_CODE(); + + ExAcquireFastMutex(&CmiCallbackLock); + + for (CurrentEntry = CmiCallbackHead.Flink; + CurrentEntry != &CmiCallbackHead; + CurrentEntry = CurrentEntry->Flink) + { + CurrentCallback = CONTAINING_RECORD(CurrentEntry, REGISTRY_CALLBACK, ListEntry); + if (!CurrentCallback->PendingDelete && + ExAcquireRundownProtection(&CurrentCallback->RundownRef)) + { + /* don't hold locks during the callbacks! */ + ExReleaseFastMutex(&CmiCallbackLock); + + Status = CurrentCallback->Function(CurrentCallback->Context, + (PVOID)Argument1, + Argument2); + + ExAcquireFastMutex(&CmiCallbackLock); + + /* don't release the rundown protection before holding the callback lock + so the pointer to the next callback isn't cleared in case this callback + get's deleted */ + ExReleaseRundownProtection(&CurrentCallback->RundownRef); + if(!NT_SUCCESS(Status)) + { + /* one callback returned failure, don't call any more callbacks */ + break; + } + } + } + + ExReleaseFastMutex(&CmiCallbackLock); + + return Status; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +CmRegisterCallback(IN PEX_CALLBACK_FUNCTION Function, + IN PVOID Context, + IN OUT PLARGE_INTEGER Cookie) +{ + PREGISTRY_CALLBACK Callback; + PAGED_CODE(); + ASSERT(Function && Cookie); + + Callback = ExAllocatePoolWithTag(PagedPool, + sizeof(REGISTRY_CALLBACK), + TAG('C', 'M', 'c', 'b')); + if (Callback != NULL) + { + /* initialize the callback */ + ExInitializeRundownProtection(&Callback->RundownRef); + Callback->Function = Function; + Callback->Context = Context; + Callback->PendingDelete = FALSE; + + /* add it to the callback list and receive a cookie for the callback */ + ExAcquireFastMutex(&CmiCallbackLock); + + /* FIXME - to receive a unique cookie we'll just return the pointer to the + callback object */ + Callback->Cookie.QuadPart = (ULONG_PTR)Callback; + InsertTailList(&CmiCallbackHead, &Callback->ListEntry); + + ExReleaseFastMutex(&CmiCallbackLock); + + *Cookie = Callback->Cookie; + return STATUS_SUCCESS; + } + + return STATUS_INSUFFICIENT_RESOURCES; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +CmUnRegisterCallback(IN LARGE_INTEGER Cookie) +{ + PLIST_ENTRY CurrentEntry; + PREGISTRY_CALLBACK CurrentCallback; + PAGED_CODE(); + + ExAcquireFastMutex(&CmiCallbackLock); + + for (CurrentEntry = CmiCallbackHead.Flink; + CurrentEntry != &CmiCallbackHead; + CurrentEntry = CurrentEntry->Flink) + { + CurrentCallback = CONTAINING_RECORD(CurrentEntry, REGISTRY_CALLBACK, ListEntry); + if (CurrentCallback->Cookie.QuadPart == Cookie.QuadPart) + { + if (!CurrentCallback->PendingDelete) + { + /* found the callback, don't unlink it from the list yet so we don't screw + the calling loop */ + CurrentCallback->PendingDelete = TRUE; + ExReleaseFastMutex(&CmiCallbackLock); + + /* if the callback is currently executing, wait until it finished */ + ExWaitForRundownProtectionRelease(&CurrentCallback->RundownRef); + + /* time to unlink it. It's now safe because every attempt to acquire a + runtime protection on this callback will fail */ + ExAcquireFastMutex(&CmiCallbackLock); + RemoveEntryList(&CurrentCallback->ListEntry); + ExReleaseFastMutex(&CmiCallbackLock); + + /* free the callback */ + ExFreePool(CurrentCallback); + return STATUS_SUCCESS; + } + else + { + /* pending delete, pretend like it already is deleted */ + ExReleaseFastMutex(&CmiCallbackLock); + return STATUS_UNSUCCESSFUL; + } + } + } + + ExReleaseFastMutex(&CmiCallbackLock); + + return STATUS_UNSUCCESSFUL; +} 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 Thu May 10 13:14:15 2007 @@ -88,6 +88,7 @@ <file>cmcontrl.c</file> <file>cmdata.c</file> <file>cmindex.c</file> + <file>cmhook.c</file> <file>cmmapvw.c</file> <file>cmname.c</file> <file>cmparse.c</file>

17 years, 7 months

[ion] 26670: - Move CmpSetSystemValues to cmsysini.c - Remove all NTLDR-style profile code from cmsysini.c, since ReactOS doesn't support it, and there's no use lugging that code around. - Rename CmpCreateCurrentControlSetLink to CmpCreateControlSet. - Get rid of CmiCreateCuttenControlSetLink and use the new version instead, which also supports setting the right current Hardware Profile ID.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 05:48:54 2007 New Revision: 26670 URL: http://svn.reactos.org/svn/reactos?rev=26670&view=rev Log: - Move CmpSetSystemValues to cmsysini.c - Remove all NTLDR-style profile code from cmsysini.c, since ReactOS doesn't support it, and there's no use lugging that code around. - Rename CmpCreateCurrentControlSetLink to CmpCreateControlSet. - Get rid of CmiCreateCuttenControlSetLink and use the new version instead, which also supports setting the right current Hardware Profile ID. Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/config/cmsysini.c 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 Thu May 10 05:48:54 2007 @@ -66,8 +66,13 @@ ULONG ChunkSize, OUT PEREGISTRY_HIVE *RegistryHive); -static NTSTATUS -CmiCreateCurrentControlSetLink(VOID); +NTSTATUS +NTAPI +CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock); + +NTSTATUS +NTAPI +CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock); static VOID STDCALL CmiHiveSyncDpcRoutine(PKDPC Dpc, @@ -78,8 +83,8 @@ extern LIST_ENTRY CmiCallbackHead; extern FAST_MUTEX CmiCallbackLock; -UNICODE_STRING CmpSystemStartOptions; -UNICODE_STRING CmpLoadOptions; +extern UNICODE_STRING CmpSystemStartOptions; +extern UNICODE_STRING CmpLoadOptions; /* FUNCTIONS ****************************************************************/ VOID STDCALL @@ -206,63 +211,6 @@ return CmiConnectHive(&ObjectAttributes, RegistryHive); } -NTSTATUS -NTAPI -CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName, ValueName; - HANDLE KeyHandle; - NTSTATUS Status; - ASSERT(LoaderBlock != NULL); - if (ExpInTextModeSetup) return STATUS_SUCCESS; - - /* Setup attributes for loader options */ - RtlInitUnicodeString(&KeyName, - L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\" - L"Control"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Key opened, now write to the key */ - RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); - Status = NtSetValueKey(KeyHandle, - &KeyName, - 0, - REG_SZ, - CmpSystemStartOptions.Buffer, - CmpSystemStartOptions.Length); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* Free the options now */ - ExFreePool(CmpSystemStartOptions.Buffer); - - /* Setup value name for system boot device */ - RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); - RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->NtBootPathName); - Status = NtSetValueKey(KeyHandle, - &KeyName, - 0, - REG_SZ, - ValueName.Buffer, - ValueName.Length); - -Quickie: - /* Free the buffers */ - RtlFreeUnicodeString(&ValueName); - - /* Close the key and return */ - NtClose(KeyHandle); - - /* Return the status */ - return Status; -} - BOOLEAN NTAPI CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -538,7 +486,7 @@ } /* Create the 'CurrentControlSet' link. */ - Status = CmiCreateCurrentControlSetLink(); + Status = CmpCreateControlSet(KeLoaderBlock); if (!NT_SUCCESS(Status)) { /* Bugcheck */ @@ -582,97 +530,6 @@ /* If we got here, all went well */ return TRUE; -} - -static NTSTATUS -CmiCreateCurrentControlSetLink(VOID) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[5]; - WCHAR TargetNameBuffer[80]; - ULONG TargetNameLength; - UNICODE_STRING LinkName = RTL_CONSTANT_STRING( - L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); - UNICODE_STRING LinkValue = RTL_CONSTANT_STRING(L"SymbolicLinkValue"); - ULONG CurrentSet; - ULONG DefaultSet; - ULONG Failed; - ULONG LastKnownGood; - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE KeyHandle; - if (ExpInTextModeSetup) return STATUS_SUCCESS; - - DPRINT("CmiCreateCurrentControlSetLink() called\n"); - - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - - QueryTable[0].Name = L"Current"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &CurrentSet; - - QueryTable[1].Name = L"Default"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &DefaultSet; - - QueryTable[2].Name = L"Failed"; - QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[2].EntryContext = &Failed; - - QueryTable[3].Name = L"LastKnownGood"; - QueryTable[3].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[3].EntryContext = &LastKnownGood; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\SYSTEM\\Select", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("Current %ld Default %ld\n", CurrentSet, DefaultSet); - - swprintf(TargetNameBuffer, - L"\\Registry\\Machine\\SYSTEM\\ControlSet%03lu", - CurrentSet); - TargetNameLength = wcslen(TargetNameBuffer) * sizeof(WCHAR); - - DPRINT("Link target '%S'\n", TargetNameBuffer); - - InitializeObjectAttributes(&ObjectAttributes, - &LinkName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_OPENLINK, - NULL, - NULL); - Status = ZwCreateKey(&KeyHandle, - KEY_ALL_ACCESS | KEY_CREATE_LINK, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateKey() failed (Status %lx)\n", Status); - return(Status); - } - - Status = ZwSetValueKey(KeyHandle, - &LinkValue, - 0, - REG_LINK, - (PVOID)TargetNameBuffer, - TargetNameLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status); - } - - ZwClose(KeyHandle); - - return Status; } NTSTATUS 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 Thu May 10 05:48:54 2007 @@ -13,7 +13,6 @@ #define NDEBUG #include "debug.h" -#if 0 /* GLOBALS *******************************************************************/ UNICODE_STRING CmSymbolicLinkValueName = @@ -21,6 +20,7 @@ UNICODE_STRING CmpSystemStartOptions; UNICODE_STRING CmpLoadOptions; +extern BOOLEAN ExpInTextModeSetup; /* FUNCTIONS *****************************************************************/ @@ -33,6 +33,7 @@ HANDLE KeyHandle; NTSTATUS Status; ASSERT(LoaderBlock != NULL); + if (ExpInTextModeSetup) return STATUS_SUCCESS; /* Setup attributes for loader options */ RtlInitUnicodeString(&KeyName, @@ -82,244 +83,9 @@ NTSTATUS NTAPI -CmpHwProfileDefaultSelect(IN PVOID ProfileList, - OUT PULONG ProfileIndexToUse, - IN PVOID Context) +CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - /* Clear the index and return success */ - *ProfileIndexToUse = 0; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpAddDockingInfo(IN HANDLE Key, - IN PPROFILE_PARAMETER_BLOCK ProfileBlock) -{ - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING KeyName; - ULONG Value; - PAGED_CODE (); - - /* Get the Value from the profile block, create a Name for it and set it */ - Value = ProfileBlock->DockingState; - RtlInitUnicodeString(&KeyName, L"DockingState"); - Status = NtSetValueKey(Key, - &KeyName, - 0, - REG_DWORD, - &Value, - sizeof(Value)); - if (!NT_SUCCESS(Status)) return Status; - - /* Get the Value from the profile block, create a Name for it and set it */ - Value = ProfileBlock->Capabilities; - RtlInitUnicodeString(&KeyName, L"Capabilities"); - Status = NtSetValueKey(Key, - &KeyName, - 0, - REG_DWORD, - &Value, - sizeof(Value)); - if (!NT_SUCCESS(Status)) return Status; - - /* Get the Value from the profile block, create a Name for it and set it */ - Value = ProfileBlock->DockID; - RtlInitUnicodeString(&KeyName, L"DockID"); - Status = NtSetValueKey(Key, - &KeyName, - 0, - REG_DWORD, - &Value, - sizeof(Value)); - if (!NT_SUCCESS(Status)) return Status; - - /* Get the Value from the profile block, create a Name for it and set it */ - Value = ProfileBlock->SerialNumber; - RtlInitUnicodeString(&KeyName, L"SerialNumber"); - Status = NtSetValueKey(Key, - &KeyName, - 0, - REG_DWORD, - &Value, - sizeof(Value)); - - /* Return Status */ - return Status; -} - -NTSTATUS -NTAPI -CmpAddAliasEntry(IN HANDLE IDConfigDB, - IN PPROFILE_PARAMETER_BLOCK ProfileBlock, - IN ULONG ProfileNumber) -{ - UNICODE_STRING KeyName; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status = STATUS_SUCCESS; - CHAR Buffer[128]; - WCHAR UnicodeBuffer[128]; - ANSI_STRING TempString; - HANDLE AliasHandle = NULL, AliasIdHandle = NULL; - ULONG Value; - ULONG Disposition; - ULONG AliasId = 0; - PAGED_CODE (); - - /* Open the alias key */ - RtlInitUnicodeString(&KeyName, L"Alias"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - IDConfigDB, - NULL); - Status = NtOpenKey(&AliasHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - - /* Check if we failed to open it */ - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - /* Create it instead */ - Status = NtCreateKey(&AliasHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - } - - /* Check if we failed */ - if (!NT_SUCCESS (Status)) - { - /* Cleanup and exit */ - AliasHandle = NULL; - goto Exit; - } - - /* Loop every alias ID */ - while (AliasId++ < 200) - { - /* Build the KeyName */ - sprintf(Buffer, "%04ld", AliasId); - RtlInitAnsiString(&TempString, Buffer); - - /* Convert it to Unicode */ - KeyName.MaximumLength = sizeof(UnicodeBuffer); - KeyName.Buffer = UnicodeBuffer; - Status = RtlAnsiStringToUnicodeString(&KeyName, - &TempString, - FALSE); - ASSERT (STATUS_SUCCESS == Status); - - /* Open the key */ - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - AliasHandle, - NULL); - Status = NtOpenKey(&AliasIdHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes); - if (NT_SUCCESS (Status)) - { - /* We opened it, close and keep looping */ - NtClose(AliasIdHandle); - } - else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - /* We couldn't find it, change Status and break out */ - Status = STATUS_SUCCESS; - break; - } - else - { - /* Any other error, break out */ - break; - } - } - - /* Check if we failed in the alias loop */ - if (!NT_SUCCESS(Status)) - { - /* Cleanup and exit */ - AliasIdHandle = 0; - goto Exit; - } - - /* Otherwise, create the alias key */ - Status = NtCreateKey(&AliasIdHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - if (!NT_SUCCESS(Status)) - { - /* Cleanup and exit */ - AliasIdHandle = 0; - goto Exit; - } - - /* Add docking information */ - CmpAddDockingInfo(AliasIdHandle, ProfileBlock); - - /* Set the profile number */ - Value = ProfileNumber; - RtlInitUnicodeString(&KeyName, L"ProfileNumber"); - Status = NtSetValueKey(AliasIdHandle, - &KeyName, - 0, - REG_DWORD, - &Value, - sizeof(Value)); - -Exit: - /* Close every opened key */ - if (AliasHandle) NtClose(AliasHandle); - if (AliasIdHandle) NtClose(AliasIdHandle); - - /* Return Status */ - return Status; -} - -NTSTATUS -NTAPI -CmSetAcpiHwProfile(IN PPROFILE_ACPI_DOCKING_STATE NewDockState, - IN PVOID Select, - IN PVOID Context, - OUT PHANDLE NewProfile, - OUT PBOOLEAN ProfileChanged) -{ - /* FIXME: TODO */ - *ProfileChanged = FALSE; - *NewProfile = NULL; - ASSERT(FALSE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpCloneHwProfile(IN HANDLE ConfigHandle, - IN HANDLE Parent, - IN HANDLE OldProfile, - IN ULONG OldProfileNumber, - IN USHORT DockingState, - OUT PHANDLE NewProfile, - OUT PULONG NewProfileNumber) -{ - /* FIXME: TODO */ - *NewProfileNumber = FALSE; - *NewProfile = NULL; - ASSERT(FALSE); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpCreateCurrentControlSetLink(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - UNICODE_STRING ConfigName = RTL_CONSTANT_STRING(L"Control\\ConfigHandle"); + UNICODE_STRING ConfigName = RTL_CONSTANT_STRING(L"Control\\IDConfigDB"); UNICODE_STRING SelectName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\Select"); UNICODE_STRING KeyName; @@ -329,16 +95,14 @@ CHAR Buffer[128]; WCHAR UnicodeBuffer[128]; HANDLE SelectHandle, KeyHandle, ConfigHandle = NULL, ProfileHandle = NULL; - HANDLE ParentHandle = NULL, AcpiHandle; + HANDLE ParentHandle = NULL; ULONG ControlSet, HwProfile; ANSI_STRING TempString; NTSTATUS Status; ULONG ResultLength, Disposition; - BOOLEAN AcpiProfile = FALSE; PLOADER_PARAMETER_EXTENSION LoaderExtension; - PROFILE_ACPI_DOCKING_STATE AcpiDockState; - BOOLEAN Active; PAGED_CODE(); + if (ExpInTextModeSetup) return STATUS_SUCCESS; /* Open the select key */ InitializeObjectAttributes(&ObjectAttributes, @@ -347,7 +111,7 @@ NULL, NULL); Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status))return(Status); + if (!NT_SUCCESS(Status)) return(Status); /* Open the current value */ RtlInitUnicodeString(&KeyName, L"Current"); @@ -449,9 +213,7 @@ NULL, NULL); Status = NtOpenKey(&ParentHandle, KEY_READ, &ObjectAttributes); - - /* Check if there is no hardware profile key */ - if (!NT_SUCCESS (Status)) + if (!NT_SUCCESS(Status)) { /* Exit and clean up */ ParentHandle = 0; @@ -459,7 +221,7 @@ } /* Build the profile name */ - sprintf(Buffer, "%04ld",HwProfile); + sprintf(Buffer, "%04ld", HwProfile); RtlInitAnsiString(&TempString, Buffer); /* Convert it to Unicode */ @@ -479,8 +241,6 @@ Status = NtOpenKey(&ProfileHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); - - /* Check if there's no such key */ if (!NT_SUCCESS (Status)) { /* Cleanup and exit */ @@ -492,80 +252,7 @@ LoaderExtension = LoaderBlock->Extension; if (LoaderExtension) { - /* Check the hardware profile status */ - switch (LoaderExtension->Profile.Status) - { - /* Cloned status */ - case 3: - - /* Clone it */ - Status = CmpCloneHwProfile(ConfigHandle, - ParentHandle, - ProfileHandle, - HwProfile, - LoaderExtension-> - Profile.DockingState, - &ProfileHandle, - &HwProfile); - if (!NT_SUCCESS(Status)) - { - /* Cloning failed, cleanup and exit */ - ProfileHandle = 0; - goto Cleanup; - } - - /* Set the current config key */ - RtlInitUnicodeString(&KeyName, L"CurrentConfig"); - Status = NtSetValueKey(ConfigHandle, - &KeyName, - 0, - REG_DWORD, - &HwProfile, - sizeof (HwProfile)); - if (!NT_SUCCESS (Status)) goto Cleanup; - - /* Alias status */ - case 1: - - /* Create an alias entry */ - Status = CmpAddAliasEntry(ConfigHandle, - &LoaderExtension->Profile, - HwProfile); - - /* Docking status */ - case 2: - - /* Create the current dock info key */ - RtlInitUnicodeString(&KeyName, - L"CurrentDockInfo"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ConfigHandle, - NULL); - Status = NtCreateKey(&KeyHandle, - KEY_READ | KEY_WRITE, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - &Disposition); - ASSERT (STATUS_SUCCESS == Status); - - /* Add the docking information */ - Status = CmpAddDockingInfo(KeyHandle, - &LoaderExtension->Profile); - break; - - /* Other cases */ - case 0: - case 0xC001: - break; - - /* Unknown status */ - default: - ASSERT(FALSE); - } + ASSERTMSG("ReactOS doesn't support NTLDR Profiles yet!\n", FALSE); } /* Create the current hardware profile key */ @@ -602,7 +289,7 @@ Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); - ASSERT (STATUS_SUCCESS == Status); + ASSERT(STATUS_SUCCESS == Status); /* Set it */ Status = NtSetValueKey(KeyHandle, @@ -614,26 +301,6 @@ NtClose(KeyHandle); } - /* Check if we have to set the ACPI Profile */ - if (AcpiProfile) - { - /* Setup the docking state to undocked */ - AcpiDockState.DockingState = 1; - AcpiDockState.SerialLength = 2; - AcpiDockState.SerialNumber[0] = L'\0'; - - /* Set the ACPI profile */ - Status = CmSetAcpiHwProfile(&AcpiDockState, - CmpHwProfileDefaultSelect, - NULL, - &AcpiHandle, - &Active); - ASSERT(NT_SUCCESS(Status)); - - /* Close the key */ - NtClose(AcpiHandle); - } - /* Close every opened handle */ Cleanup: if (ConfigHandle) NtClose(ConfigHandle); @@ -643,4 +310,3 @@ /* Return success */ return STATUS_SUCCESS; } -#endif

17 years, 7 months

[ion] 26669: - Refactor the registry initialization code to be somewhat closer to the Cm rewrite branch. - No actual code/implementation changes per-se, simply moved code into new routines, deleted old routines, renamed some routines and added more error-checking. - Also performed registry initialization in an order more analogous to Windows. - Added cmsysini.c from the branch, but it's not used at the moment.

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 04:02:04 2007 New Revision: 26669 URL: http://svn.reactos.org/svn/reactos?rev=26669&view=rev Log: - Refactor the registry initialization code to be somewhat closer to the Cm rewrite branch. - No actual code/implementation changes per-se, simply moved code into new routines, deleted old routines, renamed some routines and added more error-checking. - Also performed registry initialization in an order more analogous to Windows. - Added cmsysini.c from the branch, but it's not used at the moment. Added: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c Thu May 10 04:02:04 2007 @@ -22,8 +22,6 @@ /* GLOBALS ******************************************************************/ -static BOOLEAN CmiHardwareHiveImported = FALSE; - /* FUNCTIONS ****************************************************************/ static BOOLEAN @@ -85,75 +83,56 @@ } -BOOLEAN INIT_FUNCTION +BOOLEAN +INIT_FUNCTION CmImportSystemHive(PCHAR ChunkBase, - ULONG ChunkSize) + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive) +{ + *RegistryHive = NULL; + + DPRINT ("CmImportSystemHive() called\n"); + + if (strncmp (ChunkBase, "regf", 4)) + { + DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase); + return FALSE; + } + + DPRINT ("Found '%.*s' magic\n", 4, ChunkBase); + + /* Import the binary system hive (non-volatile, offset-based, permanent) */ + if (!CmImportBinaryHive (ChunkBase, ChunkSize, 0, RegistryHive)) + { + DPRINT1 ("CmiImportBinaryHive() failed\n"); + return FALSE; + } + + /* Set the hive filename */ + RtlCreateUnicodeString (&(*RegistryHive)->HiveFileName, + SYSTEM_REG_FILE); + + /* Set the log filename */ + RtlCreateUnicodeString (&(*RegistryHive)->LogFileName, + SYSTEM_LOG_FILE); + + return TRUE; +} + +BOOLEAN +INIT_FUNCTION +CmImportHardwareHive(PCHAR ChunkBase, + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive) { OBJECT_ATTRIBUTES ObjectAttributes; - PEREGISTRY_HIVE RegistryHive; - UNICODE_STRING KeyName; - NTSTATUS Status; - - DPRINT ("CmImportSystemHive() called\n"); - - if (strncmp (ChunkBase, "regf", 4)) - { - DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase); - return FALSE; - } - - DPRINT ("Found '%.*s' magic\n", 4, ChunkBase); - - /* Import the binary system hive (non-volatile, offset-based, permanent) */ - if (!CmImportBinaryHive (ChunkBase, ChunkSize, 0, &RegistryHive)) - { - DPRINT1 ("CmiImportBinaryHive() failed\n"); - return FALSE; - } - - /* Attach it to the machine key */ - RtlInitUnicodeString (&KeyName, - REG_SYSTEM_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = CmiConnectHive (&ObjectAttributes, - RegistryHive); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiConnectHive(%wZ) failed (Status %lx)\n", &KeyName, Status); - return FALSE; - } - - /* Set the hive filename */ - RtlCreateUnicodeString (&RegistryHive->HiveFileName, - SYSTEM_REG_FILE); - - /* Set the log filename */ - RtlCreateUnicodeString (&RegistryHive->LogFileName, - SYSTEM_LOG_FILE); - - return TRUE; -} - - -BOOLEAN INIT_FUNCTION -CmImportHardwareHive(PCHAR ChunkBase, - ULONG ChunkSize) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - PEREGISTRY_HIVE RegistryHive; UNICODE_STRING KeyName; HANDLE HardwareKey; ULONG Disposition; NTSTATUS Status; + *RegistryHive = NULL; DPRINT ("CmImportHardwareHive() called\n"); - - if (CmiHardwareHiveImported == TRUE) - return TRUE; if (ChunkBase == NULL && ChunkSize == 0) @@ -260,38 +239,19 @@ DPRINT ("ChunkBase %lx ChunkSize %lu\n", ChunkBase, ChunkSize); /* Import the binary system hive (volatile, offset-based, permanent) */ - if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_NO_FILE, &RegistryHive)) + if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_NO_FILE, RegistryHive)) { DPRINT1 ("CmiImportBinaryHive() failed\n"); return FALSE; } - /* Attach it to the machine key */ - RtlInitUnicodeString (&KeyName, - REG_HARDWARE_KEY_NAME); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = CmiConnectHive (&ObjectAttributes, - RegistryHive); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiConnectHive(%wZ) failed (Status %lx)\n", &KeyName, Status); -// CmiRemoveRegistryHive(RegistryHive); - return FALSE; - } - /* Set the hive filename */ - RtlInitUnicodeString (&RegistryHive->HiveFileName, + RtlInitUnicodeString (&(*RegistryHive)->HiveFileName, NULL); /* Set the log filename */ - RtlInitUnicodeString (&RegistryHive->LogFileName, + RtlInitUnicodeString (&(*RegistryHive)->LogFileName, NULL); - - CmiHardwareHiveImported = TRUE; return TRUE; } 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 Thu May 10 04:02:04 2007 @@ -54,6 +54,18 @@ CmiCheckKey(BOOLEAN Verbose, HANDLE Key); +BOOLEAN +INIT_FUNCTION +CmImportSystemHive(PCHAR ChunkBase, + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive); + +BOOLEAN +INIT_FUNCTION +CmImportHardwareHive(PCHAR ChunkBase, + ULONG ChunkSize, + OUT PEREGISTRY_HIVE *RegistryHive); + static NTSTATUS CmiCreateCurrentControlSetLink(VOID); @@ -66,6 +78,8 @@ extern LIST_ENTRY CmiCallbackHead; extern FAST_MUTEX CmiCallbackLock; +UNICODE_STRING CmpSystemStartOptions; +UNICODE_STRING CmpLoadOptions; /* FUNCTIONS ****************************************************************/ VOID STDCALL @@ -129,98 +143,12 @@ } } -VOID INIT_FUNCTION -CmInit2(PCHAR CommandLine) -{ - ULONG PiceStart = 4; - BOOLEAN MiniNT = FALSE; - NTSTATUS Status; - UNICODE_STRING TempString; - - /* Create the 'CurrentControlSet' link. */ - Status = CmiCreateCurrentControlSetLink(); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - - /* - * Write the system boot device to registry. - */ - RtlCreateUnicodeStringFromAsciiz(&TempString, KeLoaderBlock->ArcBootDeviceName); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", - L"SystemBootDevice", - REG_SZ, - TempString.Buffer, - TempString.MaximumLength); - RtlFreeUnicodeString(&TempString); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* - * Parse the system start options. - */ - if (strstr(KeLoaderBlock->LoadOptions, "DEBUGPORT=PICE") != NULL) - PiceStart = 1; - MiniNT = strstr(KeLoaderBlock->LoadOptions, "MININT") != NULL; - - /* - * Write the system start options to registry. - */ - RtlCreateUnicodeStringFromAsciiz(&TempString, KeLoaderBlock->LoadOptions); - Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", - L"SystemStartOptions", - REG_SZ, - TempString.Buffer, - TempString.MaximumLength); - RtlFreeUnicodeString(&TempString); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* - * Create a CurrentControlSet\Control\MiniNT key that is used - * to detect WinPE/MiniNT systems. - */ - if (MiniNT) - { - Status = RtlCreateRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT"); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); - } - - /* Set PICE 'Start' value to 1, if PICE debugging is enabled */ - Status = RtlWriteRegistryValue( - RTL_REGISTRY_SERVICES, - L"\\Pice", - L"Start", - REG_DWORD, - &PiceStart, - sizeof(ULONG)); - if (!NT_SUCCESS(Status)) - KEBUGCHECK(CONFIG_INITIALIZATION_FAILED); -} - - -VOID -INIT_FUNCTION -STDCALL -CmInitHives(BOOLEAN SetupBoot) -{ - PCHAR BaseAddress; +PVOID +NTAPI +CmpRosGetHardwareHive(OUT PULONG Length) +{ PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock = NULL; - - /* Load Registry Hives. This one can be missing. */ - BaseAddress = KeLoaderBlock->RegistryBase; - if (BaseAddress) - { - CmImportSystemHive(BaseAddress, - KeLoaderBlock->RegistryLength); - } /* Loop the memory descriptors */ ListHead = &KeLoaderBlock->MemoryDescriptorListHead; @@ -236,7 +164,8 @@ if (MdBlock->MemoryType == LoaderRegistryData) { /* Check if it's not the SYSTEM hive that we already initialized */ - if ((MdBlock->BasePage) != ((ULONG_PTR)BaseAddress >> PAGE_SHIFT)) + if ((MdBlock->BasePage) != + ((ULONG_PTR)KeLoaderBlock->RegistryBase >> PAGE_SHIFT)) { /* Hardware hive break out */ break; @@ -249,16 +178,239 @@ /* We need a hardware hive */ ASSERT(MdBlock); - - BaseAddress = (PCHAR)(MdBlock->BasePage << PAGE_SHIFT); - CmImportHardwareHive(BaseAddress, - MdBlock->PageCount << PAGE_SHIFT); - - /* Create dummy keys if no hardware hive was found */ - CmImportHardwareHive (NULL, 0); - - /* Initialize volatile registry settings */ - if (SetupBoot == FALSE) CmInit2(KeLoaderBlock->LoadOptions); + *Length = MdBlock->PageCount << PAGE_SHIFT; + return (PVOID)(MdBlock->BasePage << PAGE_SHIFT); +} + +NTSTATUS +NTAPI +CmpLinkHiveToMaster(IN PUNICODE_STRING LinkName, + IN HANDLE RootDirectory, + IN PEREGISTRY_HIVE RegistryHive, + IN BOOLEAN Allocate, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Don't do anything if we don't actually have a hive */ + if (Allocate) return STATUS_SUCCESS; + + /* Setup the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + LinkName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + RootDirectory, + SecurityDescriptor); + + /* Connect the hive */ + return CmiConnectHive(&ObjectAttributes, RegistryHive); +} + +NTSTATUS +NTAPI +CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName, ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + ASSERT(LoaderBlock != NULL); + if (ExpInTextModeSetup) return STATUS_SUCCESS; + + /* Setup attributes for loader options */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\" + L"Control"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Key opened, now write to the key */ + RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); + Status = NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + CmpSystemStartOptions.Buffer, + CmpSystemStartOptions.Length); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Free the options now */ + ExFreePool(CmpSystemStartOptions.Buffer); + + /* Setup value name for system boot device */ + RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); + RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->NtBootPathName); + Status = NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + ValueName.Buffer, + ValueName.Length); + +Quickie: + /* Free the buffers */ + RtlFreeUnicodeString(&ValueName); + + /* Close the key and return */ + NtClose(KeyHandle); + + /* Return the status */ + return Status; +} + +BOOLEAN +NTAPI +CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PVOID HiveBase; + ANSI_STRING LoadString; + PVOID Buffer; + ULONG Length; + NTSTATUS Status; + BOOLEAN Allocate; + UNICODE_STRING KeyName; + PEREGISTRY_HIVE SystemHive; + PAGED_CODE(); + + /* Setup the ansi string */ + RtlInitAnsiString(&LoadString, LoaderBlock->LoadOptions); + + /* Allocate the unicode buffer */ + Length = LoadString.Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); + Buffer = ExAllocatePoolWithTag(PagedPool, Length, 0); + if (!Buffer) + { + /* Fail */ + KEBUGCHECKEX(BAD_SYSTEM_CONFIG_INFO, 3, 1, (ULONG_PTR)LoaderBlock, 0); + } + + /* Setup the unicode string */ + RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, Length); + + /* Add the load options and null-terminate */ + RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); + CmpLoadOptions.Buffer[LoadString.Length] = UNICODE_NULL; + CmpLoadOptions.Length += sizeof(WCHAR); + + /* Get the System Hive base address */ + HiveBase = LoaderBlock->RegistryBase; + if (HiveBase) + { + /* Import it */ + Status = CmImportSystemHive(HiveBase, + LoaderBlock->RegistryLength, + &SystemHive); + if (!NT_SUCCESS(Status)) return FALSE; + + /* We imported, no need to create a new hive */ + Allocate = FALSE; + } + else + { + /* FIXME: Create an empty hive */ + Allocate = TRUE; + } + + /* Attach it to the system key */ + RtlInitUnicodeString(&KeyName, REG_SYSTEM_KEY_NAME); + Status = CmpLinkHiveToMaster(&KeyName, NULL, SystemHive, Allocate, NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Success! */ + return TRUE; +} + +NTSTATUS +NTAPI +CmpCreateObjectTypes(VOID) +{ + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + PAGED_CODE(); + + /* Initialize the Key object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Key"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(KEY_OBJECT); + ObjectTypeInitializer.GenericMapping = CmiKeyMapping; + ObjectTypeInitializer.PoolType = PagedPool; + ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; + ObjectTypeInitializer.ParseProcedure = CmiObjectParse; + ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; + ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; + + /* Create it */ + return ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmiKeyType); +} + +BOOLEAN +NTAPI +CmpCreateRegistryRoot(VOID) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + PKEY_OBJECT RootKey; + HANDLE RootKeyHandle; + NTSTATUS Status; + + /* Create '\Registry' key. */ + RtlInitUnicodeString(&KeyName, REG_ROOT_KEY_NAME); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ObCreateObject(KernelMode, + CmiKeyType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(KEY_OBJECT), + 0, + 0, + (PVOID*)&RootKey); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Setup the root key */ + RootKey->RegistryHive = CmiVolatileHive; + RootKey->KeyCellOffset = CmiVolatileHive->Hive.HiveHeader->RootCell; + RootKey->KeyCell = HvGetCell(&CmiVolatileHive->Hive, RootKey->KeyCellOffset); + RootKey->ParentKey = RootKey; + RootKey->Flags = 0; + RootKey->SubKeyCounts = 0; + RootKey->SubKeys = NULL; + RootKey->SizeOfSubKeys = 0; + InsertTailList(&CmiKeyObjectListHead, &RootKey->ListEntry); + Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); + + /* Insert the key into the namespace */ + Status = ObInsertObject(RootKey, + NULL, + KEY_ALL_ACCESS, + 0, + NULL, + &RootKeyHandle); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Reference the key again so that we never lose it */ + Status = ObReferenceObjectByHandle(RootKeyHandle, + KEY_READ, + NULL, + KernelMode, + (PVOID*)&RootKey, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Completely sucessful */ + return TRUE; } BOOLEAN @@ -266,158 +418,171 @@ NTAPI CmInitSystem1(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - PKEY_OBJECT RootKey; -#if 0 - PCM_KEY_SECURITY RootSecurityCell; -#endif - HANDLE RootKeyHandle; - HANDLE KeyHandle; - NTSTATUS Status; - LARGE_INTEGER DueTime; - HANDLE ThreadHandle; - CLIENT_ID ThreadId; - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - UNICODE_STRING Name; - - DPRINT("Creating Registry Object Type\n"); - - /* Initialize the Key object type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"Key"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(KEY_OBJECT); - ObjectTypeInitializer.GenericMapping = CmiKeyMapping; - ObjectTypeInitializer.PoolType = PagedPool; - ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; - ObjectTypeInitializer.UseDefaultObject = TRUE; - ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; - ObjectTypeInitializer.ParseProcedure = CmiObjectParse; - ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; - ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; - - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmiKeyType); - - /* Initialize the hive list */ - InitializeListHead(&CmiHiveListHead); - - /* Initialize registry lock */ - ExInitializeResourceLite(&CmiRegistryLock); - - /* Initialize the key object list */ - InitializeListHead(&CmiKeyObjectListHead); - InitializeListHead(&CmiConnectedHiveList); - - /* Initialize the worker timer */ - KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); - - /* Initialize the worker thread */ - Status = PsCreateSystemThread(&ThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &ThreadId, - CmiWorkerThread, - NULL); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Start the timer */ - DueTime.QuadPart = -1; - KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ - - /* Build volatile registry store */ - Status = CmiCreateVolatileHive (&CmiVolatileHive); - ASSERT(NT_SUCCESS(Status)); - - InitializeListHead(&CmiCallbackHead); - ExInitializeFastMutex(&CmiCallbackLock); - - /* Create '\Registry' key. */ - RtlInitUnicodeString(&KeyName, REG_ROOT_KEY_NAME); - InitializeObjectAttributes(&ObjectAttributes, &KeyName, 0, NULL, NULL); - Status = ObCreateObject(KernelMode, - CmiKeyType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID *) &RootKey); - ASSERT(NT_SUCCESS(Status)); - Status = ObInsertObject(RootKey, - NULL, - KEY_ALL_ACCESS, - 0, - NULL, - &RootKeyHandle); - ASSERT(NT_SUCCESS(Status)); - RootKey->RegistryHive = CmiVolatileHive; - RootKey->KeyCellOffset = CmiVolatileHive->Hive.HiveHeader->RootCell; - RootKey->KeyCell = HvGetCell (&CmiVolatileHive->Hive, RootKey->KeyCellOffset); - RootKey->ParentKey = RootKey; - RootKey->Flags = 0; - RootKey->SubKeyCounts = 0; - RootKey->SubKeys = NULL; - RootKey->SizeOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &RootKey->ListEntry); - Status = RtlpCreateUnicodeString(&RootKey->Name, L"Registry", NonPagedPool); - ASSERT(NT_SUCCESS(Status)); - -#if 0 - Status = CmiAllocateCell(CmiVolatileHive, - 0x10, //LONG CellSize, - (PVOID *)&RootSecurityCell, - &RootKey->KeyCell->SecurityKeyOffset); - ASSERT(NT_SUCCESS(Status)); - - /* Copy the security descriptor */ - - CmiVolatileHive->RootSecurityCell = RootSecurityCell; -#endif - - - /* Create '\Registry\Machine' key. */ - RtlInitUnicodeString(&KeyName, - L"Machine"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - 0, - RootKeyHandle, - NULL); - Status = ZwCreateKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - NULL); - ASSERT(NT_SUCCESS(Status)); - - /* Create '\Registry\User' key. */ - RtlInitUnicodeString(&KeyName, - L"User"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - 0, - RootKeyHandle, - NULL); - Status = ZwCreateKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_VOLATILE, - NULL); - ASSERT(NT_SUCCESS(Status)); - - /* Import and Load Registry Hives */ - CmInitHives(ExpInTextModeSetup); - return TRUE; -} - - + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE KeyHandle; + NTSTATUS Status; + LARGE_INTEGER DueTime; + HANDLE ThreadHandle; + CLIENT_ID ThreadId; + PEREGISTRY_HIVE HardwareHive; + BOOLEAN Allocate = FALSE; + PVOID BaseAddress; + ULONG Length; + PAGED_CODE(); + + /* Initialize the hive list */ + InitializeListHead(&CmiHiveListHead); + + /* Initialize registry lock */ + ExInitializeResourceLite(&CmiRegistryLock); + + /* Initialize the key object list */ + InitializeListHead(&CmiKeyObjectListHead); + InitializeListHead(&CmiConnectedHiveList); + + /* Initialize the worker timer */ + KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); + + /* Initialize the worker thread */ + Status = PsCreateSystemThread(&ThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &ThreadId, + CmiWorkerThread, + NULL); + if (!NT_SUCCESS(Status)) return FALSE; + + /* Start the timer */ + DueTime.QuadPart = -1; + KeSetTimerEx(&CmiWorkerTimer, DueTime, 5000, NULL); /* 5sec */ + + InitializeListHead(&CmiCallbackHead); + ExInitializeFastMutex(&CmiCallbackLock); + + /* Create the key object types */ + Status = CmpCreateObjectTypes(); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 1, Status, 0); + } + + /* Build volatile registry store */ + Status = CmiCreateVolatileHive(&CmiVolatileHive); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 2, Status, 0); + } + + /* Create the \REGISTRY key node */ + if (!CmpCreateRegistryRoot()) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 4, 0, 0); + } + + /* Create '\Registry\Machine' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 5, Status, 0); + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Create '\Registry\User' key. */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\USER"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 6, Status, 0); + } + + /* Close the handle */ + NtClose(KeyHandle); + + /* Initialize the system hive */ + if (!CmpInitializeSystemHive(KeLoaderBlock)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 7, 0, 0); + } + + /* Create the 'CurrentControlSet' link. */ + Status = CmiCreateCurrentControlSetLink(); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 8, Status, 0); + } + + /* Initialize the hardware hive */ + BaseAddress = CmpRosGetHardwareHive(&Length); + if (!CmImportHardwareHive(BaseAddress, Length, &HardwareHive)) + { + /* Create dummy keys if no hardware hive was found */ + if (!CmImportHardwareHive (NULL, 0, &HardwareHive)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 11, Status, 0); + } + + /* Don't actually link anything below */ + Allocate = TRUE; + } + + /* Attach it to the machine key */ + RtlInitUnicodeString(&KeyName, REG_HARDWARE_KEY_NAME); + Status = CmpLinkHiveToMaster(&KeyName, NULL, HardwareHive, FALSE, NULL); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 12, Status, 0); + } + + /* Initialize volatile registry settings */ + Status = CmpSetSystemValues(KeLoaderBlock); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KEBUGCHECKEX(CONFIG_INITIALIZATION_FAILED, 1, 15, Status, 0); + } + + /* Free the load options */ + ExFreePool(CmpLoadOptions.Buffer); + + /* If we got here, all went well */ + return TRUE; +} static NTSTATUS CmiCreateCurrentControlSetLink(VOID) @@ -435,6 +600,7 @@ NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle; + if (ExpInTextModeSetup) return STATUS_SUCCESS; DPRINT("CmiCreateCurrentControlSetLink() called\n"); Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Thu May 10 04:02:04 2007 @@ -1,0 +1,646 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmsysini.c + * PURPOSE: Configuration Manager - System Initialization Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +#if 0 +/* GLOBALS *******************************************************************/ + +UNICODE_STRING CmSymbolicLinkValueName = + RTL_CONSTANT_STRING(L"SymbolicLinkValue"); + +UNICODE_STRING CmpSystemStartOptions; +UNICODE_STRING CmpLoadOptions; + +/* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpSetSystemValues(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName, ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + ASSERT(LoaderBlock != NULL); + + /* Setup attributes for loader options */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\" + L"Control"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Key opened, now write to the key */ + RtlInitUnicodeString(&KeyName, L"SystemStartOptions"); + Status = NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + CmpSystemStartOptions.Buffer, + CmpSystemStartOptions.Length); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Free the options now */ + ExFreePool(CmpSystemStartOptions.Buffer); + + /* Setup value name for system boot device */ + RtlInitUnicodeString(&KeyName, L"SystemBootDevice"); + RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->NtBootPathName); + Status = NtSetValueKey(KeyHandle, + &KeyName, + 0, + REG_SZ, + ValueName.Buffer, + ValueName.Length); + +Quickie: + /* Free the buffers */ + RtlFreeUnicodeString(&ValueName); + + /* Close the key and return */ + NtClose(KeyHandle); + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI +CmpHwProfileDefaultSelect(IN PVOID ProfileList, + OUT PULONG ProfileIndexToUse, + IN PVOID Context) +{ + /* Clear the index and return success */ + *ProfileIndexToUse = 0; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpAddDockingInfo(IN HANDLE Key, + IN PPROFILE_PARAMETER_BLOCK ProfileBlock) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING KeyName; + ULONG Value; + PAGED_CODE (); + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->DockingState; + RtlInitUnicodeString(&KeyName, L"DockingState"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->Capabilities; + RtlInitUnicodeString(&KeyName, L"Capabilities"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->DockID; + RtlInitUnicodeString(&KeyName, L"DockID"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the Value from the profile block, create a Name for it and set it */ + Value = ProfileBlock->SerialNumber; + RtlInitUnicodeString(&KeyName, L"SerialNumber"); + Status = NtSetValueKey(Key, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +CmpAddAliasEntry(IN HANDLE IDConfigDB, + IN PPROFILE_PARAMETER_BLOCK ProfileBlock, + IN ULONG ProfileNumber) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status = STATUS_SUCCESS; + CHAR Buffer[128]; + WCHAR UnicodeBuffer[128]; + ANSI_STRING TempString; + HANDLE AliasHandle = NULL, AliasIdHandle = NULL; + ULONG Value; + ULONG Disposition; + ULONG AliasId = 0; + PAGED_CODE (); + + /* Open the alias key */ + RtlInitUnicodeString(&KeyName, L"Alias"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + IDConfigDB, + NULL); + Status = NtOpenKey(&AliasHandle, KEY_READ | KEY_WRITE, &ObjectAttributes); + + /* Check if we failed to open it */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Create it instead */ + Status = NtCreateKey(&AliasHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + } + + /* Check if we failed */ + if (!NT_SUCCESS (Status)) + { + /* Cleanup and exit */ + AliasHandle = NULL; + goto Exit; + } + + /* Loop every alias ID */ + while (AliasId++ < 200) + { + /* Build the KeyName */ + sprintf(Buffer, "%04ld", AliasId); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT (STATUS_SUCCESS == Status); + + /* Open the key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + AliasHandle, + NULL); + Status = NtOpenKey(&AliasIdHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes); + if (NT_SUCCESS (Status)) + { + /* We opened it, close and keep looping */ + NtClose(AliasIdHandle); + } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* We couldn't find it, change Status and break out */ + Status = STATUS_SUCCESS; + break; + } + else + { + /* Any other error, break out */ + break; + } + } + + /* Check if we failed in the alias loop */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + AliasIdHandle = 0; + goto Exit; + } + + /* Otherwise, create the alias key */ + Status = NtCreateKey(&AliasIdHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + AliasIdHandle = 0; + goto Exit; + } + + /* Add docking information */ + CmpAddDockingInfo(AliasIdHandle, ProfileBlock); + + /* Set the profile number */ + Value = ProfileNumber; + RtlInitUnicodeString(&KeyName, L"ProfileNumber"); + Status = NtSetValueKey(AliasIdHandle, + &KeyName, + 0, + REG_DWORD, + &Value, + sizeof(Value)); + +Exit: + /* Close every opened key */ + if (AliasHandle) NtClose(AliasHandle); + if (AliasIdHandle) NtClose(AliasIdHandle); + + /* Return Status */ + return Status; +} + +NTSTATUS +NTAPI +CmSetAcpiHwProfile(IN PPROFILE_ACPI_DOCKING_STATE NewDockState, + IN PVOID Select, + IN PVOID Context, + OUT PHANDLE NewProfile, + OUT PBOOLEAN ProfileChanged) +{ + /* FIXME: TODO */ + *ProfileChanged = FALSE; + *NewProfile = NULL; + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpCloneHwProfile(IN HANDLE ConfigHandle, + IN HANDLE Parent, + IN HANDLE OldProfile, + IN ULONG OldProfileNumber, + IN USHORT DockingState, + OUT PHANDLE NewProfile, + OUT PULONG NewProfileNumber) +{ + /* FIXME: TODO */ + *NewProfileNumber = FALSE; + *NewProfile = NULL; + ASSERT(FALSE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpCreateCurrentControlSetLink(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNICODE_STRING ConfigName = RTL_CONSTANT_STRING(L"Control\\ConfigHandle"); + UNICODE_STRING SelectName = + RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\Select"); + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + CHAR ValueInfoBuffer[128]; + PKEY_VALUE_FULL_INFORMATION ValueInfo; + CHAR Buffer[128]; + WCHAR UnicodeBuffer[128]; + HANDLE SelectHandle, KeyHandle, ConfigHandle = NULL, ProfileHandle = NULL; + HANDLE ParentHandle = NULL, AcpiHandle; + ULONG ControlSet, HwProfile; + ANSI_STRING TempString; + NTSTATUS Status; + ULONG ResultLength, Disposition; + BOOLEAN AcpiProfile = FALSE; + PLOADER_PARAMETER_EXTENSION LoaderExtension; + PROFILE_ACPI_DOCKING_STATE AcpiDockState; + BOOLEAN Active; + PAGED_CODE(); + + /* Open the select key */ + InitializeObjectAttributes(&ObjectAttributes, + &SelectName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status))return(Status); + + /* Open the current value */ + RtlInitUnicodeString(&KeyName, L"Current"); + Status = NtQueryValueKey(SelectHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + NtClose(SelectHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the actual value pointer, and get the control set ID */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + ControlSet = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + + /* Create the current control set key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Initialize the symbolic link name */ + sprintf(Buffer, + "\\Registry\\Machine\\System\\ControlSet%03ld", + ControlSet); + RtlInitAnsiString(&TempString, Buffer); + + /* Create a Unicode string out of it */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE); + + /* Set the value */ + Status = NtSetValueKey(KeyHandle, + &CmSymbolicLinkValueName, + 0, + REG_LINK, + KeyName.Buffer, + KeyName.Length); + if (!NT_SUCCESS(Status)) return Status; + + /* Get the configuration database key */ + InitializeObjectAttributes(&ObjectAttributes, + &ConfigName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); + NtClose(KeyHandle); + + /* Check if we don't have one */ + if (!NT_SUCCESS(Status)) + { + /* Cleanup and exit */ + ConfigHandle = 0; + goto Cleanup; + } + + /* Now get the current config */ + RtlInitUnicodeString(&KeyName, L"CurrentConfig"); + Status = NtQueryValueKey(ConfigHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + + /* Set pointer to buffer */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + + /* Check if we failed or got a non DWORD-value */ + if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) goto Cleanup; + + /* Get the hadware profile */ + HwProfile = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + + /* Open the hardware profile key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Hardware Profiles"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&ParentHandle, KEY_READ, &ObjectAttributes); + + /* Check if there is no hardware profile key */ + if (!NT_SUCCESS (Status)) + { + /* Exit and clean up */ + ParentHandle = 0; + goto Cleanup; + } + + /* Build the profile name */ + sprintf(Buffer, "%04ld",HwProfile); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + + /* Open the associated key */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentHandle, + NULL); + Status = NtOpenKey(&ProfileHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes); + + /* Check if there's no such key */ + if (!NT_SUCCESS (Status)) + { + /* Cleanup and exit */ + ProfileHandle = 0; + goto Cleanup; + } + + /* Check if we have a loader block extension */ + LoaderExtension = LoaderBlock->Extension; + if (LoaderExtension) + { + /* Check the hardware profile status */ + switch (LoaderExtension->Profile.Status) + { + /* Cloned status */ + case 3: + + /* Clone it */ + Status = CmpCloneHwProfile(ConfigHandle, + ParentHandle, + ProfileHandle, + HwProfile, + LoaderExtension-> + Profile.DockingState, + &ProfileHandle, + &HwProfile); + if (!NT_SUCCESS(Status)) + { + /* Cloning failed, cleanup and exit */ + ProfileHandle = 0; + goto Cleanup; + } + + /* Set the current config key */ + RtlInitUnicodeString(&KeyName, L"CurrentConfig"); + Status = NtSetValueKey(ConfigHandle, + &KeyName, + 0, + REG_DWORD, + &HwProfile, + sizeof (HwProfile)); + if (!NT_SUCCESS (Status)) goto Cleanup; + + /* Alias status */ + case 1: + + /* Create an alias entry */ + Status = CmpAddAliasEntry(ConfigHandle, + &LoaderExtension->Profile, + HwProfile); + + /* Docking status */ + case 2: + + /* Create the current dock info key */ + RtlInitUnicodeString(&KeyName, + L"CurrentDockInfo"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ConfigHandle, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_READ | KEY_WRITE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + ASSERT (STATUS_SUCCESS == Status); + + /* Add the docking information */ + Status = CmpAddDockingInfo(KeyHandle, + &LoaderExtension->Profile); + break; + + /* Other cases */ + case 0: + case 0xC001: + break; + + /* Unknown status */ + default: + ASSERT(FALSE); + } + } + + /* Create the current hardware profile key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + L"Hardware Profiles\\Current"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (NT_SUCCESS(Status)) + { + /* Sanity check */ + ASSERT(Disposition == REG_CREATED_NEW_KEY); + + /* Create the profile name */ + sprintf(Buffer, + "\\Registry\\Machine\\System\\CurrentControlSet\\" + "Hardware Profiles\\%04ld", + HwProfile); + RtlInitAnsiString(&TempString, Buffer); + + /* Convert it to Unicode */ + KeyName.MaximumLength = sizeof(UnicodeBuffer); + KeyName.Buffer = UnicodeBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &TempString, + FALSE); + ASSERT (STATUS_SUCCESS == Status); + + /* Set it */ + Status = NtSetValueKey(KeyHandle, + &CmSymbolicLinkValueName, + 0, + REG_LINK, + KeyName.Buffer, + KeyName.Length); + NtClose(KeyHandle); + } + + /* Check if we have to set the ACPI Profile */ + if (AcpiProfile) + { + /* Setup the docking state to undocked */ + AcpiDockState.DockingState = 1; + AcpiDockState.SerialLength = 2; + AcpiDockState.SerialNumber[0] = L'\0'; + + /* Set the ACPI profile */ + Status = CmSetAcpiHwProfile(&AcpiDockState, + CmpHwProfileDefaultSelect, + NULL, + &AcpiHandle, + &Active); + ASSERT(NT_SUCCESS(Status)); + + /* Close the key */ + NtClose(AcpiHandle); + } + + /* Close every opened handle */ +Cleanup: + if (ConfigHandle) NtClose(ConfigHandle); + if (ProfileHandle) NtClose(ProfileHandle); + if (ParentHandle) NtClose(ParentHandle); + + /* Return success */ + return STATUS_SUCCESS; +} +#endif 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 Thu May 10 04:02:04 2007 @@ -73,8 +73,8 @@ BOOLEAN NTAPI ObInit(VOID); BOOLEAN NTAPI CmInitSystem1(VOID); VOID CmShutdownRegistry(VOID); -BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); -BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); +//BOOLEAN CmImportSystemHive(PCHAR ChunkBase, ULONG ChunkSize); +//BOOLEAN CmImportHardwareHive(PCHAR ChunkBase, ULONG ChunkSize); 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 Thu May 10 04:02:04 2007 @@ -92,6 +92,7 @@ <file>cmname.c</file> <file>cmparse.c</file> <file>cmsecach.c</file> + <file>cmsysini.c</file> <file>cmvalue.c</file> </directory> <directory name="cm">

17 years, 7 months

[ion] 26668: - Fix crash in Install CD introduced in 26666, with a ludicrious hack for FreeLDR

by ion＠svn.reactos.org

Author: ion Date: Thu May 10 01:15:52 2007 New Revision: 26668 URL: http://svn.reactos.org/svn/reactos?rev=26668&view=rev Log: - Fix crash in Install CD introduced in 26666, with a ludicrious hack for FreeLDR Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcontrl.c (original) +++ trunk/reactos/ntoskrnl/config/cmcontrl.c Thu May 10 01:15:52 2007 @@ -112,6 +112,9 @@ BOOLEAN Auto, IsSmallKey; PVOID Buffer; + /* LUDDDIIIICRROOOUUSSSS KI^H^H HACKKKK */ + if (!SystemHiveData) return; + /* Initialize the Hive View List and the security cache */ RtlZeroMemory(SystemHive, sizeof(SystemHive)); CmpInitHiveViewList((PCMHIVE)SystemHive);

17 years, 7 months

[fireball] 26667: - Add error messages to prevent silent failing, no functionality change.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 10 00:52:08 2007 New Revision: 26667 URL: http://svn.reactos.org/svn/reactos?rev=26667&view=rev Log: - Add error messages to prevent silent failing, no functionality change. Modified: trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Thu May 10 00:52:08 2007 @@ -97,13 +97,22 @@ hSCManager = OpenSCManager(NULL, NULL, 0); if (!hSCManager) + { + ERR("WL: Failed to OpenSCManager\n"); goto cleanup; + } hService = OpenServiceW(hSCManager, ServiceName, SERVICE_START); if (!hService) + { + ERR("WL: Failed to open the service\n"); goto cleanup; + } if (!StartServiceW(hService, 0, NULL)) + { + ERR("WL: Failed to start the service\n"); goto cleanup; + } ret = TRUE;

17 years, 7 months

[ion] 26666: - Implement CmGetSystemControlValues and all related low-level Cm functionality required to select the proper control set and read all the kernel variables during Phase 0 initialization. We can now read time-zone data, version, suite, language IDs and other important kernel variables in the lowest-level boot phase. - New code uses cmlib from Filip Navara without any modification, and is fully compatible with reading Windows hives as well except XP's "Big value cells" (cells with > 2

by ion＠svn.reactos.org

Author: ion Date: Wed May 9 22:30:21 2007 New Revision: 26666 URL: http://svn.reactos.org/svn/reactos?rev=26666&view=rev Log: - Implement CmGetSystemControlValues and all related low-level Cm functionality required to select the proper control set and read all the kernel variables during Phase 0 initialization. We can now read time-zone data, version, suite, language IDs and other important kernel variables in the lowest-level boot phase. - New code uses cmlib from Filip Navara without any modification, and is fully compatible with reading Windows hives as well except XP's "Big value cells" (cells with > 2GB data) which aren't supported. - Create /config directory where the new Configuration Manager code lies. Added: trunk/reactos/ntoskrnl/config/ trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cm_x.h trunk/reactos/ntoskrnl/config/cmboot.c trunk/reactos/ntoskrnl/config/cmcontrl.c trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cmmapvw.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsecach.c trunk/reactos/ntoskrnl/config/cmvalue.c Removed: trunk/reactos/ntoskrnl/cm/newcm.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild Removed: trunk/reactos/ntoskrnl/cm/newcm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/newcm.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/cm/newcm.c (original) +++ trunk/reactos/ntoskrnl/cm/newcm.c (removed) @@ -1,12 +1,0 @@ -#include "ntoskrnl.h" -#include "cm.h" -#include "debug.h" - -VOID -NTAPI -CmGetSystemControlValues(IN PVOID SystemHiveData, - IN PCM_SYSTEM_CONTROL_VECTOR ControlVector) -{ - return; -} - Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/cm.h Wed May 9 22:30:21 2007 @@ -1,0 +1,968 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cm.h + * PURPOSE: Internal header for the Configuration Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ +#define _CM_ +#include "cmlib.h" + +// +// Define this if you want debugging support +// +#define _CM_DEBUG_ 0x00 + +// +// These define the Debug Masks Supported +// +#define CM_HANDLE_DEBUG 0x01 +#define CM_NAMESPACE_DEBUG 0x02 +#define CM_SECURITY_DEBUG 0x04 +#define CM_REFERENCE_DEBUG 0x08 +#define CM_CALLBACK_DEBUG 0x10 + +// +// Debug/Tracing support +// +#if _CM_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define CMTRACE DbgPrintEx +#else +#define CMTRACE(x, ...) \ + if (x & CmpTraceLevel) DbgPrint(__VA_ARGS__) +#endif +#else +#define CMTRACE(x, ...) DPRINT(__VA_ARGS__) +#endif + +// +// Tag for all registry allocations +// +#define TAG_CM \ + TAG('C', 'm', ' ', ' ') + +// +// Hive operations +// +#define HINIT_CREATE 0 +#define HINIT_MEMORY 1 +#define HINIT_FILE 2 +#define HINIT_MEMORY_INPLACE 3 +#define HINIT_FLAT 4 +#define HINIT_MAPFILE 5 + +// +// Hive flags +// +#define HIVE_VOLATILE 1 +#define HIVE_NOLAZYFLUSH 2 + +// +// Hive types +// +#define HFILE_TYPE_PRIMARY 0 +#define HFILE_TYPE_ALTERNATE 1 +#define HFILE_TYPE_LOG 2 +#define HFILE_TYPE_EXTERNAL 3 +#define HFILE_TYPE_MAX 4 + +// +// Hive sizes +// +#define HBLOCK_SIZE 0x1000 +#define HSECTOR_SIZE 0x200 +#define HSECTOR_COUNT 8 + +// +// Hive versions +// +#define HSYS_MAJOR 1 +#define HSYS_MINOR 3 +#define HSYS_WHISTLER_BETA1 4 + +// +// Cell Masks +// +#define HCELL_NIL 0 +#define HCELL_CACHED 1 + +// +// Key Types +// +#define CM_KEY_INDEX_ROOT 0x6972 +#define CM_KEY_INDEX_LEAF 0x696c +#define CM_KEY_FAST_LEAF 0x666c +#define CM_KEY_HASH_LEAF 0x686c + +// +// CM_KEY_CONTROL_BLOCK Flags +// +#define CM_KCB_NO_SUBKEY 0x01 +#define CM_KCB_SUBKEY_ONE 0x02 +#define CM_KCB_SUBKEY_HINT 0x04 +#define CM_KCB_SYM_LINK_FOUND 0x08 +#define CM_KCB_KEY_NON_EXIST 0x10 +#define CM_KCB_NO_DELAY_CLOSE 0x20 +#define CM_KCB_INVALID_CACHED_INFO 0x40 +#define CM_KEY_READ_ONLY_KEY 0x80 + +// +// CM_KEY_NODE Signature and Flags +// +#define CM_KEY_NODE_SIGNATURE 0x6B6E +#define CM_LINK_NODE_SIGNATURE 0x6B6C +#define KEY_IS_VOLATILE 0x01 +#define KEY_HIVE_EXIT 0x02 +#define KEY_HIVE_ENTRY 0x04 +#define KEY_NO_DELETE 0x08 +#define KEY_SYM_LINK 0x10 +#define KEY_COMP_NAME 0x20 +#define KEY_PREFEF_HANDLE 0x40 +#define KEY_VIRT_MIRRORED 0x80 +#define KEY_VIRT_TARGET 0x100 +#define KEY_VIRTUAL_STORE 0x200 + +// +// CM_KEY_VALUE Signature and Flags +// +#define CM_KEY_VALUE_SIGNATURE 0x6b76 +#define CM_KEY_VALUE_SMALL 0x4 +#define CM_KEY_VALUE_BIG 0x3FD8 +#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 +#define VALUE_COMP_NAME 0x0001 + +// +// Number of various lists and hashes +// +#define CMP_SECURITY_HASH_LISTS 64 +#define CMP_MAX_CALLBACKS 100 + +// +// Hashing Constants +// +#define CMP_HASH_IRRATIONAL 314159269 +#define CMP_HASH_PRIME 1000000007 + +// +// CmpCreateKcb Flags +// +#define CMP_CREATE_FAKE_KCB 0x1 +#define CMP_LOCK_HASHES_FOR_KCB 0x2 + +// +// Number of items that can fit inside an Allocation Page +// +#define CM_KCBS_PER_PAGE \ + PAGE_SIZE / sizeof(CM_KEY_CONTROL_BLOCK) +#define CM_DELAYS_PER_PAGE \ + PAGE_SIZE / sizeof(CM_DELAYED_CLOSE_ENTRY) + +// +// Key Hash +// +typedef struct _CM_KEY_HASH +{ + ULONG ConvKey; + struct _CM_KEY_HASH *NextHash; + PHHIVE KeyHive; + HCELL_INDEX KeyCell; +} CM_KEY_HASH, *PCM_KEY_HASH; + +// +// Key Hash Table Entry +// +typedef struct _CM_KEY_HASH_TABLE_ENTRY +{ + EX_PUSH_LOCK Lock; + PKTHREAD Owner; + PCM_KEY_HASH Entry; +} CM_KEY_HASH_TABLE_ENTRY, *PCM_KEY_HASH_TABLE_ENTRY; + +// +// Name Hash +// +typedef struct _CM_NAME_HASH +{ + ULONG ConvKey; + struct _CM_NAME_HASH *NextHash; + USHORT NameLength; + WCHAR Name[ANYSIZE_ARRAY]; +} CM_NAME_HASH, *PCM_NAME_HASH; + +// +// Name Hash Table Entry +// +typedef struct _CM_NAME_HASH_TABLE_ENTRY +{ + EX_PUSH_LOCK Lock; + PCM_NAME_HASH Entry; +} CM_NAME_HASH_TABLE_ENTRY, *PCM_NAME_HASH_TABLE_ENTRY; + +// +// Key Security Cache +// +typedef struct _CM_KEY_SECURITY_CACHE +{ + HCELL_INDEX Cell; + ULONG ConvKey; + LIST_ENTRY List; + ULONG DescriptorLength; + SECURITY_DESCRIPTOR_RELATIVE Descriptor; +} CM_KEY_SECURITY_CACHE, *PCM_KEY_SECURITY_CACHE; + +// +// Key Security Cache Entry +// +typedef struct _CM_KEY_SECURITY_CACHE_ENTRY +{ + HCELL_INDEX Cell; + PCM_KEY_SECURITY_CACHE CachedSecurity; +} CM_KEY_SECURITY_CACHE_ENTRY, *PCM_KEY_SECURITY_CACHE_ENTRY; + +// +// Cached Child List +// +typedef struct _CACHED_CHILD_LIST +{ + ULONG Count; + union + { + ULONG ValueList; + struct _CM_KEY_CONTROL_BLOCK *RealKcb; + }; +} CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; + +// +// Index Hint Block +// +typedef struct _CM_INDEX_HINT_BLOCK +{ + ULONG Count; + ULONG HashKey[ANYSIZE_ARRAY]; +} CM_INDEX_HINT_BLOCK, *PCM_INDEX_HINT_BLOCK; + +// +// Key Reference +// +typedef struct _CM_KEY_REFERENCE +{ + HCELL_INDEX KeyCell; + PHHIVE KeyHive; +} CM_KEY_REFERENCE, *PCM_KEY_REFERENCE; + +// +// Key Body +// +typedef struct _CM_KEY_BODY +{ + ULONG Type; + struct _CM_KEY_CONTROL_BLOCK *KeyControlBlock; + struct _CM_NOTIFY_BLOCK *NotifyBlock; + HANDLE ProcessID; + ULONG Callers; + PVOID CallerAddress[10]; + LIST_ENTRY KeyBodyList; +} CM_KEY_BODY, *PCM_KEY_BODY; + +// +// Name Control Block (NCB) +// +typedef struct _CM_NAME_CONTROL_BLOCK +{ + BOOLEAN Compressed; + USHORT RefCount; + union + { + CM_NAME_HASH NameHash; + struct + { + ULONG ConvKey; + PCM_KEY_HASH NextHash; + USHORT NameLength; + WCHAR Name[ANYSIZE_ARRAY]; + }; + }; +} CM_NAME_CONTROL_BLOCK, *PCM_NAME_CONTROL_BLOCK; + +// +// Key Control Block (KCB) +// +typedef struct _CM_KEY_CONTROL_BLOCK +{ + USHORT RefCount; + USHORT Flags; + ULONG ExtFlags:8; + ULONG PrivateAlloc:1; + ULONG Delete:1; + ULONG DelayedCloseIndex:12; + ULONG TotalLevels:10; + union + { + CM_KEY_HASH KeyHash; + struct + { + ULONG ConvKey; + PCM_KEY_HASH NextHash; + PHHIVE KeyHive; + HCELL_INDEX KeyCell; + }; + }; + struct _CM_KEY_CONTROL_BLOCK *ParentKcb; + PCM_NAME_CONTROL_BLOCK NameBlock; + PCM_KEY_SECURITY_CACHE CachedSecurity; + CACHED_CHILD_LIST ValueCache; + PCM_INDEX_HINT_BLOCK IndexHint; + ULONG HashKey; + ULONG SubKeyCount; + union + { + LIST_ENTRY KeyBodyListHead; + LIST_ENTRY FreeListEntry; + }; + PCM_KEY_BODY KeyBodyArray[4]; + PVOID DelayCloseEntry; + LARGE_INTEGER KcbLastWriteTime; + USHORT KcbMaxNameLen; + USHORT KcbMaxValueNameLen; + ULONG KcbMaxValueDataLen; + ULONG InDelayClose; +} CM_KEY_CONTROL_BLOCK, *PCM_KEY_CONTROL_BLOCK; + +// +// Notify Block +// +typedef struct _CM_NOTIFY_BLOCK +{ + LIST_ENTRY HiveList; + LIST_ENTRY PostList; + PCM_KEY_CONTROL_BLOCK KeyControlBlock; + PCM_KEY_BODY KeyBody; + ULONG Filter:29; + ULONG WatchTree:30; + ULONG NotifyPending:31; +} CM_NOTIFY_BLOCK, *PCM_NOTIFY_BLOCK; + +// +// Re-map Block +// +typedef struct _CM_CELL_REMAP_BLOCK +{ + HCELL_INDEX OldCell; + HCELL_INDEX NewCell; +} CM_CELL_REMAP_BLOCK, *PCM_CELL_REMAP_BLOCK; + +// +// Allocation Page +// +typedef struct _CM_ALLOC_PAGE +{ + ULONG FreeCount; + ULONG Reserved; + PVOID AllocPage; +} CM_ALLOC_PAGE, *PCM_ALLOC_PAGE; + +// +// Delayed Close Entry +// +typedef struct _CM_DELAYED_CLOSE_ENTRY +{ + LIST_ENTRY DelayedLRUList; + PCM_KEY_CONTROL_BLOCK KeyControlBlock; +} CM_DELAYED_CLOSE_ENTRY, *PCM_DELAYED_CLOSE_ENTRY; + +// +// Delayed KCB Dereference Entry +// +typedef struct _CM_DELAY_DEREF_KCB_ITEM +{ + LIST_ENTRY ListEntry; + PCM_KEY_CONTROL_BLOCK Kcb; +} CM_DELAY_DEREF_KCB_ITEM, *PCM_DELAY_DEREF_KCB_ITEM; + +// +// Use Count Log and Entry +// +typedef struct _CM_USE_COUNT_LOG_ENTRY +{ + HCELL_INDEX Cell; + PVOID Stack[7]; +} CM_USE_COUNT_LOG_ENTRY, *PCM_USE_COUNT_LOG_ENTRY; + +typedef struct _CM_USE_COUNT_LOG +{ + USHORT Next; + USHORT Size; + CM_USE_COUNT_LOG_ENTRY Log[32]; +} CM_USE_COUNT_LOG, *PCM_USE_COUNT_LOG; + +// +// Configuration Manager Hive Structure +// +typedef struct _CMHIVE +{ + HHIVE Hive; + HANDLE FileHandles[3]; + LIST_ENTRY NotifyList; + LIST_ENTRY HiveList; + EX_PUSH_LOCK HiveLock; + PKTHREAD HiveLockOwner; + PKGUARDED_MUTEX ViewLock; + PKTHREAD ViewLockOwner; + EX_PUSH_LOCK WriterLock; + PKTHREAD WriterLockOwner; + PERESOURCE FlusherLock; + EX_PUSH_LOCK SecurityLock; + PKTHREAD HiveSecurityLockOwner; + LIST_ENTRY LRUViewListHead; + LIST_ENTRY PinViewListHead; + PFILE_OBJECT FileObject; + UNICODE_STRING FileFullPath; + UNICODE_STRING FileUserName; + USHORT MappedViews; + USHORT PinnedViews; + ULONG UseCount; + ULONG SecurityCount; + ULONG SecurityCacheSize; + LONG SecurityHitHint; + PCM_KEY_SECURITY_CACHE_ENTRY SecurityCache; + LIST_ENTRY SecurityHash[CMP_SECURITY_HASH_LISTS]; + PKEVENT UnloadEvent; + PCM_KEY_CONTROL_BLOCK RootKcb; + BOOLEAN Frozen; + PWORK_QUEUE_ITEM UnloadWorkItem; + BOOLEAN GrowOnlyMode; + ULONG GrowOffset; + LIST_ENTRY KcbConvertListHead; + LIST_ENTRY KnodeConvertListHead; + PCM_CELL_REMAP_BLOCK CellRemapArray; + CM_USE_COUNT_LOG UseCountLog; + CM_USE_COUNT_LOG LockHiveLog; + ULONG Flags; + LIST_ENTRY TrustClassEntry; + ULONG FlushCount; + BOOLEAN HiveIsLoading; + PKTHREAD CreatorOwner; +} CMHIVE, *PCMHIVE; + +#include <pshpack1.h> + +typedef struct _CM_VIEW_OF_FILE +{ + LIST_ENTRY LRUViewList; + LIST_ENTRY PinViewList; + ULONG FileOffset; + ULONG Size; + PULONG ViewAddress; + PVOID Bcb; + ULONG UseCount; +} CM_VIEW_OF_FILE, *PCM_VIEW_OF_FILE; + +typedef struct _CHILD_LIST +{ + ULONG Count; + HCELL_INDEX List; +} CHILD_LIST, *PCHILD_LIST; + +typedef struct _CM_KEY_NODE +{ + USHORT Id; + USHORT Flags; + LARGE_INTEGER LastWriteTime; + ULONG Spare; + HCELL_INDEX Parent; + ULONG SubKeyCounts[HvMaxStorageType]; + HCELL_INDEX SubKeyLists[HvMaxStorageType]; + CHILD_LIST ValueList; + HCELL_INDEX SecurityKeyOffset; + HCELL_INDEX ClassNameOffset; + ULONG MaxNameLen; + ULONG MaxClassLen; + ULONG MaxValueNameLen; + ULONG MaxValueDataLen; + ULONG WorkVar; + USHORT NameLength; + USHORT ClassSize; + WCHAR Name[0]; +} CM_KEY_NODE, *PCM_KEY_NODE; + +typedef struct _VALUE_LIST_CELL +{ + HCELL_INDEX ValueOffset[0]; +} VALUE_LIST_CELL, *PVALUE_LIST_CELL; + +typedef struct _CM_KEY_VALUE +{ + USHORT Signature; // "kv" + USHORT NameLength; // length of Name + ULONG DataLength; // length of datas in the cell pointed by DataOffset + HCELL_INDEX Data;// datas are here if high bit of DataSize is set + ULONG Type; + USHORT Flags; + USHORT Unused1; + WCHAR Name[0]; /* warning : not zero terminated */ +} CM_KEY_VALUE, *PCM_KEY_VALUE; + +typedef struct _CM_KEY_SECURITY +{ + USHORT Signature; // "sk" + USHORT Reserved; + HCELL_INDEX Flink; + HCELL_INDEX Blink; + ULONG ReferenceCount; + ULONG DescriptorLength; + //SECURITY_DESCRIPTOR_RELATIVE Descriptor; + UCHAR Data[0]; +} CM_KEY_SECURITY, *PCM_KEY_SECURITY; + +#include <poppack.h> + +// +// Generic Index Entry +// +typedef struct _CM_INDEX +{ + HCELL_INDEX Cell; + union + { + UCHAR NameHint[4]; + ULONG HashKey; + }; +} CM_INDEX, *PCM_INDEX; + +// +// Key Index +// +typedef struct _CM_KEY_INDEX +{ + USHORT Signature; + USHORT Count; + HCELL_INDEX List[ANYSIZE_ARRAY]; +} CM_KEY_INDEX, *PCM_KEY_INDEX; + +// +// Fast/Hash Key Index +// +typedef struct _CM_KEY_FAST_INDEX +{ + USHORT Signature; + USHORT Count; + CM_INDEX List[ANYSIZE_ARRAY]; +} CM_KEY_FAST_INDEX, *PCM_KEY_FAST_INDEX; + +// +// Cell Data +// +typedef struct _CELL_DATA +{ + union + { + CM_KEY_NODE KeyNode; + CM_KEY_VALUE KeyValue; + CM_KEY_SECURITY KeySecurity; + CM_KEY_INDEX KeyIndex; + HCELL_INDEX KeyList[ANYSIZE_ARRAY]; + WCHAR KeyString[ANYSIZE_ARRAY]; + } u; +} CELL_DATA, *PCELL_DATA; + +// +// Cached Value Index +// +typedef struct _CM_CACHED_VALUE_INDEX +{ + HCELL_INDEX CellIndex; + union + { + CELL_DATA CellData; + ULONG_PTR List[ANYSIZE_ARRAY]; + } Data; +} CM_CACHED_VALUE_INDEX, *PCM_CACHED_VALUE_INDEX; + +// +// Cached Value +// +typedef struct _CM_CACHED_VALUE +{ + USHORT DataCacheType; + USHORT ValueKeySize; + CM_KEY_VALUE KeyValue; +} CM_CACHED_VALUE, *PCM_CACHED_VALUE; + +// +// Hive List Entry +// +typedef struct _HIVE_LIST_ENTRY +{ + PWCHAR FileName; + PWCHAR BaseName; + PWCHAR RegRootName; + PCMHIVE CmHive; + ULONG HHiveFlags; + ULONG CmHiveFlags; + PCMHIVE CmHive2; + BOOLEAN ThreadFinished; + BOOLEAN ThreadStarted; + BOOLEAN Allocate; + BOOLEAN WinPERequired; +} HIVE_LIST_ENTRY, *PHIVE_LIST_ENTRY; + +// +// Parse context for Key Object +// +typedef struct _CM_PARSE_CONTEXT +{ + ULONG TitleIndex; + UNICODE_STRING Class; + ULONG CreateOptions; + ULONG Disposition; + CM_KEY_REFERENCE ChildHive; + BOOLEAN CreateLink; + BOOLEAN Flag2; + HANDLE PredefinedHandle; + ULONG PostActions; +} CM_PARSE_CONTEXT, *PCM_PARSE_CONTEXT; + +// +// System Control Vector +// +typedef struct _CM_SYSTEM_CONTROL_VECTOR +{ + PWCHAR KeyPath; + PWCHAR ValueName; + PVOID Buffer; + PULONG BufferLength; + PULONG Type; +} CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; + +// +// Mapped View Hive Functions +// +VOID +NTAPI +CmpInitHiveViewList( + IN PCMHIVE Hive +); + +// +// Security Cache Functions +// +VOID +NTAPI +CmpInitSecurityCache( + IN PCMHIVE Hive +); + +// +// Registry Validation Functions +// +BOOLEAN +NTAPI +CmCheckRegistry( + IN PCMHIVE Hive, + IN BOOLEAN CleanFlag +); + +// +// Notification Routines +// +VOID +CmpReportNotify( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PHHIVE Hive, + IN HCELL_INDEX Cell, + IN ULONG Filter +); + +// +// KCB Cache/Delay Routines +// +VOID +NTAPI +CmpInitializeCache( + VOID +); + +VOID +NTAPI +CmpInitializeCmAllocations( + VOID +); + +VOID +NTAPI +CmpInitializeKcbDelayedDeref( + VOID +); + +// +// Key Object Routines +// +VOID +NTAPI +CmpCloseKeyObject( + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount +); + +VOID +NTAPI +CmpDeleteKeyObject( + IN PVOID Object +); + +NTSTATUS +NTAPI +CmpParseKey( + IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object +); + +NTSTATUS +NTAPI +CmpSecurityMethod( + IN PVOID Object, + IN SECURITY_OPERATION_CODE OperationType, + IN PSECURITY_INFORMATION SecurityInformation, + IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG CapturedLength, + IN OUT PSECURITY_DESCRIPTOR *ObjectSecurityDescriptor, + IN POOL_TYPE PoolType, + IN PGENERIC_MAPPING GenericMapping +); + +NTSTATUS +NTAPI +CmpQueryKeyName( + IN PVOID Object, + IN BOOLEAN HasObjectName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE AccessMode +); + +// +// Hive Routines +// +NTSTATUS +NTAPI +CmpInitializeHive( + OUT PCMHIVE *CmHive, + IN ULONG Operation, + IN ULONG Flags, + IN ULONG FileType, + IN PVOID HiveData, + IN HANDLE Primary, + IN HANDLE Alternate, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName +); + +PSECURITY_DESCRIPTOR +NTAPI +CmpHiveRootSecurityDescriptor( + VOID +); + +NTSTATUS +NTAPI +CmpLinkHiveToMaster( + IN PUNICODE_STRING LinkName, + IN HANDLE RootDirectory, + IN PCMHIVE CmHive, + IN BOOLEAN Allocate, + IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + +// +// Registry Utility Functions +// +BOOLEAN +NTAPI +CmpTestRegistryLockExclusive( + VOID +); + +VOID +NTAPI +CmpLockRegistryExclusive( + VOID +); + +VOID +NTAPI +CmpUnlockRegistry( + VOID +); + +PVOID +NTAPI +CmpAllocateDelayItem( + VOID +); + +VOID +NTAPI +CmpFreeDelayItem( + PVOID Entry +); + +// +// KCB Functions +// +PCM_KEY_CONTROL_BLOCK +NTAPI +CmpCreateKcb( + IN PHHIVE Hive, + IN HCELL_INDEX Index, + IN PCM_KEY_NODE Node, + IN PCM_KEY_CONTROL_BLOCK Parent, + IN ULONG Flags, + IN PUNICODE_STRING KeyName +); + +VOID +NTAPI +CmpDereferenceKcbWithLock( + IN PCM_KEY_CONTROL_BLOCK Kcb, + IN BOOLEAN LockHeldExclusively +); + +// +// Name Functions +// +LONG +NTAPI +CmpCompareCompressedName( + IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength +); + +USHORT +NTAPI +CmpNameSize( + IN PHHIVE Hive, + IN PUNICODE_STRING Name +); + +USHORT +NTAPI +CmpCopyName( + IN PHHIVE Hive, + IN PWCHAR Destination, + IN PUNICODE_STRING Source +); + +BOOLEAN +NTAPI +CmpFindNameInList( + IN PHHIVE Hive, + IN PCHILD_LIST ChildList, + IN PUNICODE_STRING Name, + IN PULONG ChildIndex, + IN PHCELL_INDEX CellIndex +); + +// +// Parse Routines +// +BOOLEAN +NTAPI +CmpGetNextName( + IN OUT PUNICODE_STRING RemainingName, + OUT PUNICODE_STRING NextName, + OUT PBOOLEAN LastName +); + +// +// Flush Routines +// +BOOLEAN +NTAPI +CmpFlushEntireRegistry( + IN BOOLEAN ForceFlush +); + +// +// Cell Index Routines +// +HCELL_INDEX +NTAPI +CmpFindSubKeyByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PUNICODE_STRING SearchName +); + +// +// Cell Value Routines +// +HCELL_INDEX +NTAPI +CmpFindValueByName( + IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name +); + +PCELL_DATA +NTAPI +CmpValueToData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + OUT PULONG Length +); + +// +// Boot Routines +// +HCELL_INDEX +NTAPI +CmpFindControlSet( + IN PHHIVE SystemHive, + IN HCELL_INDEX RootCell, + IN PUNICODE_STRING SelectKeyName, + OUT PBOOLEAN AutoSelect +); + +// +// Global variables accessible from all of Cm +// +extern BOOLEAN CmpSpecialBootCondition; +extern BOOLEAN CmpFlushOnLockRelease; +extern EX_PUSH_LOCK CmpHiveListHeadLock; +extern LIST_ENTRY CmpHiveListHead; +extern POBJECT_TYPE CmpKeyObjectType; +extern ERESOURCE CmpRegistryLock; +extern PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; +extern PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; +extern KGUARDED_MUTEX CmpDelayedCloseTableLock; +extern CMHIVE CmControlHive; +extern WCHAR CmDefaultLanguageId[]; +extern ULONG CmDefaultLanguageIdLength; +extern ULONG CmDefaultLanguageIdType; +extern WCHAR CmInstallUILanguageId[]; +extern ULONG CmInstallUILanguageIdLength; +extern ULONG CmInstallUILanguageIdType; +extern LANGID PsInstallUILanguageId; +extern LANGID PsDefaultUILanguageId; +extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[]; + +// +// Inlined functions +// +#include "cm_x.h" Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/cm_x.h Wed May 9 22:30:21 2007 @@ -1,0 +1,143 @@ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/cm/cm_x.h +* PURPOSE: Inlined Functions for the Configuration Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ + +// +// Returns whether or not this is a small valued key +// +BOOLEAN +FORCEINLINE +CmpIsKeyValueSmall(OUT PULONG RealLength, + IN ULONG Length) +{ + /* Check if the length has the special size value */ + if (Length >= CM_KEY_VALUE_SPECIAL_SIZE) + { + /* It does, so this is a small key: return the real length */ + *RealLength = Length - CM_KEY_VALUE_SPECIAL_SIZE; + return TRUE; + } + + /* This is not a small key, return the length we read */ + *RealLength = Length; + return FALSE; +} + +// +// Returns whether or not this is a big valued key +// +BOOLEAN +FORCEINLINE +CmpIsKeyValueBig(IN PHHIVE Hive, + IN ULONG Length) +{ + /* Check if the hive is XP Beta 1 or newer */ + if (Hive->Version >= HSYS_WHISTLER_BETA1) + { + /* Check if the key length is valid for a big value key */ + if ((Length < CM_KEY_VALUE_SPECIAL_SIZE) && (Length > CM_KEY_VALUE_BIG)) + { + /* Yes, this value is big */ + return TRUE; + } + } + + /* Not a big value key */ + return FALSE; +} + +// +// Returns the hashkey corresponding to a convkey +// +#define GET_HASH_KEY(ConvKey) \ + ((CMP_HASH_IRRATIONAL * (ConvKey)) % CMP_HASH_PRIME) + +// +// Returns the index into the hash table, or the entry itself +// +#define GET_HASH_INDEX(ConvKey) \ + GET_HASH_KEY(ConvKey) % CmpHashTableSize +#define GET_HASH_ENTRY(Table, ConvKey) \ + (*Table[GET_HASH_INDEX(ConvKey)]) + +// +// Returns whether or not the cell is cached +// +#define CMP_IS_CELL_CACHED(c) \ + (((c) & HCELL_CACHED) && ((c) != HCELL_NIL)) + +// +// Return data from a cached cell +// +#define CMP_GET_CACHED_CELL(c) \ + (ULONG_PTR)((c) & ~HCELL_CACHED) +#define CMP_GET_CACHED_DATA(c) \ + (&(((PCM_CACHED_VALUE_INDEX)(CMP_GET_CACHED_CELL(c)))->Data.CellData)) +#define CMP_GET_CACHED_INDEX(c) \ + (&(((PCM_CACHED_ENTRY)(CMP_GET_CACHED_CELL(c)))->CellIndex)) +#define CMP_GET_CACHED_VALUE(c) \ + (&(((PCM_CACHED_VALUE)(CMP_GET_CACHED_CELL(c)))->KeyValue)) + +// +// Makes sure that the registry is locked +// +#define CMP_ASSERT_REGISTRY_LOCK() \ + ASSERT((CmpSpecialBootCondition == TRUE) || \ + (CmpTestRegistryLock() == TRUE)) + +// +// Makes sure that the registry is exclusively locked +// +#define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK() \ + ASSERT((CmpSpecialBootCondition == TRUE) || \ + (CmpTestRegistryLockExclusive() == TRUE)) + +// +// Checks if a KCB is exclusively locked +// +#define CmpIsKcbLockedExclusive(k) \ + (GET_HASH_ENTRY(CmpCacheTable, \ + (k)->ConvKey).Owner == KeGetCurrentThread()) + +// +// Exclusively acquires a KCB +// +#define CmpAcquireKcbLockExclusive(k) \ +{ \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpCacheTable, \ + (k)->ConvKey).Lock); \ + GET_HASH_ENTRY(CmpCacheTable, \ + (k)->ConvKey).Owner = KeGetCurrentThread(); \ +} + +// +// Releases an exlusively or shared acquired KCB +// +#define CmpReleaseKcbLock(k) \ +{ \ + GET_HASH_ENTRY(CmpCacheTable, (k)->ConvKey).Owner = NULL; \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpCacheTable, \ + (k)->ConvKey).Lock); \ +} + +// +// Exclusively acquires an NCB +// +#define CmpAcquireNcbLockExclusive(n) \ +{ \ + ExAcquirePushLockExclusive(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (n)->ConvKey).Lock); \ +} + +// +// Releases an exlusively or shared acquired NCB +// +#define CmpReleaseNcbLock(k) \ +{ \ + ExReleasePushLock(&GET_HASH_ENTRY(CmpNameCacheTable, \ + (k)->ConvKey).Lock); \ +} Added: trunk/reactos/ntoskrnl/config/cmboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmboot.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmboot.c (added) +++ trunk/reactos/ntoskrnl/config/cmboot.c Wed May 9 22:30:21 2007 @@ -1,0 +1,127 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmboot.c + * PURPOSE: Configuration Manager - Boot Initialization + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +HCELL_INDEX +NTAPI +CmpFindControlSet(IN PHHIVE SystemHive, + IN HCELL_INDEX RootCell, + IN PUNICODE_STRING SelectKeyName, + OUT PBOOLEAN AutoSelect) +{ + UNICODE_STRING KeyName; + PCM_KEY_NODE Node; + HCELL_INDEX SelectCell, AutoSelectCell, SelectValueCell, ControlSetCell; + HCELL_INDEX CurrentValueCell; + PCM_KEY_VALUE KeyValue; + ULONG Length; + PULONG ControlSetId; + ANSI_STRING ControlSetAnsiName; + CHAR Buffer[128]; + WCHAR WideBuffer[128]; + NTSTATUS Status; + PULONG CurrentData; + + /* Sanity check */ + ASSERT(SystemHive->ReleaseCellRoutine == NULL); + + /* Get the Select subkey */ + RtlInitUnicodeString(&KeyName, L"select"); + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, RootCell); + if (!Node) return HCELL_NIL; + SelectCell = CmpFindSubKeyByName(SystemHive, Node, &KeyName); + if (SelectCell == HCELL_NIL) return SelectCell; + + /* Get AutoSelect value */ + RtlInitUnicodeString(&KeyName, L"AutoSelect"); + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); + if (!Node) return HCELL_NIL; + AutoSelectCell = CmpFindValueByName(SystemHive, Node, &KeyName); + if (AutoSelectCell == HCELL_NIL) + { + /* Assume TRUE if the value is missing. */ + *AutoSelect = TRUE; + } + else + { + /* Read the value */ + KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, AutoSelectCell); + if (KeyValue == NULL) return HCELL_NIL; + + /* Convert it to a boolean */ + *AutoSelect = *(PBOOLEAN)CmpValueToData(SystemHive, KeyValue, &Length); + } + + /* Now find the control set being looked up */ + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); + if (!Node) return HCELL_NIL; + SelectValueCell = CmpFindValueByName(SystemHive, Node, SelectKeyName); + if (SelectValueCell == HCELL_NIL) return SelectValueCell; + + /* Read the value (corresponding to the CCS ID) */ + KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, SelectValueCell); + if (!KeyValue) return HCELL_NIL; + if (KeyValue->Type != REG_DWORD) return HCELL_NIL; + ControlSetId = (PULONG)CmpValueToData(SystemHive, KeyValue, &Length); + + /* Now build an Ansi String for the CCS's Name */ + sprintf(Buffer, "ControlSet%03lu", *ControlSetId); + ControlSetAnsiName.Length = (USHORT)strlen(Buffer); + ControlSetAnsiName.MaximumLength = (USHORT)strlen(Buffer); + ControlSetAnsiName.Buffer = Buffer; + + /* And convert it to Unicode... */ + KeyName.MaximumLength = 256; + KeyName.Buffer = WideBuffer; + Status = RtlAnsiStringToUnicodeString(&KeyName, + &ControlSetAnsiName, + FALSE); + if (!NT_SUCCESS(Status)) return HCELL_NIL; + + /* Now open it */ + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, RootCell); + if (!Node) return HCELL_NIL; + ControlSetCell = CmpFindSubKeyByName(SystemHive, Node, &KeyName); + if (ControlSetCell == HCELL_NIL) return ControlSetCell; + + /* Get the value of the "Current" CCS */ + RtlInitUnicodeString(&KeyName, L"Current"); + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, SelectCell); + if (!Node) return HCELL_NIL; + CurrentValueCell = CmpFindValueByName(SystemHive, Node, &KeyName); + + /* Make sure it exists */ + if (CurrentValueCell != HCELL_NIL) + { + /* Get the current value and make sure its a ULONG */ + KeyValue = (PCM_KEY_VALUE)HvGetCell(SystemHive, CurrentValueCell); + if (!KeyValue) return HCELL_NIL; + if (KeyValue->Type == REG_DWORD) + { + /* Get the data and update it */ + CurrentData = (PULONG)CmpValueToData(SystemHive, + KeyValue, + &Length); + if (!CurrentData) return HCELL_NIL; + *CurrentData = *ControlSetId; + } + } + + /* Return the CCS Cell */ + return ControlSetCell; +} Added: trunk/reactos/ntoskrnl/config/cmcontrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcontrl.c (added) +++ trunk/reactos/ntoskrnl/config/cmcontrl.c Wed May 9 22:30:21 2007 @@ -1,0 +1,262 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmcontrl.c + * PURPOSE: Configuration Manager - Control Set Management + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +LANGID +NTAPI +CmpConvertLangId(IN LPWSTR Name, + IN ULONG NameLength) +{ + ULONG i; + WCHAR p; + LANGID LangId = 0; + ULONG IdCode; + + /* Convert the length in chars and loop */ + NameLength = NameLength / sizeof(WCHAR); + for (i = 0; i < NameLength; i++) + { + /* Get the character */ + p = Name[i]; + + /* Handle each case */ + if ((p >= L'0') && (p <= L'9')) + { + /* Handle digits*/ + IdCode = p - L'0'; + } + else if ((p >= L'A') && (p <= L'F')) + { + /* Handle upper-case letters */ + IdCode = p - L'A' + 10; + } + else if ((p >= L'a') && (p <= L'f')) + { + /* Handle lower-case letters */ + IdCode = p - L'a' + 10; + } + else + { + /* Unhandled case, return what we have till now */ + break; + } + + /* If the ID Code is >= 16, then we're done */ + if (IdCode >= 16) break; + + /* Build the Language ID */ + LangId = (LangId << 4) | (LANGID)IdCode; + } + + /* Return the Language ID */ + return LangId; +} + +HCELL_INDEX +NTAPI +CmpWalkPath(IN PHHIVE SystemHive, + IN HCELL_INDEX ParentCell, + IN LPWSTR Path) +{ + UNICODE_STRING UnicodePath, NextName; + BOOLEAN LastName; + HCELL_INDEX CurrentCell = ParentCell; + PCM_KEY_NODE Node; + + /* We shouldn't have a release routine at this point */ + ASSERT(SystemHive->ReleaseCellRoutine == NULL); + + /* Initialize the Unicode path and start looping */ + RtlInitUnicodeString(&UnicodePath, Path); + while (TRUE) + { + /* Get the next name */ + CmpGetNextName(&UnicodePath, &NextName, &LastName); + if (!NextName.Length) return CurrentCell; + + /* Get the subkey */ + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, CurrentCell); + if (!Node) return HCELL_NIL; + CurrentCell = CmpFindSubKeyByName(SystemHive, Node, &NextName); + if (CurrentCell == HCELL_NIL) return CurrentCell; + } +} + +VOID +NTAPI +CmGetSystemControlValues(IN PVOID SystemHiveData, + IN PCM_SYSTEM_CONTROL_VECTOR ControlVector) +{ + PHHIVE SystemHive = (PHHIVE)&CmControlHive; + NTSTATUS Status; + HCELL_INDEX RootCell, BaseCell, KeyCell, ValueCell; + ULONG Length, DataSize; + PCM_KEY_NODE Node; + PCM_KEY_VALUE ValueData; + UNICODE_STRING KeyName; + BOOLEAN Auto, IsSmallKey; + PVOID Buffer; + + /* Initialize the Hive View List and the security cache */ + RtlZeroMemory(SystemHive, sizeof(SystemHive)); + CmpInitHiveViewList((PCMHIVE)SystemHive); + CmpInitSecurityCache((PCMHIVE)SystemHive); + + /* Initialize the Hive */ + Status = HvInitialize(SystemHive, + HINIT_MEMORY_INPLACE, /* FIXME: Should be flat */ + HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + (ULONG_PTR)SystemHiveData, + 1, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) KeBugCheckEx(BAD_SYSTEM_CONFIG_INFO, 1, 1, 0, 0); + + /* Sanity check, flat hives don't have release routines */ + ASSERT(SystemHive->ReleaseCellRoutine == NULL); + + /* FIXME: Prepare it */ + CmPrepareHive(SystemHive); + + /* Set the Root Cell */ + RootCell = ((PHBASE_BLOCK)SystemHiveData)->RootCell; + + /* Find the current control set */ + RtlInitUnicodeString(&KeyName, L"current"); + BaseCell = CmpFindControlSet(SystemHive, RootCell, &KeyName, &Auto); + if (BaseCell == HCELL_NIL) KeBugCheckEx(BAD_SYSTEM_CONFIG_INFO, 1, 2, 0, 0); + + /* Find the control subkey */ + RtlInitUnicodeString(&KeyName, L"control"); + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, BaseCell); + BaseCell = CmpFindSubKeyByName(SystemHive, Node, &KeyName); + if (BaseCell == HCELL_NIL) KeBugCheckEx(BAD_SYSTEM_CONFIG_INFO,1 , 3, 0, 0); + + /* Loop each key */ + while (ControlVector->KeyPath) + { + /* Assume failure */ + Length = -1; + + /* Get the cell for this key */ + KeyCell = CmpWalkPath(SystemHive, BaseCell, ControlVector->KeyPath); + if (KeyCell != HCELL_NIL) + { + /* Now get the cell for the value */ + RtlInitUnicodeString(&KeyName, ControlVector->ValueName); + Node = (PCM_KEY_NODE)HvGetCell(SystemHive, KeyCell); + ValueCell = CmpFindValueByName(SystemHive, Node, &KeyName); + if (ValueCell != HCELL_NIL) + { + /* Check if there's any data */ + if (!ControlVector->BufferLength) + { + /* No, the buffer will only be large enough for a ULONG */ + DataSize = sizeof(ULONG); + } + else + { + /* Yes, save the data size */ + DataSize = *ControlVector->BufferLength; + } + + /* Get the actual data */ + ValueData = (PCM_KEY_VALUE)HvGetCell(SystemHive, ValueCell); + + /* Check if this is a small key */ + IsSmallKey = CmpIsKeyValueSmall(&Length, ValueData->DataLength); + + /* If the length is bigger then our buffer, normalize it */ + if (DataSize < Length) Length = DataSize; + + /* Make sure we have some data */ + if (Length > 0) + { + /* Check if this was a small key */ + if (IsSmallKey) + { + /* The buffer is directly safe to read */ + Buffer = (PVOID)(&(ValueData->Data)); + } + else + { + /* Use the longer path */ + Buffer = (PVOID)HvGetCell(SystemHive, ValueData->Data); + } + + /* Sanity check if this is a small key */ + ASSERT((IsSmallKey ? + (Length <= CM_KEY_VALUE_SMALL) : TRUE)); + + /* Copy the data in the buffer */ + RtlCopyMemory(ControlVector->Buffer, Buffer, Length); + } + + /* Check if we should return the data type */ + if (ControlVector->Type) + { + /* Return the type that we read */ + *ControlVector->Type = ValueData->Type; + } + } + } + + /* Return the size that we read */ + if (ControlVector->BufferLength) *ControlVector->BufferLength = Length; + + /* Go to the next entry */ + ControlVector++; + } + + /* Check if the ID is in the registry */ + if (CmDefaultLanguageIdType == REG_SZ) + { + /* Read it */ + PsDefaultSystemLocaleId = + (LCID)CmpConvertLangId(CmDefaultLanguageId, + CmDefaultLanguageIdLength); + } + else + { + /* Use EN_US by default */ + PsDefaultSystemLocaleId = 0x409; + } + + /* Check if the ID Is in the registry */ + if (CmInstallUILanguageIdType == REG_SZ) + { + /* Read it */ + PsInstallUILanguageId = CmpConvertLangId(CmInstallUILanguageId, + CmInstallUILanguageIdLength); + } + else + { + /* Otherwise, use the default */ + PsInstallUILanguageId = LANGIDFROMLCID(PsDefaultSystemLocaleId); + } + + /* Set the defaults for the Thread UI */ + PsDefaultThreadLocaleId = PsDefaultSystemLocaleId; + PsDefaultUILanguageId = PsInstallUILanguageId; +} Added: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c (added) +++ trunk/reactos/ntoskrnl/config/cmdata.c Wed May 9 22:30:21 2007 @@ -1,0 +1,718 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmdata.c + * PURPOSE: Configuration Manager - Global Configuration Data + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +ULONG DummyData; +ULONG CmNtGlobalFlag; +ULONG CmNtCSDVersion; + +WCHAR CmDefaultLanguageId[12]; +ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); +ULONG CmDefaultLanguageIdType; + +WCHAR CmInstallUILanguageId[12]; +ULONG CmInstallUILanguageIdLength = sizeof(CmInstallUILanguageId); +ULONG CmInstallUILanguageIdType; + +WCHAR CmSuiteBuffer[128]; +ULONG CmSuiteBufferLength = sizeof(CmSuiteBuffer); +ULONG CmSuiteBufferType; + +CMHIVE CmControlHive; + +CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = +{ + { + L"Session Manager", + L"ProtectionMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ObjectSecurityMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"LUIDDeviceMapsDisabled", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseDirectories", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseObjects", + &DummyData, + NULL, + NULL + }, + + { + L"LSA\\audit", + L"ProcessAccessesToAudit", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"ActiveTimeBias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"Bias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"RealTimeIsUniversal", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"GlobalFlag", + &CmNtGlobalFlag, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagingFileQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"AllocationPreference", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DynamicMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionImageSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolUsageMaximum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MapAllocationFragment", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolMaximumPercent", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeSystemCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeStackSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LowMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"HighMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DisablePagingExecutive", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ModifiedPageLife", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SecondLevelDataCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ClearPageFileAtShutdown", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagSmallTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagBigTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTag", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagOverruns", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SnapUnloads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ProtectNonPagedPool", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackLockedPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackPtes", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDrivers", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDriverLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargePageMinimum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"EnforceWriteProtection", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MakeLowMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"WriteWatch", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalCriticalWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalDelayedWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"PriorityQuantumMatrix", + &DummyData, + &DummyData, + NULL + }, + + { + L"Session Manager\\Kernel", + L"DpcQueueDepth", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"MinimumDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"AdjustDpcThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"IdealDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"CountOperations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"LargeIrpStackLocations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"IoVerifierLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ResourceTimeoutCount", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"CriticalSectionTimeout", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentReserve", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentCommit", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitTotalFreeThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitFreeBlockThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"ProductOptions", + L"ProductType", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSEnabled", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSAppCompat", + &DummyData, + NULL, + NULL + }, + + + { + L"ProductOptions", + L"ProductSuite", + CmSuiteBuffer, + &CmSuiteBufferLength, + &CmSuiteBufferType + }, + + { + L"Windows", + L"CSDVersion", + &CmNtCSDVersion, + NULL, + NULL + }, + + { + L"Nls\\Language", + L"Default", + CmDefaultLanguageId, + &CmDefaultLanguageIdLength, + &CmDefaultLanguageIdType + }, + + { + L"Nls\\Language", + L"InstallLanguage", + CmInstallUILanguageId, + &CmInstallUILanguageIdLength, + &CmInstallUILanguageIdType + }, + + { + L"\0\0", + L"RegistrySizeLimit", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager", + L"ForceNpxEmulation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"PowerPolicySimulate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"MaxTimeSeparationBeforeCorrect", + &DummyData, + NULL, + NULL + }, + + { + L"Windows", + L"ShutdownTime", + &DummyData, + &DummyData, + NULL + }, + + { + L"PriorityControl", + L"Win32PrioritySeparation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"EnableTimerWatchdog", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"Debugger Retries", + &DummyData, + NULL, + NULL + }, + + { + L"WMI", + L"MaxEventSize", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"UsePerformanceClock", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"TraceAlignment", + &DummyData, + NULL, + NULL + }, + + { + NULL, + NULL, + NULL, + NULL, + NULL + } +}; Added: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (added) +++ trunk/reactos/ntoskrnl/config/cmindex.c Wed May 9 22:30:21 2007 @@ -1,0 +1,646 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmindex.c + * PURPOSE: Configuration Manager - Cell Indexes + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +LONG +NTAPI +CmpDoCompareKeyName(IN PHHIVE Hive, + IN PUNICODE_STRING SearchName, + IN HCELL_INDEX Cell) +{ + PCM_KEY_NODE Node; + UNICODE_STRING KeyName; + LONG Result; + + /* Get the node */ + Node = (PCM_KEY_NODE)HvGetCell(Hive, Cell); + if (!Node) return 2; + + /* Check if it's compressed */ + if (Node->Flags & KEY_COMP_NAME) + { + /* Compare compressed names */ + Result = CmpCompareCompressedName(SearchName, + Node->Name, + Node->NameLength); + } + else + { + /* Compare the Unicode name directly */ + KeyName.Buffer = Node->Name; + KeyName.Length = Node->NameLength; + KeyName.MaximumLength = KeyName.Length; + Result = RtlCompareUnicodeString(SearchName, &KeyName, TRUE); + } + + /* Release the cell and return the normalized result */ + HvReleaseCell(Hive, Cell); + return (Result == 0) ? Result : ((Result > 0) ? 1 : -1); +} + +LONG +NTAPI +CmpCompareInIndex(IN PHHIVE Hive, + IN PUNICODE_STRING SearchName, + IN ULONG Count, + IN PCM_KEY_INDEX Index, + IN PHCELL_INDEX SubKey) +{ + PCM_KEY_FAST_INDEX FastIndex; + PCM_INDEX FastEntry; + LONG Result; + ULONG i; + ULONG ActualNameLength = 4, CompareLength, NameLength; + WCHAR p, pp; + + /* Assume failure */ + *SubKey = HCELL_NIL; + + /* Check if we are a fast or hashed leaf */ + if ((Index->Signature == CM_KEY_FAST_LEAF) || + (Index->Signature == CM_KEY_HASH_LEAF)) + { + /* Get the Fast/Hash Index */ + FastIndex = (PCM_KEY_FAST_INDEX)Index; + FastEntry = &FastIndex->List[Count]; + + /* Check if we are a hash leaf, in which case we skip all this */ + if (Index->Signature == CM_KEY_FAST_LEAF) + { + /* Find out just how much of the name is there */ + for (i = 0; i < 4; i++) + { + /* Check if this entry is empty */ + if (!FastEntry->NameHint[i]) + { + /* Only this much! */ + ActualNameLength = i; + break; + } + } + + /* How large is the name and how many characters to compare */ + NameLength = SearchName->Length / sizeof(WCHAR); + CompareLength = min(NameLength, ActualNameLength); + + /* Loop all the chars we'll test */ + for (i = 0; i < CompareLength; i++) + { + /* Get one char from each buffer */ + p = SearchName->Buffer[i]; + pp = FastEntry->NameHint[i]; + + /* See if they match and return result if they don't */ + Result = (LONG)RtlUpcaseUnicodeChar(p) - + (LONG)RtlUpcaseUnicodeChar(pp); + if (Result) return (Result > 0) ? 1 : -1; + } + } + + /* If we got here then we have to do a full compare */ + Result = CmpDoCompareKeyName(Hive, SearchName, FastEntry->Cell); + if (Result == 2) return Result; + if (!Result) *SubKey = FastEntry->Cell; + } + else + { + /* We aren't, so do a name compare and return the subkey found */ + Result = CmpDoCompareKeyName(Hive, SearchName, Index->List[Count]); + if (Result == 2) return Result; + if (!Result) *SubKey = Index->List[Count]; + } + + /* Return the comparison result */ + return Result; +} + +ULONG +NTAPI +CmpFindSubKeyInRoot(IN PHHIVE Hive, + IN PCM_KEY_INDEX Index, + IN PUNICODE_STRING SearchName, + IN PHCELL_INDEX SubKey) +{ + ULONG High, Low = 0, i, ReturnIndex; + HCELL_INDEX LeafCell; + PCM_KEY_INDEX Leaf; + LONG Result; + + /* Verify Index for validity */ + ASSERTMSG("We don't do a linear search yet!\n", FALSE); + ASSERT(Index->Count != 0); + ASSERT(Index->Signature == CM_KEY_INDEX_ROOT); + + /* Set high limit and loop */ + High = Index->Count - 1; + while (TRUE) + { + /* Choose next entry */ + i = ((High - Low) / 2) + Low; + + /* Get the leaf cell and then the leaf itself */ + LeafCell = Index->List[i]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (Leaf) + { + /* Make sure the leaf is valid */ + ASSERT((Leaf->Signature == CM_KEY_INDEX_LEAF) || + (Leaf->Signature == CM_KEY_FAST_LEAF) || + (Leaf->Signature == CM_KEY_HASH_LEAF)); + ASSERT(Leaf->Count != 0); + + /* Do the compare */ + Result = CmpCompareInIndex(Hive, + SearchName, + Leaf->Count - 1, + Leaf, + SubKey); + if (Result == 2) goto Big; + + /* Check if we found the leaf */ + if (!Result) + { + /* We found the leaf */ + *SubKey = LeafCell; + ReturnIndex = i; + goto Return; + } + + /* Check for negative result */ + if (Result < 0) + { + /* If we got here, we should be at -1 */ + ASSERT(Result == -1); + + /* Do another lookup, since we might still be in the right leaf */ + Result = CmpCompareInIndex(Hive, + SearchName, + 0, + Leaf, + SubKey); + if (Result == 2) goto Big; + + /* Check if it's not below */ + if (Result >= 0) + { + /* + * If the name was first below, and now it is above, + * then this means that it is somewhere in this leaf. + * Make sure we didn't get some weird result + */ + ASSERT((Result == 1) || (Result == 0)); + + /* Return it */ + *SubKey = LeafCell; + ReturnIndex = Low; + goto Return; + } + + /* Update the limit to this index, since we know it's not higher. */ + High = i; + } + else + { + /* Update the base to this index, since we know it's not lower. */ + Low = i; + } + } + else + { +Big: + /* This was some sort of special key */ + ReturnIndex = 0x80000000; + goto ReturnFailure; + } + + /* Check if there is only one entry left */ + if ((High - Low) <= 1) break; + + /* Release the leaf cell */ + HvReleaseCell(Hive, LeafCell); + } + + /* Make sure we got here for the right reasons */ + ASSERT((High - Low == 1) || (High == Low)); + + /* Get the leaf cell and the leaf */ + LeafCell = Index->List[Low]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) goto Big; + + /* Do the compare */ + Result = CmpCompareInIndex(Hive, + SearchName, + Leaf->Count-1, + Leaf, + SubKey); + if (Result == 2) goto Big; + + /* Check if we found it */ + if (!Result) + { + /* We got lucky...return it */ + *SubKey = LeafCell; + ReturnIndex = Low; + goto Return; + } + + /* It's below, so could still be in this leaf */ + if (Result < 0) + { + /* Make sure we're -1 */ + ASSERT(Result == -1); + + /* Do a search from the bottom */ + Result = CmpCompareInIndex(Hive, SearchName, 0, Leaf, SubKey); + if (Result == 2) goto Big; + + /* + * Check if it's above, which means that it's within the ranges of our + * leaf (since we were below before). + */ + if (Result >= 0) + { + /* Sanity check */ + ASSERT((Result == 1) || (Result == 0)); + + /* Yep, so we're in the right leaf; return it. */ + *SubKey = LeafCell; + ReturnIndex = Low; + goto Return; + } + + /* It's still below us, so fail */ + ReturnIndex = Low; + goto ReturnFailure; + } + + /* Release the leaf cell */ + HvReleaseCell(Hive, LeafCell); + + /* Well the low didn't work too well, so try the high. */ + LeafCell = Index->List[High]; + Leaf = (PCM_KEY_INDEX)HvGetCell(Hive, LeafCell); + if (!Leaf) goto Big; + + /* Do the compare */ + Result = CmpCompareInIndex(Hive, + SearchName, + Leaf->Count - 1, + Leaf, + SubKey); + if (Result == 2) goto Big; + + /* Check if we found it */ + if (Result == 0) + { + /* We got lucky... return it */ + *SubKey = LeafCell; + ReturnIndex = High; + goto Return; + } + + /* Check if we are too high */ + if (Result < 0) + { + /* Make sure we're -1 */ + ASSERT(Result == -1); + + /* + * Once again... since we were first too low and now too high, then + * this means we are within the range of this leaf... return it. + */ + *SubKey = LeafCell; + ReturnIndex = High; + goto Return; + } + + /* If we got here, then we are too low, again. */ + ReturnIndex = High; + + /* Failure path */ +ReturnFailure: + *SubKey = HCELL_NIL; + + /* Return path...check if we have a leaf to free */ +Return: + if (Leaf) HvReleaseCell(Hive, LeafCell); + + /* Return the index */ + return ReturnIndex; +} + +ULONG +NTAPI +CmpFindSubKeyInLeaf(IN PHHIVE Hive, + IN PCM_KEY_INDEX Index, + IN PUNICODE_STRING SearchName, + IN PHCELL_INDEX SubKey) +{ + ULONG High, Low = 0, i; + LONG Result; + + /* Verify Index for validity */ + ASSERT((Index->Signature == CM_KEY_INDEX_LEAF) || + (Index->Signature == CM_KEY_FAST_LEAF) || + (Index->Signature == CM_KEY_HASH_LEAF)); + + /* Get the upper bound and middle entry */ + High = Index->Count - 1; +#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED + i = High / 2; +#else + i = 0; +#endif + + /* Check if we don't actually have any entries */ + if (!Index->Count) + { + /* Return failure */ + *SubKey = HCELL_NIL; + return 0; + } + + /* Start compare loop */ + while (TRUE) + { + /* Do the actual comparison and check the result */ + Result = CmpCompareInIndex(Hive, SearchName, i, Index, SubKey); + if (Result == 2) + { + /* Fail with special value */ + *SubKey = HCELL_NIL; + return 0x80000000; + } + + /* Check if we got lucky and found it */ + if (!Result) return i; + + /* Check if the result is below us */ + if (Result < 0) + { + /* Set the new bound; it can't be higher then where we are now. */ + ASSERT(Result == -1); + High = i; + } + else + { + /* Set the new bound... it can't be lower then where we are now. */ + ASSERT(Result == 1); + Low = i; + } + +#ifdef SOMEONE_WAS_NICE_ENOUGH_TO_MAKE_OUR_CELLS_LEXICALLY_SORTED + /* Check if this is the last entry, if so, break out and handle it */ + if ((High - Low) <= 1) break; + + /* Set the new index */ + i = ((High - Low) / 2) + Low; +#else + if (++i > High) + { + /* Return failure */ + *SubKey = HCELL_NIL; + return 0; + } +#endif + } + + /* + * If we get here, High - Low = 1 or High == Low + * Simply look first at Low, then at High + */ + Result = CmpCompareInIndex(Hive, SearchName, Low, Index, SubKey); + if (Result == 2) + { + /* Fail with special value */ + *SubKey = HCELL_NIL; + return 0x80000000; + } + + /* Check if we got lucky and found it */ + if (!Result) return Low; + + /* Check if the result is below us */ + if (Result < 0) + { + /* Return the low entry */ + ASSERT(Result == -1); + return Low; + } + + /* + * If we got here, then just check the high and return it no matter what + * the result is (since we're a leaf, it has to be near there anyway). + */ + Result = CmpCompareInIndex(Hive, SearchName, High, Index, SubKey); + if (Result == 2) + { + /* Fail with special value */ + *SubKey = HCELL_NIL; + return 0x80000000; + } + + /* Return the high */ + return High; +} + +ULONG +NTAPI +CmpComputeHashKey(IN ULONG Hash, + IN PUNICODE_STRING Name, + IN BOOLEAN AllowSeparators) +{ + LPWSTR Cp; + ULONG Value, i; + + /* Make some sanity checks on our parameters */ + ASSERT((Name->Length == 0) || + (AllowSeparators) || + (Name->Buffer[0] != OBJ_NAME_PATH_SEPARATOR)); + + /* If the name is empty, there is nothing to hash! */ + if (!Name->Length) return Hash; + + /* Set the buffer and loop every character */ + Cp = Name->Buffer; + for (i = 0; i < Name->Length; i += sizeof(WCHAR), Cp++) + { + /* Make sure we don't have a separator when we shouldn't */ + ASSERT(AllowSeparators || (*Cp != OBJ_NAME_PATH_SEPARATOR)); + + /* Check what kind of char we have */ + if (*Cp >= L'a') + { + /* In the lower case region... is it truly lower case? */ + if (*Cp < L'z') + { + /* Yes! Calculate it ourselves! */ + Value = *Cp - L'a' + L'A'; + } + else + { + /* No, use the API */ + Value = RtlUpcaseUnicodeChar(*Cp); + } + } + else + { + /* Reuse the char, it's already upcased */ + Value = *Cp; + } + + /* Multiply by a prime and add our value */ + Hash *= 37; + Hash += Value; + } + + /* Return the hash */ + return Hash; +} + +HCELL_INDEX +NTAPI +CmpFindSubKeyByHash(IN PHHIVE Hive, + IN PCM_KEY_FAST_INDEX FastIndex, + IN PUNICODE_STRING SearchName) +{ + ULONG HashKey, i; + PCM_INDEX FastEntry; + + /* Make sure it's really a hash */ + ASSERT(FastIndex->Signature == CM_KEY_HASH_LEAF); + + /* Compute the hash key for the name */ + HashKey = CmpComputeHashKey(0, SearchName, FALSE); + + /* Loop all the entries */ + for (i = 0; i < FastIndex->Count; i++) + { + /* Get the entry */ + FastEntry = &FastIndex->List[i]; + + /* Compare the hash first */ + if (FastEntry->HashKey == HashKey) + { + /* Go ahead for a full compare */ + if (!(CmpDoCompareKeyName(Hive, SearchName, FastEntry->Cell))) + { + /* It matched, return the cell */ + return FastEntry->Cell; + } + } + } + + /* If we got here then we failed */ + return HCELL_NIL; +} + +HCELL_INDEX +NTAPI +CmpFindSubKeyByName(IN PHHIVE Hive, + IN PCM_KEY_NODE Parent, + IN PUNICODE_STRING SearchName) +{ + ULONG i; + PCM_KEY_INDEX IndexRoot; + HCELL_INDEX SubKey, CellToRelease; + ULONG Found; + + /* Loop each storage type */ + for (i = 0; i < Hive->StorageTypeCount; i++) + { + /* Make sure the parent node has subkeys */ + if (Parent->SubKeyCounts[i]) + { + /* Get the Index */ + IndexRoot = (PCM_KEY_INDEX)HvGetCell(Hive, Parent->SubKeyLists[i]); +#if 0 + /* Make sure we have one and that the cell is allocated */ + ASSERT((IndexRoot == NULL) || + HvIsCellAllocated(Hive, Parent->SubKeyLists[i])); +#endif + /* Fail if we don't actually have an index root */ + if (!IndexRoot) return HCELL_NIL; + + /* Get the cell we'll need to release */ + CellToRelease = Parent->SubKeyLists[i]; + + /* Check if this is another index root */ + if (IndexRoot->Signature == CM_KEY_INDEX_ROOT) + { + /* Lookup the name in the root */ + Found = CmpFindSubKeyInRoot(Hive, + IndexRoot, + SearchName, + &SubKey); + + /* Release the previous cell */ + ASSERT(CellToRelease != HCELL_NIL); + HvReleaseCell(Hive, CellToRelease); + + /* Make sure we found something valid */ + if (Found < 0) break; + + /* Get the new Index Root and set the new cell to be released */ + if (SubKey == HCELL_NIL) continue; + CellToRelease = SubKey; + IndexRoot = (PCM_KEY_INDEX)HvGetCell(Hive, SubKey); + } + + /* Make sure the signature is what we expect it to be */ + ASSERT((IndexRoot->Signature == CM_KEY_INDEX_LEAF) || + (IndexRoot->Signature == CM_KEY_FAST_LEAF) || + (IndexRoot->Signature == CM_KEY_HASH_LEAF)); + + /* Check if this isn't a hashed leaf */ + if (IndexRoot->Signature != CM_KEY_HASH_LEAF) + { + /* Find the subkey in the leaf */ + Found = CmpFindSubKeyInLeaf(Hive, + IndexRoot, + SearchName, + &SubKey); + + /* Release the previous cell */ + ASSERT(CellToRelease != HCELL_NIL); + HvReleaseCell(Hive, CellToRelease); + + /* Make sure we found a valid index */ + if (Found < 0) break; + } + else + { + /* Find the subkey in the hash */ + SubKey = CmpFindSubKeyByHash(Hive, + (PCM_KEY_FAST_INDEX)IndexRoot, + SearchName); + + /* Release the previous cell */ + ASSERT(CellToRelease != HCELL_NIL); + HvReleaseCell(Hive, CellToRelease); + } + + /* Make sure we got a valid subkey and return it */ + if (SubKey != HCELL_NIL) return SubKey; + } + } + + /* If we got here, then we failed */ + return HCELL_NIL; +} Added: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmmapvw.c (added) +++ trunk/reactos/ntoskrnl/config/cmmapvw.c Wed May 9 22:30:21 2007 @@ -1,0 +1,33 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmmapvw.c + * PURPOSE: Configuration Manager - Map-Viewed Hive Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpInitHiveViewList(IN PCMHIVE Hive) +{ + /* Initialize the list heads */ + InitializeListHead(&Hive->LRUViewListHead); + InitializeListHead(&Hive->PinViewListHead); + + /* Reset data */ + Hive->MappedViews = 0; + Hive->PinnedViews = 0; + Hive->UseCount = 0; +} + Added: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (added) +++ trunk/reactos/ntoskrnl/config/cmname.c Wed May 9 22:30:21 2007 @@ -1,0 +1,166 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmname.c + * PURPOSE: Configuration Manager - Name Management + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +LONG +NTAPI +CmpCompareCompressedName(IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength) +{ + WCHAR *p; + CHAR *pp; + WCHAR p1, p2; + USHORT SearchLength; + LONG Result; + + /* Set the pointers and length and then loop */ + p = SearchName->Buffer; + pp = (PCHAR)CompressedName; + SearchLength = (SearchName->Length / sizeof(WCHAR)); + while ((SearchLength) && (NameLength)) + { + /* Get the characters */ + p1 = *p++; + p2 = (WCHAR)(*pp++); + + /* Check if we have a direct match */ + if (p1 != p2) + { + /* See if they match and return result if they don't */ + Result = (LONG)RtlUpcaseUnicodeChar(p1) - + (LONG)RtlUpcaseUnicodeChar(p2); + if (Result) return Result; + } + + /* Next chars */ + SearchLength--; + NameLength--; + } + + /* Return the difference directly */ + return SearchLength - NameLength; +} + +BOOLEAN +NTAPI +CmpFindNameInList(IN PHHIVE Hive, + IN PCHILD_LIST ChildList, + IN PUNICODE_STRING Name, + IN PULONG ChildIndex, + IN PHCELL_INDEX CellIndex) +{ + PCELL_DATA CellData; + HCELL_INDEX CellToRelease = HCELL_NIL; + ULONG i; + PCM_KEY_VALUE KeyValue; + LONG Result; + UNICODE_STRING SearchName; + BOOLEAN Success; + + /* Make sure there's actually something on the list */ + if (ChildList->Count != 0) + { + /* Get the cell data */ + CellData = (PCELL_DATA)HvGetCell(Hive, ChildList->List); + if (!CellData) + { + /* Couldn't get the cell... tell the caller */ + *CellIndex = HCELL_NIL; + return FALSE; + } + + /* Now loop every entry */ + for (i = 0; i < ChildList->Count; i++) + { + /* Check if we have a cell to release */ + if (CellToRelease != HCELL_NIL) + { + /* Release it */ + HvReleaseCell(Hive, CellToRelease); + CellToRelease = HCELL_NIL; + } + + /* Get this value */ + KeyValue = (PCM_KEY_VALUE)HvGetCell(Hive, CellData->u.KeyList[i]); + if (!KeyValue) + { + /* Return with no data found */ + *CellIndex = HCELL_NIL; + Success = FALSE; + goto Return; + } + + /* Save the cell to release */ + CellToRelease = CellData->u.KeyList[i]; + + /* Check if it's a compressed value name */ + if (KeyValue->Flags & VALUE_COMP_NAME) + { + /* Use the compressed name check */ + Result = CmpCompareCompressedName(Name, + KeyValue->Name, + KeyValue->NameLength); + } + else + { + /* Setup the Unicode string */ + SearchName.Length = KeyValue->NameLength; + SearchName.MaximumLength = SearchName.Length; + SearchName.Buffer = KeyValue->Name; + Result = RtlCompareUnicodeString(Name, &SearchName, TRUE); + } + + /* Check if we found it */ + if (!Result) + { + /* We did...return info to caller */ + if (ChildIndex) *ChildIndex = i; + *CellIndex = CellData->u.KeyList[i]; + + /* Set success state */ + Success = TRUE; + goto Return; + } + } + + /* Got to the end of the list */ + if (ChildIndex) *ChildIndex = i; + *CellIndex = HCELL_NIL; + + /* Nothing found if we got here */ + Success = TRUE; + goto Return; + } + + /* Nothing found...check if the caller wanted more info */ + ASSERT(ChildList->Count == 0); + if (ChildIndex) *ChildIndex = 0; + *CellIndex = HCELL_NIL; + + /* Nothing found if we got here */ + return TRUE; + +Return: + /* Release the first cell we got */ + if (CellData) HvReleaseCell(Hive, ChildList->List); + + /* Release the secondary one, if we have one */ + if (CellToRelease) HvReleaseCell(Hive, CellToRelease); + return Success; +} Added: 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 (added) +++ trunk/reactos/ntoskrnl/config/cmparse.c Wed May 9 22:30:21 2007 @@ -1,0 +1,75 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmparse.c + * PURPOSE: Configuration Manager - Object Manager Parse Interface + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpGetNextName(IN OUT PUNICODE_STRING RemainingName, + OUT PUNICODE_STRING NextName, + OUT PBOOLEAN LastName) +{ + BOOLEAN NameValid = TRUE; + + /* Check if there's nothing left in the name */ + if (!(RemainingName->Buffer) || + (!RemainingName->Length) || + !(*RemainingName->Buffer)) + { + /* Clear the next name and set this as last */ + *LastName = TRUE; + NextName->Buffer = NULL; + NextName->Length = 0; + return TRUE; + } + + /* Check if we have a path separator */ + if (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR) + { + /* Skip it */ + RemainingName->Buffer++; + RemainingName->Length -= sizeof(WCHAR); + RemainingName->MaximumLength -= sizeof(WCHAR); + } + + /* Start loop at where the current buffer is */ + NextName->Buffer = RemainingName->Buffer; + while (TRUE) + { + /* Break out if we ran out or hit a path separator */ + if (!(RemainingName->Length) || + (*RemainingName->Buffer == OBJ_NAME_PATH_SEPARATOR)) + { + break; + } + + /* Move to the next character */ + RemainingName->Buffer++; + RemainingName->Length -= sizeof(WCHAR); + RemainingName->MaximumLength -= sizeof(WCHAR); + } + + /* See how many chars we parsed and validate the length */ + NextName->Length = (USHORT)((ULONG_PTR)RemainingName->Buffer - + (ULONG_PTR)NextName->Buffer); + if (NextName->Length > 512) NameValid = FALSE; + NextName->MaximumLength = NextName->Length; + + /* If there's nothing left, we're last */ + *LastName = !RemainingName->Length; + return NameValid; +} Added: trunk/reactos/ntoskrnl/config/cmsecach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsecach.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsecach.c (added) +++ trunk/reactos/ntoskrnl/config/cmsecach.c Wed May 9 22:30:21 2007 @@ -1,0 +1,38 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmsecach.c + * PURPOSE: Configuration Manager - Security Cache + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpInitSecurityCache(IN PCMHIVE Hive) +{ + ULONG i; + + /* Reset data */ + Hive->SecurityCount = 0; + Hive->SecurityCacheSize = 0; + Hive->SecurityHitHint = -1; + Hive->SecurityCache = NULL; + + /* Loop every security hash */ + for (i = 0; i < 64; i++) + { + /* Initialize it */ + InitializeListHead(&Hive->SecurityHash[i]); + } +} Added: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (added) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Wed May 9 22:30:21 2007 @@ -1,0 +1,125 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/config/cmvalue.c + * PURPOSE: Configuration Manager - Cell Values + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include "ntoskrnl.h" +#include "cm.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +HCELL_INDEX +NTAPI +CmpFindValueByName(IN PHHIVE Hive, + IN PCM_KEY_NODE KeyNode, + IN PUNICODE_STRING Name) +{ + HCELL_INDEX CellIndex; + + /* Call the main function */ + if (!CmpFindNameInList(Hive, + &KeyNode->ValueList, + Name, + NULL, + &CellIndex)) + { + /* Santy check */ + ASSERT(CellIndex == HCELL_NIL); + } + + /* Return the index */ + return CellIndex; +} + +BOOLEAN +NTAPI +CmpGetValueData(IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + IN PULONG Length, + OUT PVOID *Buffer, + OUT PBOOLEAN BufferAllocated, + OUT PHCELL_INDEX CellToRelease) +{ + PAGED_CODE(); + + /* Sanity check */ + ASSERT(Value->Signature == CM_KEY_VALUE_SIGNATURE); + + /* Set failure defaults */ + *BufferAllocated = FALSE; + *Buffer = NULL; + *CellToRelease = HCELL_NIL; + + /* Check if this is a small key */ + if (CmpIsKeyValueSmall(Length, Value->DataLength)) + { + /* Return the data immediately */ + *Buffer = &Value->Data; + return TRUE; + } + + /* Check if this is a big cell */ + if (CmpIsKeyValueBig(Hive, *Length)) + { + /* FIXME: We don't support big cells */ + DPRINT1("Unsupported cell type!\n"); + while (TRUE); + } + + /* Get the data from the cell */ + *Buffer = HvGetCell(Hive, Value->Data); + if (!(*Buffer)) return FALSE; + + /* Return success and the cell to be released */ + *CellToRelease = Value->Data; + return TRUE; +} + +PCELL_DATA +NTAPI +CmpValueToData(IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + OUT PULONG Length) +{ + PCELL_DATA Buffer; + BOOLEAN BufferAllocated; + HCELL_INDEX CellToRelease; + PAGED_CODE(); + + /* Sanity check */ + ASSERT(Hive->ReleaseCellRoutine == NULL); + + /* Get the actual data */ + if (!CmpGetValueData(Hive, + Value, + Length, + (PVOID)&Buffer, + &BufferAllocated, + &CellToRelease)) + { + /* We failed */ + ASSERT(BufferAllocated == FALSE); + ASSERT(Buffer == NULL); + return NULL; + } + + /* This should never happen!*/ + if (BufferAllocated) + { + /* Free the buffer and bugcheck */ + ExFreePool(Buffer); + KEBUGCHECKEX(REGISTRY_ERROR, 8, 0, (ULONG_PTR)Hive, (ULONG_PTR)Value); + } + + /* Otherwise, return the cell data */ + return Buffer; +} 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 Wed May 9 22:30:21 2007 @@ -83,14 +83,23 @@ <file>pin.c</file> <file>view.c</file> </directory> + <directory name="config"> + <file>cmboot.c</file> + <file>cmcontrl.c</file> + <file>cmdata.c</file> + <file>cmindex.c</file> + <file>cmmapvw.c</file> + <file>cmname.c</file> + <file>cmparse.c</file> + <file>cmsecach.c</file> + <file>cmvalue.c</file> + </directory> <directory name="cm"> <file>import.c</file> <file>ntfunc.c</file> <file>regfile.c</file> <file>registry.c</file> <file>regobj.c</file> - <file>newcm.c</file> - <file>cmdata.c</file> </directory> <directory name="dbgk"> <file>dbgkutil.c</file>

17 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007