12 Feb
2005
12 Feb
'05
9:08 a.m.
SM - clean, simplify, make more readable
- split initialization in more files to make it more readable
- cleaned up some code
- simplified some code
- documented some todos
Modified: trunk/reactos/subsys/smss/client.c
Modified: trunk/reactos/subsys/smss/debug.c
Modified: trunk/reactos/subsys/smss/init.c
Added: trunk/reactos/subsys/smss/initdosdev.c
Added: trunk/reactos/subsys/smss/initenv.c
Added: trunk/reactos/subsys/smss/initheap.c
Added: trunk/reactos/subsys/smss/initmv.c
Added: trunk/reactos/subsys/smss/initobdir.c
Added: trunk/reactos/subsys/smss/initpage.c
Added: trunk/reactos/subsys/smss/initreg.c
Added: trunk/reactos/subsys/smss/initrun.c
Added: trunk/reactos/subsys/smss/initss.c
Added: trunk/reactos/subsys/smss/initwkdll.c
Modified: trunk/reactos/subsys/smss/makefile
Modified: trunk/reactos/subsys/smss/smapi.c
Modified: trunk/reactos/subsys/smss/smss.c
Modified: trunk/reactos/subsys/smss/smss.h
_____
Modified: trunk/reactos/subsys/smss/client.c
--- trunk/reactos/subsys/smss/client.c 2005-02-12 03:53:19 UTC (rev
13499)
+++ trunk/reactos/subsys/smss/client.c 2005-02-12 09:08:52 UTC (rev
13500)
@@ -25,7 +25,6 @@
*/
#define NTOS_MODE_USER
#include <ntos.h>
-#include <sm/api.h>
#include "smss.h"
/* Private ADT */
@@ -51,17 +50,40 @@
} SmpClientDirectory;
/**********************************************************************
- * SmpInitializeClientManagement/0
+ * SmInitializeClientManagement/0
*/
-VOID STDCALL
-SmpInitializeClientManagement (VOID)
+NTSTATUS
+SmInitializeClientManagement (VOID)
{
RtlInitializeCriticalSection(& SmpClientDirectory.Lock);
SmpClientDirectory.Count = 0;
SmpClientDirectory.Client = NULL;
+ return STATUS_SUCCESS;
}
/**********************************************************************
+ * SmpLookupClient/1
+ */
+PSM_CLIENT_DATA STDCALL
+SmpLookupClient (USHORT SubsystemId)
+{
+ PSM_CLIENT_DATA Client = NULL;
+
+ if (SmpClientDirectory.Count > 0)
+ {
+ RtlEnterCriticalSection (& SmpClientDirectory.Lock);
+ Client = SmpClientDirectory.Client;
+ while (NULL != Client->Next)
+ {
+ if (SubsystemId == Client->SubsystemId) break;
+ Client = Client->Next;
+ }
+ RtlLeaveCriticalSection (& SmpClientDirectory.Lock);
+ }
+ return Client;
+}
+
+/**********************************************************************
* SmpCreateClient/1
*/
NTSTATUS STDCALL
@@ -70,6 +92,14 @@
PSM_CLIENT_DATA pClient = NULL;
/*
+ * Check if a client for the ID already exist.
+ */
+ if (SmpLookupClient(0)) //FIXME
+ {
+ DbgPrint("SMSS: %s: attempt to register again subsystem
%d.\n",__FUNCTION__,0);
+ return STATUS_UNSUCCESSFUL;
+ }
+ /*
* Allocate the storage for client data
*/
pClient = RtlAllocateHeap (SmpHeap,
@@ -79,6 +109,8 @@
/*
* Initialize the client data
*/
+// pClient->SubsystemId = Request->Subsystem;
+ pClient->Initialized = FALSE;
// TODO
/*
* Insert the new descriptor in the
_____
Modified: trunk/reactos/subsys/smss/debug.c
--- trunk/reactos/subsys/smss/debug.c 2005-02-12 03:53:19 UTC (rev
13499)
+++ trunk/reactos/subsys/smss/debug.c 2005-02-12 09:08:52 UTC (rev
13500)
@@ -1,6 +1,6 @@
/* $Id: smss.c 12852 2005-01-06 13:58:04Z mf $
*
- * client.c - Session Manager client Management
+ * debug.c - Session Manager debug messages switch and router
*
* ReactOS Operating System
*
@@ -36,8 +36,8 @@
/* FUNCTIONS *********************************************************/
-NTSTATUS STDCALL
-SmpInitializeDbgSs (VOID)
+NTSTATUS
+SmInitializeDbgSs (VOID)
{
NTSTATUS Status;
UNICODE_STRING UnicodeString;
_____
Modified: trunk/reactos/subsys/smss/init.c
--- trunk/reactos/subsys/smss/init.c 2005-02-12 03:53:19 UTC (rev
13499)
+++ trunk/reactos/subsys/smss/init.c 2005-02-12 09:08:52 UTC (rev
13500)
@@ -22,764 +22,22 @@
* MA 02139, USA.
*
* --------------------------------------------------------------------
- *
- * 19990530 (Emanuele Aliberti)
- * Compiled successfully with egcs 1.1.2
*/
-/* INCLUDES
*****************************************************************/
-
-#include <ntos.h>
-#include <ntdll/rtl.h>
-#include <ntdll/ldr.h>
-#include <rosrtl/string.h>
-#include <sm/api.h>
#include "smss.h"
+#include <rosrtl/string.h>
-#define NDEBUG
+//#define NDEBUG
#include <debug.h>
-/* GLOBALS
******************************************************************/
-HANDLE SmpHeap = NULL;
-
-PWSTR SmSystemEnvironment = NULL;
-
-
/* FUNCTIONS
****************************************************************/
-static NTSTATUS STDCALL
-SmObjectDirectoryQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
- OBJECT_ATTRIBUTES ObjectAttributes;
- UNICODE_STRING UnicodeString;
- HANDLE WindowsDirectory;
- NTSTATUS Status = STATUS_SUCCESS;
-
-#ifndef NDEBUG
- DbgPrint("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DbgPrint("ValueData '%S'\n", (PWSTR)ValueData);
-#endif
- if (ValueType != REG_SZ)
- {
- return(STATUS_SUCCESS);
- }
-
- RtlInitUnicodeString(&UnicodeString,
- (PWSTR)ValueData);
-
- InitializeObjectAttributes(&ObjectAttributes,
- &UnicodeString,
- 0,
- NULL,
- NULL);
-
- Status = ZwCreateDirectoryObject(&WindowsDirectory,
- 0,
- &ObjectAttributes);
-
- return(Status);
-}
-
-
static NTSTATUS
-SmCreateObjectDirectories(VOID)
+SmpSignalInitEvent(VOID)
{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
NTSTATUS Status;
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].Name = L"ObjectDirectories";
- QueryTable[0].QueryRoutine = SmObjectDirectoryQueryRoutine;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager",
- QueryTable,
- NULL,
- NULL);
-
- return(Status);
-}
-
-
-static NTSTATUS STDCALL
-SmDosDevicesQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
OBJECT_ATTRIBUTES ObjectAttributes;
- UNICODE_STRING DeviceName;
- UNICODE_STRING LinkName;
- HANDLE LinkHandle;
- WCHAR LinkBuffer[80];
- NTSTATUS Status;
-
- DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
-
- if (ValueType != REG_SZ)
- {
- return(STATUS_SUCCESS);
- }
-
- swprintf(LinkBuffer,
- L"\\??\\%s",
- ValueName);
- RtlInitUnicodeString(&LinkName,
- LinkBuffer);
- RtlInitUnicodeString(&DeviceName,
- (PWSTR)ValueData);
-
- DPRINT("SM: Linking %wZ --> %wZ\n",
- &LinkName,
- &DeviceName);
-
- /* create symbolic link */
- InitializeObjectAttributes(&ObjectAttributes,
- &LinkName,
- OBJ_PERMANENT,
- NULL,
- NULL);
- Status = NtCreateSymbolicLinkObject(&LinkHandle,
- SYMBOLIC_LINK_ALL_ACCESS,
- &ObjectAttributes,
- &DeviceName);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SmDosDevicesQueryRoutine: NtCreateSymbolicLink( %wZ -->
%wZ ) failed!\n",
- &LinkName,
- &DeviceName);
- }
- NtClose(LinkHandle);
-
- return(Status);
-}
-
-
-static NTSTATUS
-SmInitDosDevices(VOID)
-{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
- NTSTATUS Status;
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].QueryRoutine = SmDosDevicesQueryRoutine;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager\\DOS Devices",
- QueryTable,
- NULL,
- NULL);
- return(Status);
-}
-
-
-static NTSTATUS STDCALL
-SmRunBootAppsQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
- PRTL_USER_PROCESS_PARAMETERS ProcessParameters;
- RTL_PROCESS_INFO ProcessInfo;
- UNICODE_STRING ImagePathString;
- UNICODE_STRING CommandLineString;
- WCHAR Description[256];
- WCHAR ImageName[256];
- WCHAR ImagePath[256];
- WCHAR CommandLine[256];
- PWSTR p1, p2;
- ULONG len;
- NTSTATUS Status;
-
- DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
-
- if (ValueType != REG_SZ)
- {
- return(STATUS_SUCCESS);
- }
-
- /* Extract the description */
- p1 = wcschr((PWSTR)ValueData, L' ');
- len = p1 - (PWSTR)ValueData;
- memcpy(Description,ValueData, len * sizeof(WCHAR));
- Description[len] = 0;
-
- /* Extract the image name */
- p1++;
- p2 = wcschr(p1, L' ');
- if (p2 != NULL)
- len = p2 - p1;
- else
- len = wcslen(p1);
- memcpy(ImageName, p1, len * sizeof(WCHAR));
- ImageName[len] = 0;
-
- /* Extract the command line */
- if (p2 == NULL)
- {
- CommandLine[0] = 0;
- }
- else
- {
- p2++;
- wcscpy(CommandLine, p2);
- }
-
- DPRINT("Running %S...\n", Description);
- DPRINT("ImageName: '%S'\n", ImageName);
- DPRINT("CommandLine: '%S'\n", CommandLine);
-
- /* initialize executable path */
- wcscpy(ImagePath, L"\\SystemRoot\\system32\\");
- wcscat(ImagePath, ImageName);
- wcscat(ImagePath, L".exe");
-
- RtlInitUnicodeString(&ImagePathString,
- ImagePath);
-
- RtlInitUnicodeString(&CommandLineString,
- CommandLine);
-
- RtlCreateProcessParameters(&ProcessParameters,
- &ImagePathString,
- NULL,
- NULL,
- &CommandLineString,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL);
-
- Status = RtlCreateUserProcess(&ImagePathString,
- OBJ_CASE_INSENSITIVE,
- ProcessParameters,
- NULL,
- NULL,
- NULL,
- FALSE,
- NULL,
- NULL,
- &ProcessInfo);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("Running %s failed (Status %lx)\n", Description, Status);
- return(STATUS_SUCCESS);
- }
-
- RtlDestroyProcessParameters(ProcessParameters);
-
- /* Wait for process termination */
- NtWaitForSingleObject(ProcessInfo.ProcessHandle,
- FALSE,
- NULL);
-
- NtClose(ProcessInfo.ThreadHandle);
- NtClose(ProcessInfo.ProcessHandle);
-
- return(STATUS_SUCCESS);
-}
-
-
-/*
- * Run native applications listed in the registry.
- *
- * Key:
- * \Registry\Machine\SYSTEM\CurrentControlSet\Control\Session
Manager
- *
- * Value (format: "<description> <executable> <command
line>":
- * BootExecute = "autocheck autochk *"
- */
-static NTSTATUS
-SmRunBootApps(VOID)
-{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
- NTSTATUS Status;
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].Name = L"BootExecute";
- QueryTable[0].QueryRoutine = SmRunBootAppsQueryRoutine;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager",
- QueryTable,
- NULL,
- NULL);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SmRunBootApps: RtlQueryRegistryValues() failed! (Status
%lx)\n", Status);
- }
-
- return(Status);
-}
-
-
-static NTSTATUS
-SmProcessFileRenameList(VOID)
-{
- DPRINT("SmProcessFileRenameList() called\n");
-
- /* FIXME: implement it! */
-
- DPRINT("SmProcessFileRenameList() done\n");
-
- return(STATUS_SUCCESS);
-}
-
-
-static NTSTATUS STDCALL
-SmKnownDllsQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
- OBJECT_ATTRIBUTES ObjectAttributes;
- IO_STATUS_BLOCK IoStatusBlock;
- UNICODE_STRING ImageName;
- HANDLE FileHandle;
- HANDLE SectionHandle;
- NTSTATUS Status;
-
- DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DPRINT("ValueData '%S' Context %p EntryContext %p\n",
(PWSTR)ValueData, Context, EntryContext);
-
- /* Ignore the 'DllDirectory' value */
- if (!_wcsicmp(ValueName, L"DllDirectory"))
- return STATUS_SUCCESS;
-
- /* Open the DLL image file */
- RtlInitUnicodeString(&ImageName,
- ValueData);
- InitializeObjectAttributes(&ObjectAttributes,
- &ImageName,
- OBJ_CASE_INSENSITIVE,
- (HANDLE)Context,
- NULL);
- Status = NtOpenFile(&FileHandle,
- SYNCHRONIZE | FILE_EXECUTE,
- &ObjectAttributes,
- &IoStatusBlock,
- FILE_SHARE_READ,
- FILE_SYNCHRONOUS_IO_NONALERT |
FILE_NON_DIRECTORY_FILE);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtOpenFile() failed (Status %lx)\n", Status);
- return STATUS_SUCCESS;
- }
-
- DPRINT("Opened file %wZ successfully\n", &ImageName);
-
- /* Check for valid image checksum */
- Status = LdrVerifyImageMatchesChecksum (FileHandle,
- 0,
- 0,
- 0);
- if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH)
- {
- /* Raise a hard error (crash the system/BSOD) */
- NtRaiseHardError (Status,
- 0,
- 0,
- 0,
- 0,
- 0);
- }
- else if (!NT_SUCCESS(Status))
- {
- DPRINT1("Failed to check the image checksum\n");
-
- NtClose(SectionHandle);
- NtClose(FileHandle);
-
- return STATUS_SUCCESS;
- }
-
- InitializeObjectAttributes(&ObjectAttributes,
- &ImageName,
- OBJ_CASE_INSENSITIVE | OBJ_PERMANENT,
- (HANDLE)EntryContext,
- NULL);
- Status = NtCreateSection(&SectionHandle,
- SECTION_ALL_ACCESS,
- &ObjectAttributes,
- NULL,
- PAGE_EXECUTE,
- SEC_IMAGE,
- FileHandle);
- if (NT_SUCCESS(Status))
- {
- DPRINT("Created section successfully\n");
- NtClose(SectionHandle);
- }
-
- NtClose(FileHandle);
-
- return STATUS_SUCCESS;
-}
-
-
-static NTSTATUS
-SmLoadKnownDlls(VOID)
-{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
- OBJECT_ATTRIBUTES ObjectAttributes;
- IO_STATUS_BLOCK IoStatusBlock;
- UNICODE_STRING DllDosPath;
- UNICODE_STRING DllNtPath;
- UNICODE_STRING Name;
- HANDLE ObjectDirHandle;
- HANDLE FileDirHandle;
- HANDLE SymlinkHandle;
- NTSTATUS Status;
-
- DPRINT("SmLoadKnownDlls() called\n");
-
- /* Create 'KnownDlls' object directory */
- RtlInitUnicodeString(&Name,
- L"\\KnownDlls");
- InitializeObjectAttributes(&ObjectAttributes,
- &Name,
- OBJ_PERMANENT | OBJ_CASE_INSENSITIVE |
OBJ_OPENIF,
- NULL,
- NULL);
- Status = NtCreateDirectoryObject(&ObjectDirHandle,
- DIRECTORY_ALL_ACCESS,
- &ObjectAttributes);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtCreateDirectoryObject() failed (Status %lx)\n",
Status);
- return Status;
- }
-
- RtlInitUnicodeString(&DllDosPath, NULL);
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].Name = L"DllDirectory";
- QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
- QueryTable[0].EntryContext = &DllDosPath;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager\\KnownDlls",
- QueryTable,
- NULL,
- SmSystemEnvironment);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n",
Status);
- return Status;
- }
-
- DPRINT("DllDosPath: '%wZ'\n", &DllDosPath);
-
- if (!RtlDosPathNameToNtPathName_U(DllDosPath.Buffer,
- &DllNtPath,
- NULL,
- NULL))
- {
- DPRINT1("RtlDosPathNameToNtPathName_U() failed\n");
- return STATUS_OBJECT_NAME_INVALID;
- }
-
- DPRINT("DllNtPath: '%wZ'\n", &DllNtPath);
-
- /* Open the dll path directory */
- InitializeObjectAttributes(&ObjectAttributes,
- &DllNtPath,
- OBJ_CASE_INSENSITIVE,
- NULL,
- NULL);
- Status = NtOpenFile(&FileDirHandle,
- SYNCHRONIZE | FILE_READ_DATA,
- &ObjectAttributes,
- &IoStatusBlock,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- FILE_SYNCHRONOUS_IO_NONALERT |
FILE_DIRECTORY_FILE);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtOpenFile(%wZ) failed (Status %lx)\n", &DllNtPath,
Status);
- return Status;
- }
-
- /* Link 'KnownDllPath' the dll path directory */
- RtlInitUnicodeString(&Name,
- L"KnownDllPath");
- InitializeObjectAttributes(&ObjectAttributes,
- &Name,
- OBJ_PERMANENT | OBJ_CASE_INSENSITIVE |
OBJ_OPENIF,
- ObjectDirHandle,
- NULL);
- Status = NtCreateSymbolicLinkObject(&SymlinkHandle,
- SYMBOLIC_LINK_ALL_ACCESS,
- &ObjectAttributes,
- &DllDosPath);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("NtCreateSymbolicLink() failed (Status %lx)\n", Status);
- return Status;
- }
-
- NtClose(SymlinkHandle);
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].QueryRoutine = SmKnownDllsQueryRoutine;
- QueryTable[0].EntryContext = ObjectDirHandle;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager\\KnownDlls",
- QueryTable,
- (PVOID)FileDirHandle,
- NULL);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n",
Status);
- }
-
- DPRINT("SmLoadKnownDlls() done\n");
-
- return Status;
-}
-
-
-static NTSTATUS STDCALL
-SmPagingFilesQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
- UNICODE_STRING FileName;
- LARGE_INTEGER InitialSize;
- LARGE_INTEGER MaximumSize;
- NTSTATUS Status;
- LPWSTR p;
-
- DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
-
- if (ValueType != REG_SZ)
- {
- return(STATUS_SUCCESS);
- }
-
- /*
- * Format: "<path>[ <initial_size>[ <maximum_size>]]"
- */
- if ((p = wcschr(ValueData, ' ')) != NULL)
- {
- *p = L'\0';
- InitialSize.QuadPart = wcstoul(p + 1, &p, 0) * 256 * 4096;
- if (*p == ' ')
- {
- MaximumSize.QuadPart = wcstoul(p + 1, NULL, 0) * 256 * 4096;
- }
- else
- MaximumSize = InitialSize;
- }
- else
- {
- InitialSize.QuadPart = 50 * 4096;
- MaximumSize.QuadPart = 80 * 4096;
- }
-
- if (!RtlDosPathNameToNtPathName_U ((LPWSTR)ValueData,
- &FileName,
- NULL,
- NULL))
- {
- return (STATUS_SUCCESS);
- }
-
- DPRINT("SMSS: Created paging file %wZ with size %dKB\n",
- &FileName, InitialSize.QuadPart / 1024);
- Status = NtCreatePagingFile(&FileName,
- &InitialSize,
- &MaximumSize,
- 0);
-
- RtlFreeUnicodeString(&FileName);
-
- return(STATUS_SUCCESS);
-}
-
-
-static NTSTATUS
-SmCreatePagingFiles(VOID)
-{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
- NTSTATUS Status;
-
- /*
- * Disable paging file on MiniNT/Live CD.
- */
- if (RtlCheckRegistryKey(RTL_REGISTRY_CONTROL, L"MiniNT") ==
STATUS_SUCCESS)
- {
- return STATUS_SUCCESS;
- }
-
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].Name = L"PagingFiles";
- QueryTable[0].QueryRoutine = SmPagingFilesQueryRoutine;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager\\Memory
Management",
- QueryTable,
- NULL,
- NULL);
-
- return(Status);
-}
-
-
-static NTSTATUS STDCALL
-SmEnvironmentQueryRoutine(PWSTR ValueName,
- ULONG ValueType,
- PVOID ValueData,
- ULONG ValueLength,
- PVOID Context,
- PVOID EntryContext)
-{
- UNICODE_STRING EnvVariable;
- UNICODE_STRING EnvValue;
-
- DPRINT("ValueName '%S' Type %lu Length %lu\n", ValueName,
ValueType, ValueLength);
- DPRINT("ValueData '%S'\n", (PWSTR)ValueData);
-
- if (ValueType != REG_SZ)
- {
- return(STATUS_SUCCESS);
- }
-
- RtlInitUnicodeString(&EnvVariable,
- ValueName);
- RtlInitUnicodeString(&EnvValue,
- (PWSTR)ValueData);
- RtlSetEnvironmentVariable(Context,
- &EnvVariable,
- &EnvValue);
-
- return(STATUS_SUCCESS);
-}
-
-
-static NTSTATUS
-SmSetEnvironmentVariables(VOID)
-{
- RTL_QUERY_REGISTRY_TABLE QueryTable[2];
- UNICODE_STRING EnvVariable;
- UNICODE_STRING EnvValue;
- WCHAR ValueBuffer[MAX_PATH];
- NTSTATUS Status;
-
- /*
- * The following environment variables must be set prior to reading
- * other variables from the registry.
- *
- * Variables (example):
- * SystemRoot = "C:\reactos"
- * SystemDrive = "C:"
- */
-
- /* Copy system root into value buffer */
- wcscpy(ValueBuffer,
- SharedUserData->NtSystemRoot);
-
- /* Set SystemRoot = "C:\reactos" */
- RtlRosInitUnicodeStringFromLiteral(&EnvVariable,
- L"SystemRoot");
- RtlInitUnicodeString(&EnvValue,
- ValueBuffer);
- RtlSetEnvironmentVariable(&SmSystemEnvironment,
- &EnvVariable,
- &EnvValue);
-
- /* Cut off trailing path */
- ValueBuffer[2] = 0;
-
- /* Set SystemDrive = "C:" */
- RtlRosInitUnicodeStringFromLiteral(&EnvVariable,
- L"SystemDrive");
- RtlInitUnicodeString(&EnvValue,
- ValueBuffer);
- RtlSetEnvironmentVariable(&SmSystemEnvironment,
- &EnvVariable,
- &EnvValue);
-
- /* Read system environment from the registry. */
- RtlZeroMemory(&QueryTable,
- sizeof(QueryTable));
-
- QueryTable[0].QueryRoutine = SmEnvironmentQueryRoutine;
-
- Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
- L"\\Session Manager\\Environment",
- QueryTable,
- &SmSystemEnvironment,
- SmSystemEnvironment);
-
- return(Status);
-}
-
-
-static NTSTATUS
-SmLoadSubsystems(VOID)
-{
- SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo;
- NTSTATUS Status;
-
- /* Load kernel mode subsystem (aka win32k.sys) */
- RtlRosInitUnicodeStringFromLiteral(&ImageInfo.ModuleName,
- L"\\SystemRoot\\system32\\win32k.sys");
-
- Status = NtSetSystemInformation(SystemLoadAndCallImage,
- &ImageInfo,
- sizeof(SYSTEM_LOAD_AND_CALL_IMAGE));
-
- DPRINT("SMSS: Loaded win32k.sys (Status %lx)\n", Status);
-#if 0
- if (!NT_SUCCESS(Status))
- {
- return(Status);
- }
-#endif
-
- /* FIXME: load more subsystems (csrss!) */
-
- return(Status);
-}
-
-
-static VOID
-SignalInitEvent()
-{
- NTSTATUS Status;
- OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING UnicodeString;
HANDLE ReactOSInitEvent;
@@ -809,270 +67,59 @@
/* We don't really care if this fails */
DPRINT1("SM: Failed to open ReactOS init notification event\n");
}
+ return Status;
}
+typedef NTSTATUS (* SM_INIT_ROUTINE)(VOID);
+struct {
+ BOOL Required;
+ SM_INIT_ROUTINE EntryPoint;
+ PCHAR ErrorMessage;
+} InitRoutine [] = {
+ {TRUE, SmCreateHeap, "create private heap,
aborting"},
+ {TRUE, SmCreateObjectDirectories, "create object
directories"},
+ {TRUE, SmCreateApiPort, "create \\SmApiPort"},
+ {TRUE, SmCreateEnvironment, "create the system
environment"},
+ {TRUE, SmSetEnvironmentVariables, "set system environment
variables"},
+ {TRUE, SmInitDosDevices, "create dos device
links"},
+ {TRUE, SmRunBootApplications, "run boot applications"},
+ {TRUE, SmProcessFileRenameList, "process the file rename
list"},
+ {FALSE, SmLoadKnownDlls, "preload system DLLs"},
+ {TRUE, SmCreatePagingFiles, "create paging files"},
+ {TRUE, SmInitializeRegistry, "initialize the
registry"},
+ {FALSE, SmUpdateEnvironment, "update environment
variables"},
+ {TRUE, SmInitializeClientManagement, "initialize client
management"},
+ {TRUE, SmLoadSubsystems, "load subsystems"},
+ {FALSE, SmpSignalInitEvent, "open ReactOS init
notification event"},
+ {TRUE, SmRunCsrss, "run csrss"},
+ {TRUE, SmRunWinlogon, "run winlogon"},
+ {TRUE, SmInitializeDbgSs, "initialize DbgSs"}
+};
+
NTSTATUS
InitSessionManager(HANDLE Children[])
{
+ int i;
NTSTATUS Status;
- UNICODE_STRING UnicodeString;
- OBJECT_ATTRIBUTES ObjectAttributes;
- PRTL_USER_PROCESS_PARAMETERS ProcessParameters;
- RTL_PROCESS_INFO ProcessInfo;
- HANDLE CsrssInitEvent;
- WCHAR UnicodeBuffer[MAX_PATH];
- /* Create our own heap */
- SmpHeap = RtlCreateHeap(HEAP_GROWABLE,
- NULL,
- 65536,
- 65536,
- NULL,
- NULL);
- if (NULL == SmpHeap)
+ for (i=0; i < (sizeof InitRoutine / sizeof InitRoutine[0]); i++)
+ {
+ Status = InitRoutine[i].EntryPoint();
+ if(!NT_SUCCESS(Status))
{
- DbgPrint("SMSS: %s: failed to create private heap,
aborting\n",__FUNCTION__);
- return STATUS_UNSUCCESSFUL;
+ DPRINT1("SM: %s: failed to %s (Status=%lx)\n",
+ __FUNCTION__,
+ InitRoutine[i].ErrorMessage,
+ Status);
+ if (InitRoutine[i].Required)
+ {
+ return(Status);
+ }
}
+ }
- /* Create object directories */
- Status = SmCreateObjectDirectories();
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to create object directories (Status %lx)\n",
Status);
- return(Status);
- }
-
- /* Create the \SmApiPort object (LPC) */
- Status = SmpCreateApiPort();
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to create SmApiPort (Status %lx)\n", Status);
- return(Status);
- }
-
- /* Create the system environment */
- Status = RtlCreateEnvironment(FALSE,
- &SmSystemEnvironment);
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to create the system environment (Status
%lx)\n", Status);
- return(Status);
- }
-
- /* Set environment variables */
- Status = SmSetEnvironmentVariables();
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to set system environment variables (Status
%lx)\n", Status);
- return(Status);
- }
-
- /* Define symbolic links to kernel devices (MS-DOS names) */
- Status = SmInitDosDevices();
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to create dos device links (Status %lx)\n",
Status);
- return(Status);
- }
-
- /* Run all programs in the boot execution list */
- Status = SmRunBootApps();
- if (!NT_SUCCESS(Status))
- {
- DPRINT1("SM: Failed to run boot applications (Status %lx)\n",
Status);
- return(Status);
- }
-
- /* Process the file rename list */
- Status = SmProcessFileRenameList();
- if (!NT_SUCCESS(Status))
[truncated at 1000 lines; 1722 more skipped]