Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[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 ...

by ion＠svn.reactos.org

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… ============================================================================== --- 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… ============================================================================== --- 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.… ============================================================================== --- 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?r… ============================================================================== --- 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?r… ============================================================================== --- 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… ============================================================================== --- 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; +} +

12 years, 11 months

[cgutman] 55316: [USETUP] - Fix selection of the active partition - Running 1st stage setup to a USB drive now results in a bootable USB drive that successfully runs FreeLoader which can load the R...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 04:52:37 2012 New Revision: 55316 URL: http://svn.reactos.org/svn/reactos?rev=55316&view=rev Log: [USETUP] - Fix selection of the active partition - Running 1st stage setup to a USB drive now results in a bootable USB drive that successfully runs FreeLoader which can load the ROS kernel, HAL, and other critical boot executables from the USB drive but ROS fails early in boot after FreeLoader hands control to the kernel Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Jan 30 04:52:37 2012 @@ -1465,8 +1465,6 @@ } } - CheckActiveBootPartition(PartitionList); - DrawPartitionList(PartitionList); /* Warn about partitions created by Linux Fdisk */ @@ -2381,8 +2379,6 @@ else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE; - CheckActiveBootPartition(PartitionList); - #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, "Disk: %I64u Cylinder: %I64u Track: %I64u", @@ -2442,19 +2438,6 @@ PathBuffer); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); - - /* Set SystemRootPath */ - RtlFreeUnicodeString(&SystemRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->ActiveBootDisk->DiskNumber, - PartitionList->ActiveBootPartition-> - PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber); - RtlCreateUnicodeString(&SystemRootPath, - PathBuffer); - DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - - if (FileSystemList->Selected->FormatFunc) { Status = FormatPartition(&DestinationRootPath, @@ -2504,15 +2487,6 @@ PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber); RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); - - /* Set SystemRootPath */ - RtlFreeUnicodeString(&SystemRootPath); - swprintf(PathBuffer, - L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->ActiveBootDisk->DiskNumber, - PartitionList->ActiveBootPartition->PartInfo[PartNum].PartitionNumber); - RtlCreateUnicodeString(&SystemRootPath, PathBuffer); - DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); @@ -3371,8 +3345,21 @@ UCHAR PartitionType; BOOLEAN InstallOnFloppy; USHORT Line = 12; + WCHAR PathBuffer[MAX_PATH]; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + + CheckActiveBootPartition(PartitionList); + + RtlFreeUnicodeString(&SystemRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + PartitionList->ActiveBootDisk->DiskNumber, + PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber); + RtlCreateUnicodeString(&SystemRootPath, + PathBuffer); + DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType;

12 years, 11 months

[cgutman] 55315: [USBSTOR] - Handle SRB_FUNCTION_SHUTDOWN successfully (failing it results in a stack overflow due to a bug in disk.sys) - Fixes the crash during shutdown after using a USB drive

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 04:18:59 2012 New Revision: 55315 URL: http://svn.reactos.org/svn/reactos?rev=55315&view=rev Log: [USBSTOR] - Handle SRB_FUNCTION_SHUTDOWN successfully (failing it results in a stack overflow due to a bug in disk.sys) - Fixes the crash during shutdown after using a USB drive Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Mon Jan 30 04:18:59 2012 @@ -168,10 +168,11 @@ break; } + case SRB_FUNCTION_SHUTDOWN: case SRB_FUNCTION_FLUSH: case SRB_FUNCTION_FLUSH_QUEUE: { - DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE\n"); + DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE / SRB_FUNCTION_SHUTDOWN\n"); // // flush all requests

12 years, 11 months

[ion] 55314: [SMSS2]: Create the VolumesSafeForWriteAccess and Sm2ApiPort. Create all the required security descriptors. Create the two API threads. Initialize a bunch of other stuff needed for lat...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 03:44:27 2012 New Revision: 55314 URL: http://svn.reactos.org/svn/reactos?rev=55314&view=rev Log: [SMSS2]: Create the VolumesSafeForWriteAccess and Sm2ApiPort. Create all the required security descriptors. Create the two API threads. Initialize a bunch of other stuff needed for later. Initialize tag heap and enable hard errors. Api loop waits on the LPC port but nothing should be going through there for now. Modified: trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smsessn.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Mon Jan 30 03:44:27 2012 @@ -14,12 +14,458 @@ /* GLOBALS ********************************************************************/ +UNICODE_STRING SmpSubsystemName, PosixName, Os2Name; +LIST_ENTRY NativeProcessList; +ULONG SmBaseTag; +PVOID SmpHeap; +HANDLE SmpDebugPort; +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; + +#define SMSS_CHECKPOINT(x, y) \ +{ \ + SmpInitProgressByLine = __LINE__; \ + SmpInitReturnStatus = (y); \ + SmpInitLastCall = (x); \ +} + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpCreateSecurityDescriptors(IN BOOLEAN InitialCall) +{ + NTSTATUS Status; + PSID WorldSid = NULL, AdminSid = NULL, SystemSid = NULL; + PSID RestrictedSid = NULL, OwnerSid = NULL; + SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; + SID_IDENTIFIER_AUTHORITY CreatorAuthority = {SECURITY_CREATOR_SID_AUTHORITY}; + ULONG AclLength, SidLength; + PACL Acl; + PACE_HEADER Ace; + BOOLEAN ProtectionRequired = FALSE; + + /* Check if this is the first call */ + if (InitialCall) + { + /* Create and set the primary descriptor */ + SmpPrimarySecurityDescriptor = &SmpPrimarySDBody; + Status = RtlCreateSecurityDescriptor(SmpPrimarySecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + Status = RtlSetDaclSecurityDescriptor(SmpPrimarySecurityDescriptor, + TRUE, + NULL, + FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Create and set the liberal descriptor */ + SmpLiberalSecurityDescriptor = &SmpLiberalSDBody; + Status = RtlCreateSecurityDescriptor(SmpLiberalSecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + Status = RtlSetDaclSecurityDescriptor(SmpLiberalSecurityDescriptor, + TRUE, + NULL, + FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Create and set the \KnownDlls descriptor */ + SmpKnownDllsSecurityDescriptor = &SmpKnownDllsSDBody; + Status = RtlCreateSecurityDescriptor(SmpKnownDllsSecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + Status = RtlSetDaclSecurityDescriptor(SmpKnownDllsSecurityDescriptor, + TRUE, + NULL, + FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Create and Set the \ApiPort descriptor */ + SmpApiPortSecurityDescriptor = &SmpApiPortSDBody; + Status = RtlCreateSecurityDescriptor(SmpApiPortSecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + Status = RtlSetDaclSecurityDescriptor(SmpApiPortSecurityDescriptor, + TRUE, + NULL, + FALSE); + ASSERT(NT_SUCCESS(Status)); + } + + /* Check if protection was requested in the registry (on by default) */ + if (SmpProtectionMode & 1) ProtectionRequired = TRUE; + + /* Exit if there's nothing to do */ + if (!(InitialCall || ProtectionRequired)) return STATUS_SUCCESS; + + /* Build the world SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, 1, + SECURITY_WORLD_RID, + 0, 0, 0, 0, 0, 0, 0, + &WorldSid); + if (!NT_SUCCESS(Status)) + { + WorldSid = NULL; + goto Quickie; + } + + /* Build the admin SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &AdminSid); + if (!NT_SUCCESS(Status)) + { + AdminSid = NULL; + goto Quickie; + } + + /* Build the owner SID */ + Status = RtlAllocateAndInitializeSid(&CreatorAuthority, 1, + SECURITY_CREATOR_OWNER_RID, + 0, 0, 0, 0, 0, 0, 0, + &OwnerSid); + if (!NT_SUCCESS(Status)) + { + OwnerSid = NULL; + goto Quickie; + } + + /* Build the restricted SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, 1, + SECURITY_RESTRICTED_CODE_RID, + 0, 0, 0, 0, 0, 0, 0, + &RestrictedSid); + if (!NT_SUCCESS(Status)) + { + RestrictedSid = NULL; + goto Quickie; + } + + /* Build the system SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, 0, 0, 0, 0, 0, 0, + &SystemSid); + if (!NT_SUCCESS(Status)) + { + SystemSid = NULL; + goto Quickie; + } + + /* Now check if we're creating the core descriptors */ + if (!InitialCall) + { + /* We're skipping NextAcl so we have to do this here */ + SidLength = RtlLengthSid(WorldSid) + RtlLengthSid(RestrictedSid) + RtlLengthSid(AdminSid); + SidLength *= 2; + goto NotInitial; + } + + /* Allocate an ACL with two ACEs with two SIDs each */ + SidLength = RtlLengthSid(SystemSid) + RtlLengthSid(AdminSid); + AclLength = sizeof(ACL) + 2 * sizeof(ACCESS_ALLOWED_ACE) + SidLength; + Acl = RtlAllocateHeap(RtlGetProcessHeap(), 0, AclLength); + if (!Acl) Status = STATUS_NO_MEMORY; + if (!NT_SUCCESS(Status)) goto NextAcl; + + /* Now build the ACL and add the two ACEs */ + Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION2); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, SystemSid); + ASSERT(NT_SUCCESS(Status)); + + /* Set this as the DACL */ + Status = RtlSetDaclSecurityDescriptor(SmpApiPortSecurityDescriptor, + TRUE, + Acl, + FALSE); + ASSERT(NT_SUCCESS(Status)); + +NextAcl: + /* Allocate an ACL with 6 ACEs, two ACEs per SID */ + SidLength = RtlLengthSid(WorldSid) + RtlLengthSid(RestrictedSid) + RtlLengthSid(AdminSid); + SidLength *= 2; + AclLength = sizeof(ACL) + 6 * sizeof(ACCESS_ALLOWED_ACE) + SidLength; + Acl = RtlAllocateHeap(RtlGetProcessHeap(), 0, AclLength); + if (!Acl) Status = STATUS_NO_MEMORY; + if (!NT_SUCCESS(Status)) goto NotInitial; + + /* Now build the ACL and add the six ACEs */ + Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION2); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + + /* Now edit the last three ACEs and make them inheritable */ + Status = RtlGetAce(Acl, 3, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 4, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 5, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + + /* Set this as the DACL */ + Status = RtlSetDaclSecurityDescriptor(SmpKnownDllsSecurityDescriptor, + TRUE, + Acl, + FALSE); + ASSERT(NT_SUCCESS(Status)); + +NotInitial: + /* The initial ACLs have been created, are we also protecting objects? */ + if (!ProtectionRequired) goto Quickie; + + /* Allocate an ACL with 7 ACEs, two ACEs per SID, and one final owner ACE */ + SidLength += RtlLengthSid(OwnerSid); + AclLength = sizeof(ACL) + 7 * sizeof (ACCESS_ALLOWED_ACE) + 2 * SidLength; + Acl = RtlAllocateHeap(RtlGetProcessHeap(), 0, AclLength); + if (!Acl) Status = STATUS_NO_MEMORY; + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Build the ACL and add the seven ACEs */ + Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION2); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, OwnerSid); + ASSERT(NT_SUCCESS(Status)); + + /* Edit the last 4 ACEs to make then inheritable */ + Status = RtlGetAce(Acl, 3, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 4, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 5, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 6, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + + /* Set this as the DACL for the primary SD */ + Status = RtlSetDaclSecurityDescriptor(SmpPrimarySecurityDescriptor, + TRUE, + Acl, + FALSE); + ASSERT(NT_SUCCESS(Status)); + + /* Allocate an ACL with 7 ACEs, two ACEs per SID, and one final owner ACE */ + AclLength = sizeof(ACL) + 7 * sizeof (ACCESS_ALLOWED_ACE) + 2 * SidLength; + Acl = RtlAllocateHeap(RtlGetProcessHeap(), 0, AclLength); + if (!Acl) Status = STATUS_NO_MEMORY; + if (!NT_SUCCESS(Status)) goto Quickie; + + /* Build the ACL and add the seven ACEs */ + Status = RtlCreateAcl(Acl, AclLength, ACL_REVISION2); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, WorldSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_EXECUTE | GENERIC_READ | GENERIC_WRITE, RestrictedSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, AdminSid); + ASSERT(NT_SUCCESS(Status)); + Status = RtlAddAccessAllowedAce(Acl, ACL_REVISION2, GENERIC_ALL, OwnerSid); + ASSERT(NT_SUCCESS(Status)); + + /* Edit the last 4 ACEs to make then inheritable */ + Status = RtlGetAce(Acl, 3, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 4, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 5, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + Status = RtlGetAce(Acl, 6, (PVOID)&Ace); + ASSERT(NT_SUCCESS(Status)); + Ace->AceFlags = OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE; + + /* Now set this as the DACL for the liberal SD */ + Status = RtlSetDaclSecurityDescriptor(SmpLiberalSecurityDescriptor, + TRUE, + Acl, + FALSE); + ASSERT(NT_SUCCESS(Status)); + +Quickie: + /* Cleanup the SIDs */ + if (OwnerSid) RtlFreeHeap(RtlGetProcessHeap(), 0, OwnerSid); + if (AdminSid) RtlFreeHeap(RtlGetProcessHeap(), 0, AdminSid); + if (WorldSid) RtlFreeHeap(RtlGetProcessHeap(), 0, WorldSid); + if (SystemSid) RtlFreeHeap(RtlGetProcessHeap(), 0, SystemSid); + if (RestrictedSid) RtlFreeHeap(RtlGetProcessHeap(), 0, RestrictedSid); + return Status; +} + +NTSTATUS +NTAPI +SmpLoadDataFromRegistry(OUT PUNICODE_STRING InitialCommand) +{ + return STATUS_SUCCESS; +} NTSTATUS NTAPI SmpInit(IN PUNICODE_STRING InitialCommand, OUT PHANDLE ProcessHandle) { - return STATUS_SUCCESS; + NTSTATUS Status, Status2; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PortName, EventName; + HANDLE EventHandle, PortHandle; + ULONG HardErrorMode; + + /* Create the SMSS Heap */ + SmBaseTag = RtlCreateTagHeap(RtlGetProcessHeap(), + 0, + L"SMSS!", + L"INIT"); + SmpHeap = RtlGetProcessHeap(); + + /* Enable hard errors */ + HardErrorMode = TRUE; + NtSetInformationProcess(NtCurrentProcess(), + ProcessDefaultHardErrorMode, + &HardErrorMode, + sizeof(HardErrorMode)); + + /* Initialize the subsystem list and the session list, plus their locks */ + RtlInitializeCriticalSection(&SmpKnownSubSysLock); + InitializeListHead(&SmpKnownSubSysHead); + RtlInitializeCriticalSection(&SmpSessionListLock); + InitializeListHead(&SmpSessionListHead); + + /* Initialize the process list */ + InitializeListHead(&NativeProcessList); + + /* Initialize session parameters */ + SmpNextSessionId = 1; + SmpNextSessionIdScanMode = 0; + SmpDbgSsLoaded = FALSE; + + /* Create the initial security descriptors */ + Status = SmpCreateSecurityDescriptors(TRUE); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SMSS_CHECKPOINT(SmpCreateSecurityDescriptors, Status); + return Status; + } + + /* Initialize subsystem names */ + RtlInitUnicodeString(&SmpSubsystemName, L"NT-Session Manager"); + RtlInitUnicodeString(&PosixName, L"POSIX"); + RtlInitUnicodeString(&Os2Name, L"OS2"); + + /* Create the SM API Port */ + RtlInitUnicodeString(&PortName, L"\\Sm2ApiPort"); + InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, NULL); + Status = NtCreatePort(&PortHandle, + &ObjectAttributes, + sizeof(SB_CONNECTION_INFO), + sizeof(SM_API_MSG), + sizeof(SB_API_MSG) * 32); + ASSERT(NT_SUCCESS(Status)); + SmpDebugPort = PortHandle; + + /* Create two SM API threads */ + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + SmpApiLoop, + PortHandle, + NULL, + NULL); + ASSERT(NT_SUCCESS(Status)); + Status = RtlCreateUserThread(NtCurrentProcess(), + NULL, + FALSE, + 0, + 0, + 0, + SmpApiLoop, + PortHandle, + NULL, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Create the write event that autochk can set after running */ + RtlInitUnicodeString(&EventName, L"\\Device\\VolumesSafeForWriteAccess"); + InitializeObjectAttributes(&ObjectAttributes, + &EventName, + OBJ_PERMANENT, + NULL, + NULL); + Status2 = NtCreateEvent(&EventHandle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + 0, + 0); + if (!NT_SUCCESS(Status2)) + { + /* Should never really fail */ + DPRINT1("SMSS: Unable to create %wZ event - Status == %lx\n", + &EventName, Status2); + ASSERT(NT_SUCCESS(Status2)); + } + + /* Now initialize everything else based on the registry parameters */ + Status = SmpLoadDataFromRegistry(InitialCommand); + if (NT_SUCCESS(Status)) + { + /* Autochk should've run now. Set the event and save the CSRSS handle */ + *ProcessHandle = SmpWindowsSubSysProcess; + NtSetEvent(EventHandle, 0); + NtClose(EventHandle); + } + + /* All done */ + return Status; } Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Mon Jan 30 03:44:27 2012 @@ -15,3 +15,25 @@ /* GLOBALS ********************************************************************/ /* FUNCTIONS ******************************************************************/ + +ULONG +NTAPI +SmpApiLoop(IN PVOID Parameter) +{ + HANDLE SmApiPort = (HANDLE)Parameter; + NTSTATUS Status; + PVOID ClientContext; + PSM_API_MSG RequestMsg = NULL; + SM_API_MSG ReplyMsg; + + DPRINT1("API Loop: %p\n", SmApiPort); + while (TRUE) + { + Status = NtReplyWaitReceivePort(SmApiPort, + &ClientContext, + &RequestMsg->h, + &ReplyMsg.h); + DPRINT1("API loop returned: %lx\n", Status); + } + return STATUS_SUCCESS; +} Modified: trunk/reactos/base/system/smss2/smsessn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsessn.… ============================================================================== --- trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] Mon Jan 30 03:44:27 2012 @@ -14,4 +14,10 @@ /* GLOBALS ********************************************************************/ +RTL_CRITICAL_SECTION SmpSessionListLock; +LIST_ENTRY SmpSessionListHead; +ULONG SmpNextSessionId; +ULONG SmpNextSessionIdScanMode; +BOOLEAN SmpDbgSsLoaded; + /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 03:44:27 2012 @@ -30,6 +30,17 @@ /* DEFINES ********************************************************************/ +/* EXTERNALS ******************************************************************/ + +extern RTL_CRITICAL_SECTION SmpKnownSubSysLock; +extern LIST_ENTRY SmpKnownSubSysHead; +extern RTL_CRITICAL_SECTION SmpSessionListLock; +extern LIST_ENTRY SmpSessionListHead; +extern ULONG SmpNextSessionId; +extern ULONG SmpNextSessionIdScanMode; +extern BOOLEAN SmpDbgSsLoaded; +extern HANDLE SmpWindowsSubSysProcess; + /* FUNCTIONS ******************************************************************/ NTSTATUS @@ -51,3 +62,9 @@ SmpReleasePrivilege( IN PVOID State ); + +ULONG +NTAPI +SmpApiLoop( + IN PVOID Parameter +); Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Mon Jan 30 03:44:27 2012 @@ -14,6 +14,10 @@ /* GLOBALS ********************************************************************/ +RTL_CRITICAL_SECTION SmpKnownSubSysLock; +LIST_ENTRY SmpKnownSubSysHead; +HANDLE SmpWindowsSubSysProcess; + /* FUNCTIONS ******************************************************************/ /* EOF */

12 years, 11 months

[ion] 55313: [SMSS]: Oh, right, compilation units. I had forgotten how much I hate rbuild.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 03:16:47 2012 New Revision: 55313 URL: http://svn.reactos.org/svn/reactos?rev=55313&view=rev Log: [SMSS]: Oh, right, compilation units. I had forgotten how much I hate rbuild. Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Mon Jan 30 03:16:47 2012 @@ -5,6 +5,9 @@ * PURPOSE: SMSS (SB and SM) Message Format * PROGRAMMERS: Alex Ionescu */ +#pragma once +#ifndef _SM_MSG_ +#define _SM_MSG_ // // There are the APIs that a Client (such as CSRSS) can send to the SMSS Server. @@ -205,4 +208,4 @@ // C_ASSERT(sizeof(SB_CONNECTION_INFO) == 0xF4); C_ASSERT(sizeof(SB_API_MSG) == 0x110); - +#endif

12 years, 11 months

[ion] 55312: [SMSS2]: Oh, right, rbuild.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 02:49:16 2012 New Revision: 55312 URL: http://svn.reactos.org/svn/reactos?rev=55312&view=rev Log: [SMSS2]: Oh, right, rbuild. Modified: trunk/reactos/base/system/smss2/smss2.rbuild Modified: trunk/reactos/base/system/smss2/smss2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss2.rb… ============================================================================== --- trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] Mon Jan 30 02:49:16 2012 @@ -5,10 +5,19 @@ <include base="smss2">.</include> <include base="ReactOS">include/reactos/subsys</include> <library>nt</library> + <library>pseh</library> <library>ntdll</library> <pch>smss.h</pch> <compilationunit name="unit.c"> <file>smss.c</file> + <file>crashdmp.c</file> + <file>pagefile.c</file> + <file>sminit.c</file> + <file>smloop.c</file> + <file>smsbapi.c</file> + <file>smsessn.c</file> + <file>smsubsys.c</file> + <file>smutil.c</file> </compilationunit> <file>smss.rc</file> </module>

12 years, 11 months

[ion] 55311: [SMSS2]: Flesh out the _main function in the new SMSS, including the SEH filter and SmpTerminate support. Instead of launching Winlogon (The "initial command", we launch the ReactOS SM...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 02:10:39 2012 New Revision: 55311 URL: http://svn.reactos.org/svn/reactos?rev=55311&view=rev Log: [SMSS2]: Flesh out the _main function in the new SMSS, including the SEH filter and SmpTerminate support. Instead of launching Winlogon (The "initial command", we launch the ReactOS SMSS for now -- and kill the system if it is ever terminated, as we should). We use the right priority, set the right critical flags, use the correct debug parameters, and acquire/release the correct privileges. Only thing not supported is launching ntsd if the "Debug Initial Command" global flag is set. I promise to implement that once someone implements ntsd ;-) Added: trunk/reactos/base/system/smss2/crashdmp.c (with props) trunk/reactos/base/system/smss2/pagefile.c (with props) trunk/reactos/base/system/smss2/sminit.c (with props) trunk/reactos/base/system/smss2/smloop.c (with props) trunk/reactos/base/system/smss2/smsbapi.c (with props) trunk/reactos/base/system/smss2/smsessn.c (with props) trunk/reactos/base/system/smss2/smsubsys.c (with props) trunk/reactos/base/system/smss2/smutil.c (with props) Modified: trunk/reactos/base/system/smss2/CMakeLists.txt trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss.h Modified: trunk/reactos/base/system/smss2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/CMakeLis… ============================================================================== --- trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -2,12 +2,20 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) list(APPEND SOURCE - smss.c - smss.rc) + crashdmp.c + pagefile.c + sminit.c + smloop.c + smsbapi.c + smsessn.c + smsubsys.c + smutil.c + smss.c + smss.rc) add_executable(smss2 WIN32 ${SOURCE}) -target_link_libraries(smss2 nt) +target_link_libraries(smss2 nt pseh) add_pch(smss2 smss.h) Added: trunk/reactos/base/system/smss2/crashdmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/crashdmp… ============================================================================== --- trunk/reactos/base/system/smss2/crashdmp.c (added) +++ trunk/reactos/base/system/smss2/crashdmp.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/base/system/smss2/crashdmp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c (added) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/base/system/smss2/pagefile.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c (added) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpInit(IN PUNICODE_STRING InitialCommand, + OUT PHANDLE ProcessHandle) +{ + return STATUS_SUCCESS; +} Propchange: trunk/reactos/base/system/smss2/sminit.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c (added) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/base/system/smss2/smloop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/smsbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsbapi.… ============================================================================== --- trunk/reactos/base/system/smss2/smsbapi.c (added) +++ trunk/reactos/base/system/smss2/smsbapi.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/base/system/smss2/smsbapi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/smsessn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsessn.… ============================================================================== --- trunk/reactos/base/system/smss2/smsessn.c (added) +++ trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ Propchange: trunk/reactos/base/system/smss2/smsessn.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -27,6 +27,9 @@ ULONG NtInitialUserProcessBufferType = REG_SZ; UNICODE_STRING NtSystemRoot; + +ULONG AttachedSessionId = -1; +BOOLEAN SmpDebug; /* FUNCTIONS ******************************************************************/ @@ -176,7 +179,7 @@ (USHORT)Size); /* Append the DLL path to it */ - RtlAppendUnicodeToString(&Environment, L"Path=" ); + RtlAppendUnicodeToString(&Environment, L"Path="); RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath); RtlAppendUnicodeStringToString(&Environment, &NullString); @@ -246,19 +249,20 @@ NTSTATUS NTAPI -LaunchOldSmss(VOID) +LaunchOldSmss(OUT PHANDLE Handles) { PINIT_BUFFER InitBuffer; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; PRTL_USER_PROCESS_INFORMATION ProcessInfo; - LARGE_INTEGER Timeout; NTSTATUS Status; PCHAR Environment; - SIZE_T Size; - + + /* No handles at first */ + Handles[0] = Handles[1] = NULL; + /* Setup system root */ RtlInitUnicodeString(&NtSystemRoot, SharedUserData->NtSystemRoot); - + /* Allocate the initialization buffer */ InitBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(INIT_BUFFER)); if (!InitBuffer) @@ -266,7 +270,7 @@ /* Bugcheck */ return STATUS_NO_MEMORY; } - + /* Launch initial process */ ProcessInfo = &InitBuffer->ProcessInfo; Status = ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); @@ -277,51 +281,223 @@ return Status; } - /* Wait 5 seconds for initial process to initialize */ - Timeout.QuadPart = Int32x32To64(5, -10000000); - Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); - if (Status == STATUS_SUCCESS) - { - /* Failed, display error */ - DPRINT1("INIT: Session Manager terminated.\n"); - return STATUS_UNSUCCESSFUL; - } - - /* Close process handles */ - ZwClose(ProcessInfo->ThreadHandle); - ZwClose(ProcessInfo->ProcessHandle); - - /* Free the initial process environment */ - Size = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&Environment, - &Size, - MEM_RELEASE); - - /* Free the initial process parameters */ - Size = 0; - ZwFreeVirtualMemory(NtCurrentProcess(), - (PVOID*)&ProcessParameters, - &Size, - MEM_RELEASE); - return STATUS_SUCCESS; + /* Return the handle and status */ + Handles[0] = ProcessInfo->ProcessHandle; + Handles[1] = ProcessInfo->ProcessHandle; + return Status; } NTSTATUS -__cdecl +NTAPI +SmpTerminate(IN PULONG_PTR Parameters, + IN ULONG ParameterMask, + IN ULONG ParameterCount) +{ + NTSTATUS Status; + BOOLEAN Old; + ULONG Response; + + /* Give the shutdown privilege to the thread */ + if (RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, TRUE, &Old) == + STATUS_NO_TOKEN) + { + /* Thread doesn't have a token, give it to the entire process */ + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); + } + + /* Take down the process/machine with a hard error */ + Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, + ParameterCount, + ParameterMask, + Parameters, + OptionShutdownSystem, + &Response); + + /* Terminate the process if the hard error didn't already */ + return NtTerminateProcess(NtCurrentProcess(), Status); +} + +LONG +SmpUnhandledExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) +{ + ULONG_PTR Parameters[4]; + UNICODE_STRING DestinationString; + + /* Print and breakpoint into the debugger */ + DbgPrint("SMSS: Unhandled exception - Status == %x IP == %x\n", + ExceptionInfo->ExceptionRecord->ExceptionCode, + ExceptionInfo->ExceptionRecord->ExceptionAddress); + DbgPrint(" Memory Address: %x Read/Write: %x\n", + ExceptionInfo->ExceptionRecord->ExceptionInformation[0], + ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); + DbgBreakPoint(); + + /* Build the hard error and terminate */ + RtlInitUnicodeString(&DestinationString, L"Unhandled Exception in Session Manager"); + Parameters[0] = (ULONG_PTR)&DestinationString; + Parameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode; + Parameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; + Parameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; + SmpTerminate(Parameters, 1, RTL_NUMBER_OF(Parameters)); + + /* We hould never get here */ + ASSERT(FALSE); + return EXCEPTION_EXECUTE_HANDLER; +} + +NTSTATUS _main(IN INT argc, IN PCHAR argv[], IN PCHAR envp[], IN ULONG DebugFlag) { NTSTATUS Status; - - /* Launch the original SMSS */ - DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(); - - /* Terminate this SMSS for now, later we'll have an LPC thread running */ - return NtTerminateThread(NtCurrentThread(), Status); + KPRIORITY SetBasePriority; + ULONG_PTR Parameters[4]; + HANDLE Handles[2]; + PVOID State; + ULONG Flags; + PROCESS_BASIC_INFORMATION ProcessInfo; + UNICODE_STRING DbgString, InitialCommand; + + /* Make us critical */ + RtlSetProcessIsCritical(TRUE, NULL, FALSE); + RtlSetThreadIsCritical(TRUE, NULL, FALSE); + + /* Raise our priority */ + SetBasePriority = 11; + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + (PVOID)&SetBasePriority, + sizeof(SetBasePriority)); + ASSERT(NT_SUCCESS(Status)); + + /* Save the debug flag if it was passed */ + if (DebugFlag) SmpDebug = DebugFlag; + + /* Build the hard error parameters */ + Parameters[0] = (ULONG_PTR)&DbgString; + Parameters[1] = Parameters[2] = Parameters[3] = 0; + + /* Enter SEH so we can terminate correctly if anything goes wrong */ + _SEH2_TRY + { + /* Initialize SMSS */ + Status = SmpInit(&InitialCommand, Handles); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: SmpInit return failure - Status == %x\n"); + RtlInitUnicodeString(&DbgString, L"Session Manager Initialization"); + Parameters[1] = Status; + _SEH2_LEAVE; + } + + /* Get the global flags */ + Status = NtQuerySystemInformation(SystemFlagsInformation, + &Flags, + sizeof(Flags), + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Before executing the initial command check if the debug flag is on */ + if (Flags & (FLG_DEBUG_INITIAL_COMMAND | FLG_DEBUG_INITIAL_COMMAND_EX)) + { + /* SMSS should launch ntsd with a few parameters at this point */ + DPRINT1("Global Flags Set to SMSS Debugging: Not yet supported\n"); + } + +#if 0 + /* Execute the initial command (Winlogon.exe) */ + Status = SmpExecuteInitialCommand(0, &InitialCommand, &Handles[1], NULL); +#else + /* Launch the original SMSS */ + DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); + Status = LaunchOldSmss(Handles); +#endif + if (!NT_SUCCESS(Status)) + { + /* Fail and raise a hard error */ + DPRINT1("SMSS: Execute Initial Command failed\n"); + RtlInitUnicodeString(&DbgString, + L"Session Manager ExecuteInitialCommand"); + Parameters[1] = Status; + _SEH2_LEAVE; + } + + /* Check if we're already attached to a session */ + Status = SmpAcquirePrivilege(SE_LOAD_DRIVER_PRIVILEGE, &State); + if (AttachedSessionId != -1) + { + /* Detach from it, we should be in no session right now */ + Status = NtSetSystemInformation(SystemSessionDetach, + &AttachedSessionId, + sizeof(AttachedSessionId)); + ASSERT(NT_SUCCESS(Status)); + AttachedSessionId = -1; + } + SmpReleasePrivilege(State); + + /* Wait on either CSRSS or Winlogon to die */ + Status = NtWaitForMultipleObjects(RTL_NUMBER_OF(Handles), + Handles, + WaitAny, + FALSE, + NULL); + if (Status == STATUS_WAIT_0) + { + /* CSRSS is dead, get exit code and prepare for the hard error */ + RtlInitUnicodeString(&DbgString, L"Windows SubSystem"); + Status = NtQueryInformationProcess(Handles[0], + ProcessBasicInformation, + &ProcessInfo, + sizeof(ProcessInfo), + NULL); + DPRINT1("SMSS: Windows subsystem terminated when it wasn't supposed to.\n"); + } + else + { + /* The initial command is dead or we have another failure */ + RtlInitUnicodeString(&DbgString, L"Windows Logon Process"); + if (Status == STATUS_WAIT_1) + { + /* Winlogon.exe got terminated, get its exit code */ + Status = NtQueryInformationProcess(Handles[1], + ProcessBasicInformation, + &ProcessInfo, + sizeof(ProcessInfo), + NULL); + } + else + { + /* Something else satisfied our wait, so set the wait status */ + ProcessInfo.ExitStatus = Status; + Status = STATUS_SUCCESS; + } + DPRINT1("SMSS: Initial command '%wZ' terminated when it wasn't supposed to.\n", + &InitialCommand); + } + + /* Check if NtQueryInformationProcess was successful */ + if (NT_SUCCESS(Status)) + { + /* Then we must have a valid exit status in the structure, use it */ + Parameters[1] = ProcessInfo.ExitStatus; + } + else + { + /* We really don't know what happened, so set a generic error */ + Parameters[1] = STATUS_UNSUCCESSFUL; + } + } + _SEH2_EXCEPT(SmpUnhandledExceptionFilter(_SEH2_GetExceptionInformation())) + { + /* The filter should never return here */ + ASSERT(FALSE); + } + _SEH2_END; + + /* Something in the init loop failed, terminate SMSS */ + return SmpTerminate(Parameters, 1, RTL_NUMBER_OF(Parameters)); } /* EOF */ Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,4 +1,53 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.h + * PURPOSE: Main SMSS Header + * PROGRAMMERS: Alex Ionescu + */ + +/* DEPENDENCIES ***************************************************************/ + +// +// Native Headers +// #define WIN32_NO_STATUS -#include <windows.h> +#include <windows.h> // Should just be using ntdef.h I think +#define RTL_NUMBER_OF_V1(A) (sizeof(A)/sizeof((A)[0])) +#define RTL_NUMBER_OF_V2(A) RTL_NUMBER_OF_V1(A) +#ifdef ENABLE_RTL_NUMBER_OF_V2 +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V2(A) +#else +#define RTL_NUMBER_OF(A) RTL_NUMBER_OF_V1(A) +#endif #define NTOS_MODE_USER #include <ndk/ntndk.h> + +// +// SM Protocol Header +// +#include "sm/smmsg.h" + +/* DEFINES ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpInit( + IN PUNICODE_STRING InitialCommand, + OUT PHANDLE ProcessHandle +); + +NTSTATUS +NTAPI +SmpAcquirePrivilege( + IN ULONG Privilege, + OUT PVOID *PrivilegeStat +); + +VOID +NTAPI +SmpReleasePrivilege( + IN PVOID State +); Added: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c (added) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +/* EOF */ Propchange: trunk/reactos/base/system/smss2/smsubsys.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/smss2/smutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smutil.c… ============================================================================== --- trunk/reactos/base/system/smss2/smutil.c (added) +++ trunk/reactos/base/system/smss2/smutil.c [iso-8859-1] Mon Jan 30 02:10:39 2012 @@ -1,0 +1,141 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: base/system/smss/smss.c + * PURPOSE: Main SMSS Code + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "smss.h" +#define NDEBUG +#include "debug.h" + +/* GLOBALS ********************************************************************/ + +typedef struct _SMP_PRIVILEGE_STATE +{ + HANDLE TokenHandle; + PTOKEN_PRIVILEGES OldPrivileges; + PTOKEN_PRIVILEGES NewPrivileges; + UCHAR OldBuffer[1024]; + TOKEN_PRIVILEGES NewBuffer; +} SMP_PRIVILEGE_STATE, *PSMP_PRIVILEGE_STATE; + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpAcquirePrivilege(IN ULONG Privilege, + OUT PVOID *PrivilegeState) +{ + PSMP_PRIVILEGE_STATE State; + ULONG Size; + NTSTATUS Status; + + /* Assume failure */ + *PrivilegeState = NULL; + + /* Acquire the state structure to hold everything we need */ + State = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(SMP_PRIVILEGE_STATE) + + sizeof(TOKEN_PRIVILEGES) + + sizeof(LUID_AND_ATTRIBUTES)); + if (!State) return STATUS_NO_MEMORY; + + /* Open our token */ + Status = NtOpenProcessToken(NtCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &State->TokenHandle); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + RtlFreeHeap(RtlGetProcessHeap(), 0, State); + return Status; + } + + /* Set one privilege in the enabled state */ + State->NewPrivileges = &State->NewBuffer; + State->OldPrivileges = (PTOKEN_PRIVILEGES)&State->OldBuffer; + State->NewPrivileges->PrivilegeCount = 1; + State->NewPrivileges->Privileges[0].Luid = RtlConvertUlongToLuid(Privilege); + State->NewPrivileges->Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + /* Adjust the privileges in the token */ + Size = sizeof(State->OldBuffer); + Status = NtAdjustPrivilegesToken(State->TokenHandle, + FALSE, + State->NewPrivileges, + Size, + State->OldPrivileges, + &Size); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Our static buffer is not big enough, allocate a bigger one */ + State->OldPrivileges = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + if (!State->OldPrivileges) + { + /* Out of memory, fail */ + Status = STATUS_NO_MEMORY; + goto Quickie; + } + + /* Now try again */ + Status = NtAdjustPrivilegesToken(State->TokenHandle, + FALSE, + State->NewPrivileges, + Size, + State->OldPrivileges, + &Size); + } + + /* Normalize failure code and check for success */ + if (Status == STATUS_NOT_ALL_ASSIGNED) Status = STATUS_PRIVILEGE_NOT_HELD; + if (NT_SUCCESS(Status)) + { + /* We got the privilege, return */ + *PrivilegeState = State; + return STATUS_SUCCESS; + } + +Quickie: + /* Check if we used a dynamic buffer */ + if (State->OldPrivileges != (PTOKEN_PRIVILEGES)&State->OldBuffer) + { + /* Free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, State->OldPrivileges); + } + + /* Close the token handle and free the state structure */ + NtClose(State->TokenHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, State); + return Status; +} + +VOID +NTAPI +SmpReleasePrivilege(IN PVOID PrivState) +{ + PSMP_PRIVILEGE_STATE State = (PSMP_PRIVILEGE_STATE)PrivState; + + /* Adjust the privileges in the token */ + NtAdjustPrivilegesToken(State->TokenHandle, + FALSE, + State->OldPrivileges, + 0, + NULL, + NULL); + + /* Check if we used a dynamic buffer */ + if (State->OldPrivileges != (PTOKEN_PRIVILEGES)&State->OldBuffer) + { + /* Free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, State->OldPrivileges); + } + + /* Close the token handle and free the state structure */ + NtClose(State->TokenHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, State); +} Propchange: trunk/reactos/base/system/smss2/smutil.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 11 months

[ion] 55310: [RTL]: Document, define, implement, and export RtlSetThreadIsCritical.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 01:14:33 2012 New Revision: 55310 URL: http://svn.reactos.org/svn/reactos?rev=55310&view=rev Log: [RTL]: Document, define, implement, and export RtlSetThreadIsCritical. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/subsys/sm/smmsg.h trunk/reactos/lib/rtl/process.c trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -895,7 +895,7 @@ @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) //@ stdcall RtlSetSecurityObjectEx //@ stdcall RtlSetThreadErrorMode -//@ stdcall RtlSetThreadIsCritical +@ stdcall RtlSetThreadIsCritical(long ptr long) //@ stdcall RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) //@ stdcall RtlSetTimer Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -895,7 +895,7 @@ @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) ;@ stdcall RtlSetSecurityObjectEx ;@ stdcall RtlSetThreadErrorMode -;@ stdcall RtlSetThreadIsCritical +@ stdcall RtlSetThreadIsCritical(long ptr long) ;@ stdcall RtlSetThreadPoolStartFunc @ stdcall RtlSetTimeZoneInformation(ptr) ;@ stdcall RtlSetTimer Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -2401,6 +2401,15 @@ NTSTATUS NTAPI RtlSetProcessIsCritical( + IN BOOLEAN NewValue, + OUT PBOOLEAN OldValue OPTIONAL, + IN BOOLEAN NeedBreaks +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlSetThreadIsCritical( IN BOOLEAN NewValue, OUT PBOOLEAN OldValue OPTIONAL, IN BOOLEAN NeedBreaks Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -53,6 +53,7 @@ RTL_USER_PROCESS_INFORMATION ProcessInformation; BOOLEAN DebugFlag; } SM_EXEC_PGM_MSG, *PM_EXEC_PGM_MSG; +C_ASSERT(sizeof(SM_EXEC_PGM_MSG) == 0x48); typedef struct _SM_LOAD_DEFERED_SUBSYSTEM_MSG { Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=5531… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -362,16 +362,19 @@ OUT PBOOLEAN OldValue OPTIONAL, IN BOOLEAN NeedBreaks) { - ULONG BreakOnTermination = FALSE; - - if (OldValue) - *OldValue = FALSE; + ULONG BreakOnTermination; + + /* Initialize to FALSE */ + if (OldValue) *OldValue = FALSE; /* Fail, if the critical breaks flag is required but is not set */ - if (NeedBreaks == TRUE && + if ((NeedBreaks) && !(NtCurrentPeb()->NtGlobalFlag & FLG_ENABLE_SYSTEM_CRIT_BREAKS)) + { return STATUS_UNSUCCESSFUL; - + } + + /* Check if the caller wants the old value */ if (OldValue) { /* Query and return the old break on termination flag for the process */ Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=55310… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Mon Jan 30 01:14:33 2012 @@ -149,6 +149,48 @@ } /* FUNCTIONS ***************************************************************/ + + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetThreadIsCritical(IN BOOLEAN NewValue, + OUT PBOOLEAN OldValue OPTIONAL, + IN BOOLEAN NeedBreaks) +{ + ULONG BreakOnTermination; + + /* Initialize to FALSE */ + if (OldValue) *OldValue = FALSE; + + /* Fail, if the critical breaks flag is required but is not set */ + if ((NeedBreaks) && + !(NtCurrentPeb()->NtGlobalFlag & FLG_ENABLE_SYSTEM_CRIT_BREAKS)) + { + return STATUS_UNSUCCESSFUL; + } + + /* Check if the caller wants the old value */ + if (OldValue) + { + /* Query and return the old break on termination flag for the process */ + ZwQueryInformationThread(NtCurrentThread(), + ThreadBreakOnTermination, + &BreakOnTermination, + sizeof(ULONG), + NULL); + *OldValue = (BOOLEAN)BreakOnTermination; + } + + /* Set the break on termination flag for the process */ + BreakOnTermination = NewValue; + return ZwSetInformationThread(NtCurrentThread(), + ThreadBreakOnTermination, + &BreakOnTermination, + sizeof(ULONG)); +} /* @implemented

12 years, 11 months

[cgutman] 55309: [INF] - Formatting fixes [TXTSETUP.SIF] - Boot load certain USB drivers in 1st stage for eventual support for installing from USB

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 00:23:11 2012 New Revision: 55309 URL: http://svn.reactos.org/svn/reactos?rev=55309&view=rev Log: [INF] - Formatting fixes [TXTSETUP.SIF] - Boot load certain USB drivers in 1st stage for eventual support for installing from USB Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif branches/usb-bringup-trunk/media/inf/usb.inf Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Mon Jan 30 00:23:11 2012 @@ -35,13 +35,13 @@ hidclass.sys=,,,,,,,,,,,,4 hidparse.sys=,,,,,,,,,,,,4 hidusb.sys=,,,,,,,,,,,,4 -usbccgp.sys=,,,,,,,,,,,,4 -usbd.sys=,,,,,,,,,,,,4 -usbhub.sys=,,,,,,,,,,,,4 -;usbuhci.sys=,,,,,,,,,,,,4 -usbohci.sys=,,,,,,,,,,,,4 -usbehci.sys=,,,,,,,,,,,,4 -usbstor.sys=,,,,,,,,,,,,4 +usbccgp.sys=,,,,,,x,,,,,,4 +usbd.sys=,,,,,,x,,,,,,4 +usbhub.sys=,,,,,,x,,,,,,4 +;usbuhci.sys=,,,,,,x,,,,,,4 +usbohci.sys=,,,,,,x,,,,,,4 +usbehci.sys=,,,,,,x,,,,,,4 +usbstor.sys=,,,,,,x,,,,,,4 kbdhid.sys=,,,,,,,,,,,,4 kbdclass.sys=,,,,,,x,,,,,,4 l_intl.nls=,,,,,,,,,,,,2 Modified: branches/usb-bringup-trunk/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/usb… ============================================================================== Binary files - no diff available.

12 years, 11 months

[ion] 55308: [SMLIB]: Add NT-compatible SmConnectToSm and SmExecPgm functions to smlib, which CSRSS and other subsystems can use to talk to SMSS (and SMSS when it talks to itself). Not yet used.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 00:12:38 2012 New Revision: 55308 URL: http://svn.reactos.org/svn/reactos?rev=55308&view=rev Log: [SMLIB]: Add NT-compatible SmConnectToSm and SmExecPgm functions to smlib, which CSRSS and other subsystems can use to talk to SMSS (and SMSS when it talks to itself). Not yet used. Added: trunk/reactos/lib/smlib/smclient.c (with props) Modified: trunk/reactos/lib/smlib/CMakeLists.txt Modified: trunk/reactos/lib/smlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/smlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/CMakeLists.txt [iso-8859-1] Mon Jan 30 00:12:38 2012 @@ -5,7 +5,8 @@ compses.c connect.c execpgm.c - lookupss.c) + lookupss.c + smclient.c) add_library(smlib ${SOURCE}) add_pch(smlib precomp.h) Added: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c (added) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Mon Jan 30 00:12:38 2012 @@ -1,0 +1,130 @@ +/* + * PROJECT: ReactOS Windows-Compatible Session Manager + * LICENSE: BSD 2-Clause License + * FILE: lib/smlib/smclient.c + * PURPOSE: SMSS Client Library Stubs for calling SM APIs from a client + * PROGRAMMERS: Alex Ionescu + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" +#include "sm/smmsg.h" // To go in precomp.h after +#define NDEBUG +#include "debug.h" + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmExecPgm(IN HANDLE SmApiPort, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN BOOLEAN DebugFlag) +{ + NTSTATUS Status; + SM_API_MSG SmApiMsg; + +#ifdef _WIN64 // You can take care of this Timo + /* 64-bit SMSS needs to talk to 32-bit processes so do the LPC conversion */ + if (SmpIsWow64Process()) + { + return SmpWow64ExecPgm(SmApiPort, ProcessInformation, DebugFlag); + } +#endif + + /* Initialize the generic LPC header */ + SmApiMsg.h.u2.ZeroInit = 0; + SmApiMsg.h.u1.s1.DataLength = sizeof(SM_EXEC_PGM_MSG) + 8; + SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); + + /* Initalize this specific API's parameters */ + SmApiMsg.ApiNumber = SmpExecPgm; + RtlCopyMemory(&SmApiMsg.u.ExecPgm.ProcessInformation, + ProcessInformation, + sizeof(SmApiMsg.u.ExecPgm.ProcessInformation)); + SmApiMsg.u.ExecPgm.DebugFlag = DebugFlag; + + /* Send the message to SMSS */ + Status = NtRequestWaitReplyPort(SmApiPort, &SmApiMsg.h, &SmApiMsg.h); + if (!NT_SUCCESS(Status)) + { + DbgPrint("SmExecPgm: NtRequestWaitReply Failed %lx\n", Status); + } + else + { + /* Upon success, we use the API's return value */ + Status = SmApiMsg.ReturnValue; + } + + /* Close the handles that the parent passed in and return status */ + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + return Status; +} + +NTSTATUS +NTAPI +SmConnectToSm(IN PUNICODE_STRING SbApiPortName, + IN HANDLE SbApiPort, + IN ULONG ImageType, + IN HANDLE SmApiPort) +{ + NTSTATUS Status; + SB_CONNECTION_INFO ConnectInfo; + UNICODE_STRING DestinationString; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + ULONG ConnectInfoLength = sizeof(ConnectInfo); + + /* Setup the QoS structure */ + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + /* Set the SM API port name */ + RtlInitUnicodeString(&DestinationString, L"\\SmApiPort"); + + /* Check if this is a client connecting to SMSS, or SMSS to itself */ + if (SbApiPortName) + { + /* A client SB port as well as an image type must be present */ + if (!(SbApiPort) || !(ImageType)) return STATUS_INVALID_PARAMETER_MIX; + + /* Copy the client port name, and NULL-terminate it */ + RtlCopyMemory(ConnectInfo.SbApiPortName, + SbApiPortName->Buffer, + SbApiPortName->Length); + ConnectInfo.SbApiPortName[SbApiPortName->Length / + sizeof(WCHAR)] = UNICODE_NULL; + + /* Save the subsystem type */ + ConnectInfo.SubsystemType = ImageType; + } + else + { + /* No client port, and the subsystem type is not set */ + ConnectInfo.SbApiPortName[0] = UNICODE_NULL; + ConnectInfo.SubsystemType = IMAGE_SUBSYSTEM_UNKNOWN; + } + + /* Connect to SMSS and exchange connection information */ + Status = NtConnectPort(SmApiPort, + &DestinationString, + &SecurityQos, + NULL, + NULL, + NULL, + &ConnectInfo, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SmConnectToSm: Connect to Sm failed %lx\n", Status); + } + else + { + /* Treat a warning or informational status as success */ + Status = STATUS_SUCCESS; + } + + /* Return if the connection was successful or not */ + return Status; +} Propchange: trunk/reactos/lib/smlib/smclient.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
56
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 January 2012