[ros-diffs] [ion] 55317: [SMSS2]: Initialize a bunch more internal stuff, and start parsing the registry for settings. Right now just ProtectionMode and AllowProtectedRenames are parsed. Stub functions needed ...
ion at svn.reactos.org
ion at svn.reactos.org
Mon Jan 30 05:32:34 UTC 2012
Author: ion
Date: Mon Jan 30 05:32:34 2012
New Revision: 55317
URL: http://svn.reactos.org/svn/reactos?rev=55317&view=rev
Log:
[SMSS2]: Initialize a bunch more internal stuff, and start parsing the registry for settings. Right now just ProtectionMode and AllowProtectedRenames are parsed. Stub functions needed for the rest of initialization. Create the \Sessions directory. Hack to work under setup. Loop BootExecute and PageFile entries. Create SMSS environment. Detect MiniNT mode (PE/LiveCD). Delete SAFEBOOT_OPTION if found.
Modified:
trunk/reactos/base/system/smss2/pagefile.c
trunk/reactos/base/system/smss2/sminit.c
trunk/reactos/base/system/smss2/smsessn.c
trunk/reactos/base/system/smss2/smss.c
trunk/reactos/base/system/smss2/smss.h
trunk/reactos/base/system/smss2/smsubsys.c
Modified: trunk/reactos/base/system/smss2/pagefile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile.c?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -14,4 +14,30 @@
/* GLOBALS ********************************************************************/
+LIST_ENTRY SmpPagingFileDescriptorList, SmpVolumeDescriptorList;
+
/* FUNCTIONS ******************************************************************/
+
+VOID
+NTAPI
+SmpPagingFileInitialize(VOID)
+{
+ /* Initialize the two lists */
+ InitializeListHead(&SmpPagingFileDescriptorList);
+ InitializeListHead(&SmpVolumeDescriptorList);
+}
+
+NTSTATUS
+NTAPI
+SmpCreatePagingFileDescriptor(IN PUNICODE_STRING PageFileToken)
+{
+ DPRINT1("New pagefile data: %wZ\n", PageFileToken);
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
+SmpCreatePagingFiles(VOID)
+{
+ return STATUS_SUCCESS;
+}
Modified: trunk/reactos/base/system/smss2/sminit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -14,19 +14,37 @@
/* GLOBALS ********************************************************************/
+typedef struct _SMP_REGISTRY_VALUE
+{
+ LIST_ENTRY Entry;
+ UNICODE_STRING Name;
+ UNICODE_STRING Value;
+ PCHAR AnsiValue;
+} SMP_REGISTRY_VALUE, *PSMP_REGISTRY_VALUE;
+
UNICODE_STRING SmpSubsystemName, PosixName, Os2Name;
-LIST_ENTRY NativeProcessList;
+UNICODE_STRING SmpDebugKeyword, SmpASyncKeyword, SmpAutoChkKeyword;
+LIST_ENTRY SmpBootExecuteList, SmpSetupExecuteList, SmpPagingFileList;
+LIST_ENTRY SmpDosDevicesList, SmpFileRenameList, SmpKnownDllsList;
+LIST_ENTRY SmpExcludeKnownDllsList, SmpSubSystemList, SmpSubSystemsToLoad;
+LIST_ENTRY SmpSubSystemsToDefer, SmpExecuteList, NativeProcessList;
+
ULONG SmBaseTag;
+HANDLE SmpDebugPort;
PVOID SmpHeap;
-HANDLE SmpDebugPort;
+PWCHAR SmpDefaultEnvironment;
+
ULONG SmpInitProgressByLine;
NTSTATUS SmpInitReturnStatus;
PVOID SmpInitLastCall;
+
SECURITY_DESCRIPTOR SmpPrimarySDBody, SmpLiberalSDBody, SmpKnownDllsSDBody;
SECURITY_DESCRIPTOR SmpApiPortSDBody;
PSECURITY_DESCRIPTOR SmpPrimarySecurityDescriptor, SmpLiberalSecurityDescriptor;
PSECURITY_DESCRIPTOR SmpKnownDllsSecurityDescriptor, SmpApiPortSecurityDescriptor;
-ULONG SmpProtectionMode = 1;
+
+ULONG SmpAllowProtectedRenames, SmpProtectionMode = 1;
+BOOLEAN MiniNTBoot;
#define SMSS_CHECKPOINT(x, y) \
{ \
@@ -34,6 +52,84 @@
SmpInitReturnStatus = (y); \
SmpInitLastCall = (x); \
}
+
+/* REGISTRY CONFIGURATION *****************************************************/
+
+NTSTATUS
+NTAPI
+SmpConfigureProtectionMode(IN PWSTR ValueName,
+ IN ULONG ValueType,
+ IN PVOID ValueData,
+ IN ULONG ValueLength,
+ IN PVOID Context,
+ IN PVOID EntryContext)
+{
+ /* Make sure the value is valid */
+ if (ValueLength == sizeof(ULONG))
+ {
+ /* Read it */
+ SmpProtectionMode = *(PULONG)ValueData;
+ }
+ else
+ {
+ /* Default is to protect stuff */
+ SmpProtectionMode = 1;
+ }
+
+ /* Recreate the security descriptors to take into account security mode */
+ SmpCreateSecurityDescriptors(FALSE);
+ DPRINT1("SmpProtectionMode: %d\n", SmpProtectionMode);
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
+SmpConfigureAllowProtectedRenames(IN PWSTR ValueName,
+ IN ULONG ValueType,
+ IN PVOID ValueData,
+ IN ULONG ValueLength,
+ IN PVOID Context,
+ IN PVOID EntryContext)
+{
+ /* Make sure the value is valid */
+ if (ValueLength == sizeof(ULONG))
+ {
+ /* Read it */
+ SmpAllowProtectedRenames = *(PULONG)ValueData;
+ }
+ else
+ {
+ /* Default is to not allow protected renames */
+ SmpAllowProtectedRenames = 0;
+ }
+
+ DPRINT1("SmpAllowProtectedRenames: %d\n", SmpAllowProtectedRenames);
+ return STATUS_SUCCESS;
+}
+
+RTL_QUERY_REGISTRY_TABLE
+SmpRegistryConfigurationTable[] =
+{
+ {
+ SmpConfigureProtectionMode,
+ 0,
+ L"ProtectionMode",
+ NULL,
+ REG_DWORD,
+ NULL,
+ 0
+ },
+ {
+ SmpConfigureAllowProtectedRenames,
+ RTL_QUERY_REGISTRY_DELETE,
+ L"AllowProtectedRenames",
+ NULL,
+ REG_DWORD,
+ NULL,
+ 0
+ },
+ {0},
+};
/* FUNCTIONS ******************************************************************/
@@ -343,9 +439,231 @@
NTSTATUS
NTAPI
+SmpInitializeDosDevices(VOID)
+{
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
+SmpInitializeKnownDlls(VOID)
+{
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
+SmpCreateDynamicEnvironmentVariables(VOID)
+{
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
+SmpProcessFileRenames(VOID)
+{
+ return STATUS_SUCCESS;
+}
+
+NTSTATUS
+NTAPI
SmpLoadDataFromRegistry(OUT PUNICODE_STRING InitialCommand)
{
- return STATUS_SUCCESS;
+ NTSTATUS Status;
+ PLIST_ENTRY Head, NextEntry;
+ PSMP_REGISTRY_VALUE RegEntry;
+ PVOID OriginalEnvironment;
+ ULONG MuSessionId = 0;
+ OBJECT_ATTRIBUTES ObjectAttributes;
+ HANDLE KeyHandle;
+ UNICODE_STRING DestinationString;
+
+ /* Initialize the keywords we'll be looking for */
+ RtlInitUnicodeString(&SmpDebugKeyword, L"debug");
+ RtlInitUnicodeString(&SmpASyncKeyword, L"async");
+ RtlInitUnicodeString(&SmpAutoChkKeyword, L"autocheck");
+
+ /* Initialize all the registry-associated list heads */
+ InitializeListHead(&SmpBootExecuteList);
+ InitializeListHead(&SmpSetupExecuteList);
+ InitializeListHead(&SmpPagingFileList);
+ InitializeListHead(&SmpDosDevicesList);
+ InitializeListHead(&SmpFileRenameList);
+ InitializeListHead(&SmpKnownDllsList);
+ InitializeListHead(&SmpExcludeKnownDllsList);
+ InitializeListHead(&SmpSubSystemList);
+ InitializeListHead(&SmpSubSystemsToLoad);
+ InitializeListHead(&SmpSubSystemsToDefer);
+ InitializeListHead(&SmpExecuteList);
+ SmpPagingFileInitialize();
+
+ /* Initialize the SMSS environment */
+ Status = RtlCreateEnvironment(TRUE, &SmpDefaultEnvironment);
+ if (!NT_SUCCESS(Status))
+ {
+ /* Fail if there was a problem */
+ DPRINT1("SMSS: Unable to allocate default environment - Status == %X\n",
+ Status);
+ SMSS_CHECKPOINT(RtlCreateEnvironment, Status);
+ return Status;
+ }
+
+ /* Check if we were booted in PE mode (LiveCD should have this) */
+ RtlInitUnicodeString(&DestinationString,
+ L"\\Registry\\Machine\\System\\CurrentControlSet\\"
+ "Control\\MiniNT");
+ InitializeObjectAttributes(&ObjectAttributes,
+ &DestinationString,
+ OBJ_CASE_INSENSITIVE,
+ NULL,
+ NULL);
+ Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes);
+ if (NT_SUCCESS(Status))
+ {
+ /* If the key exists, we were */
+ NtClose(KeyHandle);
+ MiniNTBoot = TRUE;
+ }
+
+ /* Print out if this is the case */
+ if (MiniNTBoot) DPRINT1("SMSS: !!! MiniNT Boot !!!\n");
+
+ /* Open the environment key to see if we are booted in safe mode */
+ RtlInitUnicodeString(&DestinationString,
+ L"\\Registry\\Machine\\System\\CurrentControlSet\\"
+ "Control\\Session Manager\\Environment");
+ InitializeObjectAttributes(&ObjectAttributes,
+ &DestinationString,
+ OBJ_CASE_INSENSITIVE,
+ NULL,
+ NULL);
+ Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes);
+ if (NT_SUCCESS(Status))
+ {
+ /* Delete the value if we found it */
+ RtlInitUnicodeString(&DestinationString, L"SAFEBOOT_OPTION");
+ NtDeleteValueKey(KeyHandle, &DestinationString);
+ NtClose(KeyHandle);
+ }
+
+ /* Switch environments, then query the registry for all needed settings */
+ OriginalEnvironment = NtCurrentPeb()->ProcessParameters->Environment;
+ NtCurrentPeb()->ProcessParameters->Environment = SmpDefaultEnvironment;
+ Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL,
+ L"Session Manager",
+ SmpRegistryConfigurationTable,
+ NULL,
+ NULL);
+ SmpDefaultEnvironment = NtCurrentPeb()->ProcessParameters->Environment;
+ NtCurrentPeb()->ProcessParameters->Environment = OriginalEnvironment;
+ if (!NT_SUCCESS(Status))
+ {
+ /* We failed somewhere in registry initialization, which is bad... */
+ DPRINT1("SMSS: RtlQueryRegistryValues failed - Status == %lx\n", Status);
+ SMSS_CHECKPOINT(RtlQueryRegistryValues, Status);
+ return Status;
+ }
+
+ /* Now we can start acting on the registry settings. First to DOS devices */
+ Status = SmpInitializeDosDevices();
+ if (!NT_SUCCESS(Status))
+ {
+ /* Failed */
+ DPRINT1("SMSS: Unable to initialize DosDevices configuration - Status == %lx\n",
+ Status);
+ SMSS_CHECKPOINT(SmpInitializeDosDevices, Status);
+ return Status;
+ }
+
+ /* Next create the session directory... */
+ RtlInitUnicodeString(&DestinationString, L"\\Sessions");
+ InitializeObjectAttributes(&ObjectAttributes,
+ &DestinationString,
+ OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT,
+ NULL,
+ SmpPrimarySecurityDescriptor);
+ Status = NtCreateDirectoryObject(&SmpSessionsObjectDirectory,
+ DIRECTORY_ALL_ACCESS,
+ &ObjectAttributes);
+ if (!NT_SUCCESS(Status))
+ {
+ /* Fail */
+ DPRINT1("SMSS: Unable to create %wZ object directory - Status == %lx\n",
+ &DestinationString, Status);
+ SMSS_CHECKPOINT(NtCreateDirectoryObject, Status);
+ return Status;
+ }
+
+ /* Next loop all the boot execute binaries */
+ Head = &SmpBootExecuteList;
+ while (!IsListEmpty(Head))
+ {
+ /* Remove each one from the list */
+ NextEntry = RemoveHeadList(Head);
+
+ /* Execute it */
+ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
+ SmpExecuteCommand(&RegEntry->Name, 0, NULL, 0);
+
+ /* And free it */
+ if (RegEntry->AnsiValue) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->AnsiValue);
+ if (RegEntry->Value.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer);
+ RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry);
+ }
+
+ /* Now do any pending file rename operations... */
+ if (!MiniNTBoot) SmpProcessFileRenames();
+
+ /* And initialize known DLLs... */
+ Status = SmpInitializeKnownDlls();
+ if (!NT_SUCCESS(Status))
+ {
+ /* Fail if that didn't work */
+ DPRINT1("SMSS: Unable to initialize KnownDll configuration - Status == %lx\n",
+ Status);
+ SMSS_CHECKPOINT(SmpInitializeKnownDlls, Status);
+ return Status;
+ }
+
+ /* Loop every page file */
+ Head = &SmpPagingFileList;
+ while (!IsListEmpty(Head))
+ {
+ /* Remove each one from the list */
+ NextEntry = RemoveHeadList(Head);
+
+ /* Create the descriptor for it */
+ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry);
+ SmpCreatePagingFileDescriptor(&RegEntry->Name);
+
+ /* And free it */
+ if (RegEntry->AnsiValue) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->AnsiValue);
+ if (RegEntry->Value.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer);
+ RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry);
+ }
+
+ /* Now create all the paging files for the descriptors that we have */
+ SmpCreatePagingFiles();
+
+ /* Tell Cm it's now safe to fully enable write access to the registry */
+ // NtInitializeRegistry(FALSE); Later...
+
+ /* Create all the system-based environment variables for later inheriting */
+ Status = SmpCreateDynamicEnvironmentVariables();
+ if (!NT_SUCCESS(Status))
+ {
+ /* Handle failure */
+ SMSS_CHECKPOINT(SmpCreateDynamicEnvironmentVariables, Status);
+ return Status;
+ }
+
+ /* And finally load all the subsytems for our first session! */
+ Status = SmpLoadSubSystemsForMuSession(&MuSessionId,
+ &SmpWindowsSubSysProcessId,
+ InitialCommand);
+ ASSERT(MuSessionId == 0);
+ if (!NT_SUCCESS(Status)) SMSS_CHECKPOINT(SmpLoadSubSystemsForMuSession, Status);
+ return Status;
}
NTSTATUS
@@ -386,7 +704,7 @@
SmpNextSessionId = 1;
SmpNextSessionIdScanMode = 0;
SmpDbgSsLoaded = FALSE;
-
+
/* Create the initial security descriptors */
Status = SmpCreateSecurityDescriptors(TRUE);
if (!NT_SUCCESS(Status))
Modified: trunk/reactos/base/system/smss2/smsessn.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsessn.c?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -19,5 +19,6 @@
ULONG SmpNextSessionId;
ULONG SmpNextSessionIdScanMode;
BOOLEAN SmpDbgSsLoaded;
+HANDLE SmpSessionsObjectDirectory;
/* FUNCTIONS ******************************************************************/
Modified: trunk/reactos/base/system/smss2/smss.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -32,6 +32,17 @@
BOOLEAN SmpDebug;
/* FUNCTIONS ******************************************************************/
+
+NTSTATUS
+NTAPI
+SmpExecuteCommand(IN PUNICODE_STRING CommandLine,
+ IN ULONG MuSessionId,
+ OUT PULONG ProcessId,
+ IN ULONG Flags)
+{
+ DPRINT1("Should run: %wZ for session %d\n", CommandLine, MuSessionId);
+ return STATUS_SUCCESS;
+}
NTSTATUS
NTAPI
@@ -389,7 +400,7 @@
DPRINT1("SMSS: SmpInit return failure - Status == %x\n");
RtlInitUnicodeString(&DbgString, L"Session Manager Initialization");
Parameters[1] = Status;
- _SEH2_LEAVE;
+ //_SEH2_LEAVE; Hack so that setup can work. will go away later
}
/* Get the global flags */
Modified: trunk/reactos/base/system/smss2/smss.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -40,8 +40,16 @@
extern ULONG SmpNextSessionIdScanMode;
extern BOOLEAN SmpDbgSsLoaded;
extern HANDLE SmpWindowsSubSysProcess;
-
+extern HANDLE SmpSessionsObjectDirectory;
+extern HANDLE SmpWindowsSubSysProcessId;
+
/* FUNCTIONS ******************************************************************/
+
+NTSTATUS
+NTAPI
+SmpCreateSecurityDescriptors(
+ IN BOOLEAN InitialCall
+);
NTSTATUS
NTAPI
@@ -68,3 +76,39 @@
SmpApiLoop(
IN PVOID Parameter
);
+
+NTSTATUS
+NTAPI
+SmpExecuteCommand(
+ IN PUNICODE_STRING CommandLine,
+ IN ULONG MuSessionId,
+ OUT PULONG ProcessId,
+ IN ULONG Flags
+);
+
+NTSTATUS
+NTAPI
+SmpLoadSubSystemsForMuSession(
+ IN PULONG MuSessionId,
+ OUT PHANDLE ProcessId,
+ IN PUNICODE_STRING InitialCommand
+);
+
+VOID
+NTAPI
+SmpPagingFileInitialize(
+ VOID
+);
+
+NTSTATUS
+NTAPI
+SmpCreatePagingFileDescriptor(
+ IN PUNICODE_STRING PageFileToken
+);
+
+NTSTATUS
+NTAPI
+SmpCreatePagingFiles(
+ VOID
+);
+
Modified: trunk/reactos/base/system/smss2/smsubsys.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys.c?rev=55317&r1=55316&r2=55317&view=diff
==============================================================================
--- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Mon Jan 30 05:32:34 2012
@@ -17,7 +17,17 @@
RTL_CRITICAL_SECTION SmpKnownSubSysLock;
LIST_ENTRY SmpKnownSubSysHead;
HANDLE SmpWindowsSubSysProcess;
+HANDLE SmpWindowsSubSysProcessId;
/* FUNCTIONS ******************************************************************/
-/* EOF */
+NTSTATUS
+NTAPI
+SmpLoadSubSystemsForMuSession(IN PULONG MuSessionId,
+ OUT PHANDLE ProcessId,
+ IN PUNICODE_STRING InitialCommand)
+{
+ DPRINT1("Should start subsystems for Session: %lx\n", *MuSessionId);
+ return STATUS_SUCCESS;
+}
+
More information about the Ros-diffs
mailing list