Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55514: [USBHUB] - Ignore error when the device provides a string descriptor but no contents - Fixes installation of cheap usb devices
by janderwald＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: janderwald Date: Thu Feb 9 15:33:09 2012 New Revision: 55514 URL: http://svn.reactos.org/svn/reactos?rev=55514&view=rev Log: [USBHUB] - Ignore error when the device provides a string descriptor but no contents - Fixes installation of cheap usb devices Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu Feb 9 15:33:09 2012 @@ -1056,11 +1056,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - return Status; - } - - UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; - DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + RtlInitUnicodeString(&UsbChildExtension->usTextDescription, ""); + } + else + { + UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; + DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + } } //

1 0

[tkreuzer] 55513: [NTOSKRNL] Use MiNonPagedSystemSize when creating the system NP memory area instead of making assumptions about the memory layout Finally the amd64 port boots into usermode and us...
by tkreuzer＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: tkreuzer Date: Thu Feb 9 12:04:31 2012 New Revision: 55513 URL: http://svn.reactos.org/svn/reactos?rev=55513&view=rev Log: [NTOSKRNL] Use MiNonPagedSystemSize when creating the system NP memory area instead of making assumptions about the memory layout Finally the amd64 port boots into usermode and usetup is partly working, formats the harddisk but freezes, when copying files. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Feb 9 12:04:31 2012 @@ -126,8 +126,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - (ULONG_PTR)MmNonPagedPoolEnd - - (ULONG_PTR)MmNonPagedSystemStart, + MiNonPagedSystemSize, PAGE_READWRITE, &MArea, TRUE,

1 0

[tkreuzer] 55512: {RTL] - Fix RtlLengthSecurityDescriptor - Fix pointer calculation in amd64 interlocked slist code - Assert that the slist entry pointer is 16 byte aligned [CRT] - Add amd64 stubs ...
by tkreuzer＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: tkreuzer Date: Thu Feb 9 11:54:59 2012 New Revision: 55512 URL: http://svn.reactos.org/svn/reactos?rev=55512&view=rev Log: {RTL] - Fix RtlLengthSecurityDescriptor - Fix pointer calculation in amd64 interlocked slist code - Assert that the slist entry pointer is 16 byte aligned [CRT] - Add amd64 stubs for acos and acosf Added: trunk/reactos/lib/sdk/crt/math/amd64/acos.S (with props) trunk/reactos/lib/sdk/crt/math/amd64/acosf.S (with props) Modified: trunk/reactos/lib/rtl/amd64/slist.S trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/slist.S?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -18,7 +18,7 @@ #define SLIST8B_HEADERTYPE_MASK HEX(0000000000000001) #define SLIST8B_INIT_MASK HEX(0000000000000002) #define SLIST8B_REGION_MASK HEX(E000000000000000) -#define SLIST8_POINTER_MASK HEX(000007FFFFFFFFF0) +#define SLIST8_POINTER_MASK HEX(000007FFFFFFFFFF) #define SLIST16A_DEPTH_MASK HEX(000000000000FFFF) #define SLIST16A_DEPTH_INC HEX(0000000000000001) @@ -181,6 +181,15 @@ RtlInterlockedPushEntrySList: ExpInterlockedPushEntrySList: +#if DBG + /* Make sure the ListEntry is 16 bytes aligned */ + test rdx, HEX(0F) + jz ExpInterlockedPushEntrySListChecked + /* Not aligned, raise an assertion */ + int HEX(2C) +ExpInterlockedPushEntrySListChecked: +#endif + /* Load ListHead->Alignment into rax */ mov rax, [rcx] @@ -301,7 +310,7 @@ RtlInterlockedFlushSListLoop: - /* Zero ListHead->Alignment */ + /* Zero ListHead->Alignment */ xor r8, r8 /* If [rcx] equals rax, exchange it with r8 */ Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=55512&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -250,9 +250,14 @@ { PSID Owner, Group; PACL Sacl, Dacl; - ULONG Length = sizeof(SECURITY_DESCRIPTOR); - - PAGED_CODE_RTL(); + ULONG Length; + + PAGED_CODE_RTL(); + + if (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Control & SE_SELF_RELATIVE) + Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + else + Length = sizeof(SECURITY_DESCRIPTOR); RtlpQuerySecurityDescriptorPointers((PISECURITY_DESCRIPTOR)SecurityDescriptor, &Owner, Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -392,6 +392,8 @@ float/amd64/fpreset.S float/amd64/logb.S float/i386/statfp.c + math/amd64/acos.S + math/amd64/acosf.S math/amd64/atan.S math/amd64/atan2.S math/amd64/ceil.S Added: trunk/reactos/lib/sdk/crt/math/amd64/acos.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/aco… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/acos.S (added) +++ trunk/reactos/lib/sdk/crt/math/amd64/acos.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -1,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of acos + * FILE: lib/sdk/crt/math/amd64/acos.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +PUBLIC acos +acos: + UNIMPLEMENTED acos + ret + +END Propchange: trunk/reactos/lib/sdk/crt/math/amd64/acos.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/amd64/acosf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/aco… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/acosf.S (added) +++ trunk/reactos/lib/sdk/crt/math/amd64/acosf.S [iso-8859-1] Thu Feb 9 11:54:59 2012 @@ -1,0 +1,21 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of acosf + * FILE: lib/sdk/crt/math/amd64/acosf.S + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +PUBLIC acosf +acosf: + UNIMPLEMENTED acos + ret + +END Propchange: trunk/reactos/lib/sdk/crt/math/amd64/acosf.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 55511: [USB] Don't compile nt4 compat driver for amd64
by tkreuzer＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: tkreuzer Date: Thu Feb 9 11:51:21 2012 New Revision: 55511 URL: http://svn.reactos.org/svn/reactos?rev=55511&view=rev Log: [USB] Don't compile nt4 compat driver for amd64 Modified: trunk/reactos/drivers/usb/CMakeLists.txt Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Feb 9 11:51:21 2012 @@ -1,5 +1,7 @@ -add_subdirectory(nt4compat) +if(NOT ${ARCH} MATCHES amd64) + add_subdirectory(nt4compat) +endif() add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk

1 0

[tkreuzer] 55510: [CLASS2] Fix 64 bit warnings
by tkreuzer＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: tkreuzer Date: Thu Feb 9 11:34:21 2012 New Revision: 55510 URL: http://svn.reactos.org/svn/reactos?rev=55510&view=rev Log: [CLASS2] Fix 64 bit warnings Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Thu Feb 9 11:34:21 2012 @@ -1510,7 +1510,7 @@ srb, irpStack->MajorFunction, irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG_PTR)irpStack->Parameters.Others.Argument4), + MAXIMUM_RETRIES - PtrToUlong(irpStack->Parameters.Others.Argument4), &status); // @@ -1662,7 +1662,7 @@ srb, irpStack->MajorFunction, irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG_PTR)irpStack->Parameters.Others.Argument4), + MAXIMUM_RETRIES - PtrToUlong(irpStack->Parameters.Others.Argument4), &status); //

1 0

[ion] 55509: [SMSS2]: Implement SmpCallCsrCreateProcess and SmpLoadSubsystem. We now load CSRSS and everything works 100%! Winlogon is now launched by SMSS2 and no regressions have been found. [SMS...
by ion＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: ion Date: Thu Feb 9 02:21:56 2012 New Revision: 55509 URL: http://svn.reactos.org/svn/reactos?rev=55509&view=rev Log: [SMSS2]: Implement SmpCallCsrCreateProcess and SmpLoadSubsystem. We now load CSRSS and everything works 100%! Winlogon is now launched by SMSS2 and no regressions have been found. [SMSS]: Turn off all code other than setting up the pagefile. There's a lot of debug prints, as soon as things seem stable after a few days, SMSS will be gone and SMSS2 will take over and DPRINT1s will mostly be gone. Modified: trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/init.c [iso-8859-1] Thu Feb 9 02:21:56 2012 @@ -24,8 +24,8 @@ } InitRoutine [] = { {TRUE, SmCreateHeap, "create private heap, aborting"}, // {TRUE, SmCreateObjectDirectories, "create object directories"}, - {TRUE, SmCreateApiPort, "create \\SmApiPort"}, - {TRUE, SmCreateEnvironment, "create the system environment"}, +// {TRUE, SmCreateApiPort, "create \\SmApiPort"}, +// {TRUE, SmCreateEnvironment, "create the system environment"}, // {TRUE, SmSetEnvironmentVariables, "set system environment variables"}, // {TRUE, SmInitDosDevices, "create dos device links"}, // {TRUE, SmRunBootApplications, "run boot applications"}, @@ -34,8 +34,8 @@ // {FALSE, SmLoadKnownDlls, "preload system DLLs"}, {TRUE, SmCreatePagingFiles, "create paging files"}, // {TRUE, SmInitializeRegistry, "initialize the registry"}, - {TRUE, SmInitializeClientManagement, "initialize client management"}, - {TRUE, SmLoadSubsystems, "load subsystems"} +// {TRUE, SmInitializeClientManagement, "initialize client management"}, +// {TRUE, SmLoadSubsystems, "load subsystems"} }; NTSTATUS 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] Thu Feb 9 02:21:56 2012 @@ -23,6 +23,24 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +SmpCallCsrCreateProcess(IN PSB_API_MSG SbApiMsg, + IN USHORT MessageLength, + IN HANDLE PortHandle) +{ + NTSTATUS Status; + + /* Initialize the header and send the message to CSRSS */ + SbApiMsg->h.u2.ZeroInit = 0; + SbApiMsg->h.u1.s1.DataLength = MessageLength + 8; + SbApiMsg->h.u1.s1.TotalLength = sizeof(SB_API_MSG); + SbApiMsg->ApiNumber = SbpCreateProcess; + Status = NtRequestWaitReplyPort(PortHandle, &SbApiMsg->h, &SbApiMsg->h); + if (NT_SUCCESS(Status)) Status = SbApiMsg->ReturnValue; + return Status; +} + VOID NTAPI SmpDereferenceSubsystem(IN PSMP_SUBSYSTEM SubSystem) @@ -60,7 +78,7 @@ { /* Check if this one matches the client ID and is still valid */ Subsystem = CONTAINING_RECORD(NextEntry, SMP_SUBSYSTEM, Entry); - if ((*(PULONGLONG)&Subsystem->ClientId == *(PULONGLONG)&ClientId) && + if ((*(PULONGLONG)&Subsystem->ClientId == *(PULONGLONG)ClientId) && !(Subsystem->Terminating)) { /* Add a reference and return it */ @@ -123,8 +141,378 @@ OUT PHANDLE ProcessId, IN ULONG Flags) { - DPRINT1("Should start subsystem %wZ for Session: %lx\n", FileName, MuSessionId); - return STATUS_SUCCESS; + PSMP_SUBSYSTEM Subsystem, NewSubsystem, KnownSubsystem = NULL; + HANDLE SubSysProcessId; + NTSTATUS Status = STATUS_SUCCESS; + SB_API_MSG SbApiMsg, SbApiMsg2; + RTL_USER_PROCESS_INFORMATION ProcessInformation; + LARGE_INTEGER Timeout; + PVOID State; + PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; + PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; + DPRINT1("Loading subsystem: %wZ\n", FileName); + + /* Make sure this is a found subsystem */ + if (Flags & SMP_INVALID_PATH) + { + DPRINT1("SMSS: Unable to find subsystem - %wZ\n", FileName); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Don't use a session if the flag is set */ + if (Flags & 0x80) MuSessionId = 0; + + /* Lock the subsystems while we do a look up */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + while (TRUE) + { + /* Check if we found a subsystem not yet fully iniitalized */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, -1); + if (!Subsystem) break; + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + + /* Wait on it to initialize */ + NtWaitForSingleObject(Subsystem->Event, FALSE, NULL); + + /* Dereference it and try the next one */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + SmpDereferenceSubsystem(Subsystem); + } + + /* Check if this is a POSIX subsystem */ + if (Flags & SMP_POSIX_FLAG) + { + /* Do we already have it? */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, IMAGE_SUBSYSTEM_POSIX_CUI); + } + else if (Flags & SMP_OS2_FLAG) + { + /* This is an OS/2 subsystem, do we we already have it? */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, IMAGE_SUBSYSTEM_OS2_CUI); + } + + /* Check if we already have one of the optional subsystems for the session */ + if (Subsystem) + { + /* Dereference and return, no work to do */ + SmpDereferenceSubsystem(Subsystem); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_SUCCESS; + } + + /* Allocate a new subsystem! */ + NewSubsystem = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_SUBSYSTEM)); + DPRINT1("new subsystem created: %p\n", NewSubsystem); + if (!NewSubsystem) + { + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_NO_MEMORY; + } + + /* Initialize its header and reference count */ + NewSubsystem->ReferenceCount = 1; + NewSubsystem->MuSessionId = MuSessionId; + NewSubsystem->ImageType = -1; + + /* Clear out all the other data for now */ + NewSubsystem->Terminating = FALSE; + NewSubsystem->ProcessHandle = NULL; + NewSubsystem->Event = NULL; + NewSubsystem->PortHandle = NULL; + NewSubsystem->SbApiPort = NULL; + + /* Create the event we'll be wating on for initialization */ + Status = NtCreateEvent(&NewSubsystem->Event, + EVENT_ALL_ACCESS, + NULL, + NotificationEvent, + FALSE); + if (!NT_SUCCESS(Status)) + { + /* This failed, bail out */ + RtlFreeHeap(SmpHeap, 0, NewSubsystem); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return STATUS_NO_MEMORY; + } + + /* Insert the subsystem and release the lock. It can now be found */ + InsertTailList(&SmpKnownSubSysHead, &NewSubsystem->Entry); + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + + /* The OS/2 and POSIX subsystems are actually Windows applications! */ + if (Flags & (SMP_POSIX_FLAG | SMP_OS2_FLAG)) + { + /* Locate the Windows subsystem for this session */ + KnownSubsystem = SmpLocateKnownSubSysByType(MuSessionId, + IMAGE_SUBSYSTEM_WINDOWS_GUI); + if (!KnownSubsystem) + { + DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed\n"); + goto Quickie2; + } + + /* Fill out all the process details and call CSRSS to launch it */ + CreateProcess->In.ImageName = FileName; + CreateProcess->In.CurrentDirectory = Directory; + CreateProcess->In.CommandLine = CommandLine; + CreateProcess->In.DllPath = SmpDefaultLibPath.Length ? + &SmpDefaultLibPath : NULL; + CreateProcess->In.Flags = Flags | SMP_DEFERRED_FLAG; + CreateProcess->In.DebugFlags = SmpDebug; + Status = SmpCallCsrCreateProcess(&SbApiMsg, + sizeof(*CreateProcess), + KnownSubsystem->SbApiPort); + if (!NT_SUCCESS(Status)) + { + /* Handle failures */ + DPRINT1("SMSS: SmpLoadSubSystem - SmpCallCsrCreateProcess Failed with Status %lx\n", + Status); + goto Quickie2; + } + + /* Save the process information we'll need for the create session */ + ProcessInformation.ProcessHandle = CreateProcess->Out.ProcessHandle; + ProcessInformation.ThreadHandle = CreateProcess->Out.ThreadHandle; + ProcessInformation.ClientId = CreateProcess->Out.ClientId; + ProcessInformation.ImageInformation.SubSystemType = CreateProcess->Out.SubsystemType; + } + else + { + /* This must be CSRSS itself, so just launch it and that's it */ + DPRINT1("Executing CSRSS\n"); + Status = SmpExecuteImage(FileName, + Directory, + CommandLine, + MuSessionId, + Flags | SMP_DEFERRED_FLAG, + &ProcessInformation); + if (!NT_SUCCESS(Status)) + { + /* Handle failures */ + DPRINT1("SMSS: SmpLoadSubSystem - SmpExecuteImage Failed with Status %lx\n", + Status); + goto Quickie2; + } + } + + /* Fill out the handle and client ID in the subsystem structure now */ + NewSubsystem->ProcessHandle = ProcessInformation.ProcessHandle; + NewSubsystem->ClientId = ProcessInformation.ClientId; + + /* Check if we launched a native image or a subsystem-backed image */ + if (ProcessInformation.ImageInformation.SubSystemType == IMAGE_SUBSYSTEM_NATIVE) + { + /* This must be CSRSS itself, since it's a native subsystem image */ + SubSysProcessId = ProcessInformation.ClientId.UniqueProcess; + if ((ProcessId) && !(*ProcessId)) *ProcessId = SubSysProcessId; + + /* Was this the initial CSRSS on Session 0? */ + if (!MuSessionId) + { + /* Then save it in the global variables */ + SmpWindowsSubSysProcessId = SubSysProcessId; + SmpWindowsSubSysProcess = ProcessInformation.ProcessHandle; + } + ASSERT(NT_SUCCESS(Status)); + DPRINT1("CSRSS is up and running: %lx %lx\n", SmpWindowsSubSysProcessId, SmpWindowsSubSysProcess); + } + else + { + /* This is the POSIX or OS/2 subsystem process, copy its information */ + RtlCopyMemory(&CreateSession->ProcessInfo, + &ProcessInformation, + sizeof(&CreateSession->ProcessInfo)); + + /* Not sure these field mean what I think they do -- but clear them */ + *(PULONGLONG)&CreateSession->ClientId = 0; + CreateSession->MuSessionId = 0; + + /* This should find CSRSS because they are POSIX or OS/2 subsystems */ + Subsystem = SmpLocateKnownSubSysByType(MuSessionId, + ProcessInformation.ImageInformation.SubSystemType); + if (!Subsystem) + { + /* Odd failure -- but handle it anyway */ + Status = STATUS_NO_SUCH_PACKAGE; + DPRINT1("SMSS: SmpLoadSubSystem - SmpLocateKnownSubSysByType Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Duplicate the parent process handle for the subsystem to have */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation.ProcessHandle, + Subsystem->ProcessHandle, + &CreateSession->ProcessInfo.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail since this is critical */ + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Duplicate the initial thread handle for the subsystem to have */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation.ThreadHandle, + Subsystem->ProcessHandle, + &CreateSession->ProcessInfo.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail since this is critical */ + DPRINT1("SMSS: SmpLoadSubSystem - NtDuplicateObject Failed with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + + /* Allocate an internal Session ID for this subsystem */ + MuSessionId = SmpAllocateSessionId(Subsystem, 0); + CreateSession->SessionId = MuSessionId; + + /* Send the create session message to the subsystem */ + SbApiMsg2.ReturnValue = STATUS_SUCCESS; + SbApiMsg2.h.u2.ZeroInit = 0; + SbApiMsg2.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; + SbApiMsg2.h.u1.s1.TotalLength = sizeof(SB_API_MSG); + Status = NtRequestWaitReplyPort(Subsystem->SbApiPort, + &SbApiMsg2.h, + &SbApiMsg2.h); + if (NT_SUCCESS(Status)) Status = SbApiMsg2.ReturnValue; + if (!NT_SUCCESS(Status)) + { + /* Delete the session and handle failure if the LPC call failed */ + SmpDeleteSession(CreateSession->SessionId); + DPRINT1("SMSS: SmpLoadSubSystem - NtRequestWaitReplyPort Failed with Status %lx for sessionid %ld\n", + Status, + CreateSession->SessionId); + goto Quickie; + } + } + + /* Okay, everything looks good to go, initialize this subsystem now! */ + DPRINT1("Resuming the subsystem!\n"); + Status = NtResumeThread(ProcessInformation.ThreadHandle, NULL); + if (!NT_SUCCESS(Status)) + { + /* That didn't work -- back out of everything */ + DPRINT1("SMSS: SmpLoadSubSystem - NtResumeThread failed Status %lx\n", Status); + goto Quickie; + } + + /* Check if this was the subsystem for a different session */ + if (MuSessionId) + { + /* Wait up to 60 seconds for it to initialize */ + Timeout.QuadPart = -600000000; + Status = NtWaitForSingleObject(NewSubsystem->Event, FALSE, &Timeout); + + /* Timeout is done -- does this session still exist? */ + if (!SmpCheckDuplicateMuSessionId(MuSessionId)) + { + /* Nope, it died. Cleanup should've ocurred in a different path. */ + DPRINT1("SMSS: SmpLoadSubSystem - session deleted\n"); + return STATUS_DELETE_PENDING; + } + + /* Check if we timed our or there was another error with the wait */ + if (Status != STATUS_WAIT_0) + { + /* Something is wrong with the subsystem, so back out of everything */ + DPRINT1("SMSS: SmpLoadSubSystem - Timeout waiting for subsystem connect with Status %lx for sessionid %ld\n", + Status, + MuSessionId); + goto Quickie; + } + } + else + { + /* This a session 0 subsystem, just wait for it to initialize */ + DPRINT1("Waiting on the subsystem to initialize...\n"); + NtWaitForSingleObject(NewSubsystem->Event, FALSE, NULL); + DPRINT1("Subsystem is ready!!!\n"); + } + + /* Subsystem is created, resumed, and initialized. Close handles and exit */ + NtClose(ProcessInformation.ThreadHandle); + Status = STATUS_SUCCESS; + DPRINT1("Returning success\n"); + goto Quickie2; + +Quickie: + /* This is the failure path. First check if we need to detach from session */ + if ((AttachedSessionId == -1) || (Flags & (SMP_POSIX_FLAG | SMP_OS2_FLAG))) + { + /* We were not attached, or did not launch subsystems that required it */ + DPRINT1("SMSS: Did not detach from Session Space: SessionId=%x Flags=%x Status=%x\n", + AttachedSessionId, + Flags | SMP_DEFERRED_FLAG, + Status); + } + else + { + /* Get the privilege we need for detachment */ + Status = SmpAcquirePrivilege(SE_LOAD_DRIVER_PRIVILEGE, &State); + if (!NT_SUCCESS(Status)) + { + /* We can't detach without it */ + DPRINT1("SMSS: Did not detach from Session Space: SessionId=%x Flags=%x Status=%x\n", + AttachedSessionId, + Flags | SMP_DEFERRED_FLAG, + Status); + } + else + { + /* Now detach from the session */ + Status = NtSetSystemInformation(SystemSessionDetach, + &AttachedSessionId, + sizeof(AttachedSessionId)); + if (!NT_SUCCESS(Status)) + { + /* Failed to detach. Note the DPRINT1 has a typo in Windows */ + DPRINT1("SMSS: SmpStartCsr, Couldn't Detach from Session Space. Status=%x\n", Status); + ASSERT(NT_SUCCESS(Status)); + } + else + { + /* Detachment worked, reset our attached session ID */ + AttachedSessionId = -1; + } + + /* And release the privilege we acquired */ + SmpReleasePrivilege(State); + } + } + + /* Since this is the failure path, terminate the subsystem process */ + NtTerminateProcess(ProcessInformation.ProcessHandle, Status); + NtClose(ProcessInformation.ThreadHandle); + +Quickie2: + /* This is the cleanup path -- first dereference our subsystems */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + if (Subsystem) SmpDereferenceSubsystem(Subsystem); + if (KnownSubsystem) SmpDereferenceSubsystem(KnownSubsystem); + + /* In the failure case, destroy the new subsystem we just created */ + if (!NT_SUCCESS(Status)) + { + RemoveEntryList(&NewSubsystem->Entry); + NtSetEvent(NewSubsystem->Event, 0); + if (NewSubsystem) SmpDereferenceSubsystem(NewSubsystem); + } + + /* Finally, we're all done! */ + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return Status; } NTSTATUS

1 0

[ion] 55508: [SMSS2]: Implement SmpExecPgm and SmpSbCreateSession. Nothing happens (STATUS_OBJECT_NAME_NOT_FOUND is returned) because we don't really launch CSRSS and so we can't find a subsystem f...
by ion＠svn.reactos.org 09 Feb '12

09 Feb '12

Author: ion Date: Thu Feb 9 00:07:36 2012 New Revision: 55508 URL: http://svn.reactos.org/svn/reactos?rev=55508&view=rev Log: [SMSS2]: Implement SmpExecPgm and SmpSbCreateSession. Nothing happens (STATUS_OBJECT_NAME_NOT_FOUND is returned) because we don't really launch CSRSS and so we can't find a subsystem for Winlogon and fail (as expected for now). Modified: trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smsbapi.c 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] Thu Feb 9 00:07:36 2012 @@ -71,8 +71,69 @@ IN PSMP_CLIENT_CONTEXT ClientContext, IN HANDLE SmApiPort) { - DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + HANDLE ProcessHandle; + NTSTATUS Status; + PSM_EXEC_PGM_MSG SmExecPgm; + RTL_USER_PROCESS_INFORMATION ProcessInformation; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Open the client process */ + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&ProcessHandle, + PROCESS_DUP_HANDLE, + &ObjectAttributes, + &SmApiMsg->h.ClientId); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("SmExecPgm: NtOpenProcess Failed %lx\n", Status); + return Status; + } + + /* Copy the process information out of the message */ + SmExecPgm = &SmApiMsg->u.ExecPgm; + ProcessInformation = SmExecPgm->ProcessInformation; + + /* Duplicate the process handle */ + Status = NtDuplicateObject(ProcessHandle, + SmExecPgm->ProcessInformation.ProcessHandle, + NtCurrentProcess(), + &ProcessInformation.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close the handle and fail */ + NtClose(ProcessHandle); + DPRINT1("SmExecPgm: NtDuplicateObject (Process) Failed %lx\n", Status); + return Status; + } + + /* Duplicate the thread handle */ + Status = NtDuplicateObject(ProcessHandle, + SmExecPgm->ProcessInformation.ThreadHandle, + NtCurrentProcess(), + &ProcessInformation.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close both handles and fail */ + NtClose(ProcessInformation.ProcessHandle); + NtClose(ProcessHandle); + DPRINT1("SmExecPgm: NtDuplicateObject (Thread) Failed %lx\n", Status); + return Status; + } + + /* Close the process handle and call the internal client API */ + NtClose(ProcessHandle); + return SmpSbCreateSession(NULL, + NULL, + &ProcessInformation, + 0, + SmExecPgm->DebugFlag ? &SmApiMsg->h.ClientId : NULL); } NTSTATUS Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsbapi.c [iso-8859-1] Thu Feb 9 00:07:36 2012 @@ -14,4 +14,173 @@ /* GLOBALS ********************************************************************/ +PCHAR SmpSubSystemNames[] = +{ + "Unknown", + "Native", + "Windows", + "Posix", + "OS/2" +}; + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpSbCreateSession(IN PVOID Reserved, + IN PSMP_SUBSYSTEM OtherSubsystem, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN ULONG MuSessionId, + IN PCLIENT_ID DbgClientId) +{ + NTSTATUS Status; + PSMP_SUBSYSTEM KnownSubsys; + SB_API_MSG SbApiMsg; + ULONG SessionId; + PSB_CREATE_SESSION_MSG CreateSessionMsg; + + /* Write out the create session message including its initial process */ + CreateSessionMsg = &SbApiMsg.CreateSession; + CreateSessionMsg->ProcessInfo = *ProcessInformation; + CreateSessionMsg->MuSessionId = MuSessionId; + if (DbgClientId) + { + CreateSessionMsg->ClientId = *DbgClientId; + } + else + { + CreateSessionMsg->ClientId.UniqueThread = NULL; + CreateSessionMsg->ClientId.UniqueProcess = NULL; + } + + /* Find a subsystem responsible for this session */ + SmpGetProcessMuSessionId(ProcessInformation->ProcessHandle, &MuSessionId); + if (!SmpCheckDuplicateMuSessionId(MuSessionId)) + { + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + DPRINT1("SMSS: CreateSession status=%x\n", STATUS_OBJECT_NAME_NOT_FOUND); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* Find the subsystem we have for this initial process */ + KnownSubsys = SmpLocateKnownSubSysByType(MuSessionId, + ProcessInformation-> + ImageInformation.SubSystemType); + if (KnownSubsys) + { + /* Duplicate the process handle into the message */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation->ProcessHandle, + KnownSubsys->ProcessHandle, + &CreateSessionMsg->ProcessInfo.ProcessHandle, + PROCESS_ALL_ACCESS, + 0, + 0); + if (NT_SUCCESS(Status)) + { + /* Duplicate the thread handle into the message */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInformation->ThreadHandle, + KnownSubsys->ProcessHandle, + &CreateSessionMsg->ProcessInfo.ThreadHandle, + THREAD_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Close everything on failure */ + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + SmpDereferenceSubsystem(KnownSubsys); + DbgPrint("SmpSbCreateSession: NtDuplicateObject (Thread) Failed %lx\n", Status); + return Status; + } + + /* Close the original handles as they are no longer needed */ + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + + /* Finally, allocate a new SMSS session ID for this session */ + SessionId = SmpAllocateSessionId(KnownSubsys, OtherSubsystem); + CreateSessionMsg->SessionId = SessionId; + + /* Fill out the LPC message header and send it to the client! */ + SbApiMsg.ApiNumber = SbpCreateSession; + SbApiMsg.h.u2.ZeroInit = 0; + SbApiMsg.h.u1.s1.DataLength = sizeof(SB_CREATE_SESSION_MSG) + 8; + SbApiMsg.h.u1.s1.TotalLength = sizeof(SbApiMsg); + Status = NtRequestWaitReplyPort(KnownSubsys->SbApiPort, + &SbApiMsg.h, + &SbApiMsg.h); + if (!NT_SUCCESS(Status)) + { + /* Bail out */ + DPRINT1("SmpSbCreateSession: NtRequestWaitReply Failed %lx\n", Status); + } + else + { + /* If the API succeeded, get the result value from the LPC */ + Status = SbApiMsg.ReturnValue; + } + + /* Delete the session on any kind of failure */ + if (!NT_SUCCESS(Status)) SmpDeleteSession(SessionId); + } + else + { + /* Close the handles on failure */ + DPRINT1("SmpSbCreateSession: NtDuplicateObject (Process) Failed %lx\n", Status); + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + } + + /* Dereference the subsystem and return the status of the LPC call */ + SmpDereferenceSubsystem(KnownSubsys); + return Status; + } + + /* If we don't yet have a subsystem, only native images can be launched */ + if (ProcessInformation->ImageInformation.SubSystemType != IMAGE_SUBSYSTEM_NATIVE) + { + /* Fail */ + DPRINT1("SMSS: %s SubSystem has not been started.\n", + SmpSubSystemNames[ProcessInformation->ImageInformation.SubSystemType]); + Status = STATUS_UNSUCCESSFUL; + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + return Status; + } + +#if 0 + /* This code handles debug applications, but it seems vestigial... */ + if ((*(ULONGLONG)&CreateSessionMsg.ClientId) && (SmpDbgSsLoaded)) + { + Process = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_PROCESS)); + if (!Process) + { + DPRINT1("Unable to initialize debugging for Native App %lx.%lx -- out of memory\n", + ProcessInformation->ClientId.UniqueProcess, + ProcessInformation->ClientId.UniqueThread); + NtClose(ProcessInformation->ProcessHandle); + NtClose(ProcessInformation->ThreadHandle); + return STATUS_NO_MEMORY; + } + + Process->DbgClientId = CreateSessionMsg->ClientId; + Process->ClientId = ProcessInformation->ClientId; + InsertHeadList(&NativeProcessList, &Process->Entry); + DPRINT1("Native Debug App %lx.%lx\n", Process->ClientId.UniqueProcess, Process->ClientId.UniqueThread); + + Status = NtSetInformationProcess(ProcessInformation->ProcessHandle, 7, &SmpDebugPort, 4); + ASSERT(NT_SUCCESS(Status)); + } +#endif + + /* This is a native application being started as the initial command */ + DPRINT1("Subsystem active, starting thread\n"); + NtClose(ProcessInformation->ProcessHandle); + NtResumeThread(ProcessInformation->ThreadHandle, NULL); + NtClose(ProcessInformation->ThreadHandle); + return STATUS_SUCCESS; +}

1 0

[ion] 55507: [SMSS2]: Make not-implemented functions return a failure. Cleanup the SMSS hack in the _main function to be cleaner. Add a few more functions and flags to the header. Fix a function pr...
by ion＠svn.reactos.org 08 Feb '12

08 Feb '12

Author: ion Date: Wed Feb 8 23:49:19 2012 New Revision: 55507 URL: http://svn.reactos.org/svn/reactos?rev=55507&view=rev Log: [SMSS2]: Make not-implemented functions return a failure. Cleanup the SMSS hack in the _main function to be cleaner. Add a few more functions and flags to the header. Fix a function prototype. Modified: trunk/reactos/base/system/smss2/smloop.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/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] Wed Feb 8 23:49:19 2012 @@ -42,7 +42,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -52,7 +52,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -62,7 +62,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -72,7 +72,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -82,7 +82,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -92,7 +92,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -102,7 +102,7 @@ IN HANDLE SmApiPort) { DPRINT1("%s is not yet implemented\n", __FUNCTION__); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } PSM_API_HANDLER SmpApiDispatch[SmMaxApiNumber] = 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] Wed Feb 8 23:49:19 2012 @@ -265,7 +265,8 @@ &Directory, CommandLine, MuSessionId, - ProcessId); + ProcessId, + Flags); } else if (Flags & SMP_INVALID_PATH) { @@ -590,7 +591,7 @@ NTSTATUS NTAPI -LaunchOldSmss(OUT PHANDLE Handles) +LaunchOldSmss(VOID) { PINIT_BUFFER InitBuffer; PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; @@ -598,9 +599,6 @@ NTSTATUS Status; PCHAR Environment; - /* No handles at first */ - Handles[0] = Handles[1] = NULL; - /* Initialize the system root */ RtlInitUnicodeString(&SmpSystemRoot, SharedUserData->NtSystemRoot); @@ -623,8 +621,6 @@ } /* Return the handle and status */ - Handles[0] = ProcessInfo->ProcessHandle; - Handles[1] = ProcessInfo->ProcessHandle; return Status; } @@ -723,6 +719,8 @@ /* Enter SEH so we can terminate correctly if anything goes wrong */ _SEH2_TRY { + LARGE_INTEGER Infinite = {{0x80000000, 0x7FFFFFFF}}; + /* Initialize SMSS */ Status = SmpInit(&InitialCommand, Handles); if (!NT_SUCCESS(Status)) @@ -731,9 +729,10 @@ RtlInitUnicodeString(&DbgString, L"Session Manager Initialization"); Parameters[1] = Status; DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(Handles); - goto SetupHack; //_SEH2_LEAVE; Hack so that setup can work. will go away later + Status = LaunchOldSmss(); + if (!NT_SUCCESS(Status)) return Status; + return NtDelayExecution(FALSE, &Infinite); } /* Get the global flags */ @@ -750,19 +749,6 @@ DPRINT1("Global Flags Set to SMSS Debugging: Not yet supported\n"); } - /* Launch the original SMSS */ - DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(Handles); - if (!NT_SUCCESS(Status)) - { - /* Fail and raise a hard error */ - DPRINT1("SMSS: Execute Old SMSS failed\n"); - RtlInitUnicodeString(&DbgString, - L"Session Manager LaunchOldSmss"); - Parameters[1] = Status; - _SEH2_LEAVE; - } - /* Execute the initial command (Winlogon.exe) */ Status = SmpExecuteInitialCommand(0, &InitialCommand, &Handles[1], NULL); if (!NT_SUCCESS(Status)) @@ -772,7 +758,11 @@ RtlInitUnicodeString(&DbgString, L"Session Manager ExecuteInitialCommand"); Parameters[1] = Status; - _SEH2_LEAVE; + //_SEH2_LEAVE; + DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); + Status = LaunchOldSmss(); + if (!NT_SUCCESS(Status)) return Status; + return NtDelayExecution(FALSE, &Infinite); } /* Check if we're already attached to a session */ @@ -789,7 +779,6 @@ SmpReleasePrivilege(State); /* Wait on either CSRSS or Winlogon to die */ -SetupHack: Status = NtWaitForMultipleObjects(RTL_NUMBER_OF(Handles), Handles, WaitAny, 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] Wed Feb 8 23:49:19 2012 @@ -38,6 +38,8 @@ #define SMP_SUBSYSTEM_FLAG 0x08 #define SMP_INVALID_PATH 0x10 #define SMP_DEFERRED_FLAG 0x20 +#define SMP_POSIX_FLAG 0x100 +#define SMP_OS2_FLAG 0x200 /* STRUCTURES *****************************************************************/ @@ -87,6 +89,7 @@ extern LIST_ENTRY SmpExecuteList; extern LIST_ENTRY SmpSubSystemList; extern ULONG AttachedSessionId; +extern BOOLEAN SmpDebug; /* FUNCTIONS ******************************************************************/ @@ -182,7 +185,8 @@ IN PUNICODE_STRING Directory, IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PHANDLE ProcessId + OUT PHANDLE ProcessId, + IN ULONG Flags ); NTSTATUS @@ -250,4 +254,44 @@ IN PSMP_SUBSYSTEM SubSystem ); +NTSTATUS +NTAPI +SmpSbCreateSession( + IN PVOID Reserved, + IN PSMP_SUBSYSTEM OtherSubsystem, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN ULONG MuSessionId, + IN PCLIENT_ID DbgClientId +); + +ULONG +NTAPI +SmpAllocateSessionId( + IN PSMP_SUBSYSTEM Subsystem, + IN PSMP_SUBSYSTEM OtherSubsystem +); + +VOID +NTAPI +SmpDeleteSession( + IN ULONG SessionId +); + +BOOLEAN +NTAPI +SmpCheckDuplicateMuSessionId( + IN ULONG MuSessionId +); + +NTSTATUS +NTAPI +SmpExecuteImage( + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING Directory, + IN PUNICODE_STRING CommandLine, + IN ULONG MuSessionId, + IN ULONG Flags, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation +); + #endif 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] Wed Feb 8 23:49:19 2012 @@ -120,7 +120,8 @@ IN PUNICODE_STRING Directory, IN PUNICODE_STRING CommandLine, IN ULONG MuSessionId, - OUT PHANDLE ProcessId) + OUT PHANDLE ProcessId, + IN ULONG Flags) { DPRINT1("Should start subsystem %wZ for Session: %lx\n", FileName, MuSessionId); return STATUS_SUCCESS;

1 0

[tkreuzer] 55506: [SHELL32] Fix a bug I introduced in r55498 Spotted by Thomas
by tkreuzer＠svn.reactos.org 08 Feb '12

08 Feb '12

Author: tkreuzer Date: Wed Feb 8 22:53:29 2012 New Revision: 55506 URL: http://svn.reactos.org/svn/reactos?rev=55506&view=rev Log: [SHELL32] Fix a bug I introduced in r55498 Spotted by Thomas Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp Modified: trunk/reactos/dll/win32/shell32/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drvdefex… ============================================================================== --- trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drvdefext.cpp [iso-8859-1] Wed Feb 8 22:53:29 2012 @@ -243,7 +243,7 @@ SelectObject(pDrawItem->hDC, hDarkMagPen); double cos_val = (x - xCenter)*2.0f/cx; - INT y = yCenter+(INT)sin(acos(cos_val))*cy/2; + INT y = yCenter+(INT)(sin(acos(cos_val))*cy/2); MoveToEx(pDrawItem->hDC, x, y, NULL); LineTo(pDrawItem->hDC, x, y + 10); }

1 0

[tkreuzer] 55505: [NTOSKRNL] - Implement amd64 version of MmDeleteProcessPageDirectory - Fix amd64 build
by tkreuzer＠svn.reactos.org 08 Feb '12

08 Feb '12

Author: tkreuzer Date: Wed Feb 8 22:23:10 2012 New Revision: 55505 URL: http://svn.reactos.org/svn/reactos?rev=55505&view=rev Log: [NTOSKRNL] - Implement amd64 version of MmDeleteProcessPageDirectory - Fix amd64 build Modified: trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/amd64/page.c Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Wed Feb 8 22:23:10 2012 @@ -12,6 +12,7 @@ #define NDEBUG #include <debug.h> #include "../mm/ARM3/miarm.h" +#undef MmSystemRangeStart VOID NTAPI RtlpBreakWithStatusInstruction(VOID); Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Feb 8 22:23:10 2012 @@ -14,6 +14,7 @@ #define MODULE_INVOLVED_IN_ARM3 #include "miarm.h" +#undef MmSystemRangeStart /* GLOBALS ********************************************************************/ @@ -170,7 +171,7 @@ // // This should be 0xC0C00000 -- the cache itself starts at 0xC1000000 // -PMMWSL MmSystemCacheWorkingSetList = MI_SYSTEM_CACHE_WS_START; +PMMWSL MmSystemCacheWorkingSetList = (PVOID)MI_SYSTEM_CACHE_WS_START; // // Windows NT seems to choose between 7000, 11000 and 50000 Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Wed Feb 8 22:23:10 2012 @@ -138,6 +138,80 @@ } static +VOID +MmDeletePageTablePfn(PFN_NUMBER PageFrameNumber, ULONG Level) +{ + PMMPTE PageTable; + KIRQL OldIrql; + PMMPFN PfnEntry; + ULONG i, NumberEntries; + + /* Check if this is a page table */ + if (Level > 0) + { + NumberEntries = (Level == 4) ? MiAddressToPxi(MmHighestUserAddress)+1 : 512; + + /* Map the page table in hyperspace */ + PageTable = (PMMPTE)MmCreateHyperspaceMapping(PageFrameNumber); + + /* Loop all page table entries */ + for (i = 0; i < NumberEntries; i++) + { + /* Check if the entry is valid */ + if (PageTable[i].u.Hard.Valid) + { + /* Recursively free the page that backs it */ + MmDeletePageTablePfn(PageTable[i].u.Hard.PageFrameNumber, Level - 1); + } + } + + /* Delete the hyperspace mapping */ + MmDeleteHyperspaceMapping(PageTable); + } + + /* Check if this is a legacy allocation */ + PfnEntry = MiGetPfnEntry(PageFrameNumber); + if (MI_IS_ROS_PFN(PfnEntry)) + { + /* Free it using the legacy API */ + MmReleasePageMemoryConsumer(MC_SYSTEM, PageFrameNumber); + } + else + { + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Free it using the ARM3 API */ + MI_SET_PFN_DELETED(PfnEntry); + MiDecrementShareCount(PfnEntry, PageFrameNumber); + + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } +} + +VOID +NTAPI +MmDeleteProcessPageDirectory(PEPROCESS Process) +{ + PFN_NUMBER TableBasePfn; + PMMPTE PageDir; + + /* Get the page directory PFN */ + TableBasePfn = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; + + /* Map the page directory in hyperspace */ + PageDir = (PMMPTE)MmCreateHyperspaceMapping(TableBasePfn); + + /* Free the hyperspace mapping page (ARM3) */ + //MmDeletePageTablePfn(PageDir[ADDR_TO_PDE_OFFSET(HYPERSPACE)].u.Hard.PageFrameNumber, 3); + + /* Delete the hyperspace mapping */ + MmDeleteHyperspaceMapping(PageDir); + + /* Recursively free the page directories */ + MmDeletePageTablePfn(TableBasePfn, 4); +} + +static PMMPTE MiGetPteForProcess( PEPROCESS Process, @@ -626,44 +700,6 @@ } return MmCreateVirtualMappingUnsafe(Process, Address, Protect, Pages, PageCount); -} - -static PMMPTE -MmGetPageTableForProcess(PEPROCESS Process, PVOID Address, BOOLEAN Create) -{ - __debugbreak(); - return 0; -} - -BOOLEAN MmUnmapPageTable(PMMPTE Pt) -{ - ASSERT(FALSE); - return 0; -} - -static ULONG64 MmGetPageEntryForProcess(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte, *PointerPte; - - PointerPte = MmGetPageTableForProcess(Process, Address, FALSE); - if (PointerPte) - { - Pte = *PointerPte; - MmUnmapPageTable(PointerPte); - return Pte.u.Long; - } - return 0; -} - -VOID -NTAPI -MmGetPageFileMapping( - PEPROCESS Process, - PVOID Address, - SWAPENTRY* SwapEntry) -{ - ULONG64 Entry = MmGetPageEntryForProcess(Process, Address); - *SwapEntry = Entry >> 1; } BOOLEAN

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs