Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 58907: [LSASRV] Implement logon token creation code.
by ekohl＠svn.reactos.org 01 May '13

01 May '13

Author: ekohl Date: Wed May 1 21:29:49 2013 New Revision: 58907 URL: http://svn.reactos.org/svn/reactos?rev=58907&view=rev Log: [LSASRV] Implement logon token creation code. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Wed May 1 21:29:49 2013 @@ -17,6 +17,17 @@ LsaTokenInformationNull, LsaTokenInformationV1 } LSA_TOKEN_INFORMATION_TYPE, *PLSA_TOKEN_INFORMATION_TYPE; + +typedef struct _LSA_TOKEN_INFORMATION_V1 +{ + LARGE_INTEGER ExpirationTime; + TOKEN_USER User; + PTOKEN_GROUPS Groups; + TOKEN_PRIMARY_GROUP PrimaryGroup; + PTOKEN_PRIVILEGES Privileges; + TOKEN_OWNER Owner; + TOKEN_DEFAULT_DACL DefaultDacl; +} LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1; typedef PVOID PLSA_CLIENT_REQUEST; @@ -284,6 +295,26 @@ static +NTSTATUS +NTAPI +LsapCreateLogonSession(IN PLUID LogonId) +{ + TRACE("()\n"); + return STATUS_SUCCESS; +} + + +static +NTSTATUS +NTAPI +LsapDeleteLogonSession(IN PLUID LogonId) +{ + TRACE("()\n"); + return STATUS_SUCCESS; +} + + +static PVOID NTAPI LsapAllocateHeap(IN ULONG Length) @@ -404,8 +435,8 @@ PackageId = 0; /* Initialize the dispatch table */ - DispatchTable.CreateLogonSession = NULL; - DispatchTable.DeleteLogonSession = NULL; + DispatchTable.CreateLogonSession = &LsapCreateLogonSession; + DispatchTable.DeleteLogonSession = &LsapDeleteLogonSession; DispatchTable.AddCredential = NULL; DispatchTable.GetCredentials = NULL; DispatchTable.DeleteCredential = NULL; @@ -531,16 +562,19 @@ PLSAP_LOGON_CONTEXT LogonContext) { PAUTH_PACKAGE Package; - ULONG PackageId; - NTSTATUS Status; - + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_QUALITY_OF_SERVICE Qos; LSA_TOKEN_INFORMATION_TYPE TokenInformationType; PVOID TokenInformation = NULL; + PLSA_TOKEN_INFORMATION_V1 TokenInfo1 = NULL; PUNICODE_STRING AccountName = NULL; PUNICODE_STRING AuthenticatingAuthority = NULL; PUNICODE_STRING MachineName = NULL; - PVOID LocalAuthInfo = NULL; + HANDLE TokenHandle = NULL; + ULONG i; + ULONG PackageId; + NTSTATUS Status; TRACE("(%p %p)\n", RequestMsg, LogonContext); @@ -556,7 +590,7 @@ if (RequestMsg->LogonUser.Request.AuthenticationInformationLength > 0) { - /* Allocat the local authentication info buffer */ + /* Allocate the local authentication info buffer */ LocalAuthInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, RequestMsg->LogonUser.Request.AuthenticationInformationLength); @@ -633,12 +667,127 @@ &AuthenticatingAuthority); } + if (!NT_SUCCESS(Status)) + { + TRACE("LsaApLogonUser/Ex/2 failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + Qos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); + Qos.ImpersonationLevel = SecurityImpersonation; + Qos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + Qos.EffectiveOnly = FALSE; + + ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); + ObjectAttributes.RootDirectory = NULL; + ObjectAttributes.ObjectName = NULL; + ObjectAttributes.Attributes = 0; + ObjectAttributes.SecurityDescriptor = NULL; + ObjectAttributes.SecurityQualityOfService = &Qos; + + /* Create the logon token */ + Status = NtCreateToken(&TokenHandle, + TOKEN_ALL_ACCESS, + &ObjectAttributes, + TokenPrimary, + &RequestMsg->LogonUser.Reply.LogonId, + &TokenInfo1->ExpirationTime, + &TokenInfo1->User, + TokenInfo1->Groups, + TokenInfo1->Privileges, + &TokenInfo1->Owner, + &TokenInfo1->PrimaryGroup, + &TokenInfo1->DefaultDacl, + &RequestMsg->LogonUser.Request.SourceContext); + if (!NT_SUCCESS(Status)) + { + TRACE("NtCreateToken failed (Status 0x%08lx)\n", Status); + goto done; + } + } + else + { + FIXME("TokenInformationType %d is not supported!\n", TokenInformationType); + Status = STATUS_NOT_IMPLEMENTED; + goto done; + } + + /* Duplicate the token handle into the client process */ + Status = NtDuplicateObject(NtCurrentProcess(), + TokenHandle, + LogonContext->ClientProcessHandle, + &RequestMsg->LogonUser.Reply.Token, + 0, + 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); + if (!NT_SUCCESS(Status)) + { + TRACE("NtDuplicateObject failed (Status 0x%08lx)\n", Status); + goto done; + } + + TokenHandle = NULL; + +done: + if (!NT_SUCCESS(Status)) + { + if (TokenHandle != NULL) + NtClose(TokenHandle); + } + /* Free the local authentication info buffer */ if (LocalAuthInfo != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, LocalAuthInfo); if (TokenInformation != NULL) { + if (TokenInformationType == LsaTokenInformationV1) + { + TokenInfo1 = (PLSA_TOKEN_INFORMATION_V1)TokenInformation; + + if (TokenInfo1 != NULL) + { + if (TokenInfo1->User.User.Sid != NULL) + LsapFreeHeap(TokenInfo1->User.User.Sid); + + if (TokenInfo1->Groups != NULL) + { + for (i = 0; i < TokenInfo1->Groups->GroupCount; i++) + { + if (TokenInfo1->Groups->Groups[i].Sid != NULL) + LsapFreeHeap(TokenInfo1->Groups->Groups[i].Sid); + } + + LsapFreeHeap(TokenInfo1->Groups); + } + + if (TokenInfo1->PrimaryGroup.PrimaryGroup != NULL) + LsapFreeHeap(TokenInfo1->PrimaryGroup.PrimaryGroup); + + if (TokenInfo1->Privileges != NULL) + LsapFreeHeap(TokenInfo1->Privileges); + + if (TokenInfo1->Owner.Owner != NULL) + LsapFreeHeap(TokenInfo1->Owner.Owner); + + if (TokenInfo1->DefaultDacl.DefaultDacl != NULL) + LsapFreeHeap(TokenInfo1->DefaultDacl.DefaultDacl); + + LsapFreeHeap(TokenInfo1); + } + } + else + { + FIXME("TokenInformationType %d is not supported!\n", TokenInformationType); + } + } + + if (AccountName != NULL) + { } @@ -647,11 +796,6 @@ } - if (AccountName != NULL) - { - - } - if (MachineName != NULL) { Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Wed May 1 21:29:49 2013 @@ -24,6 +24,7 @@ #include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> +#include <ndk/sefuncs.h> #include <ndk/umfuncs.h> #include <ntsam.h>

1 0

[pschweitzer] 58906: [NTOSKRNL] Implement post stack overflow functions (i.e. FsRtlPostStackOverflow() and FsRtlPostPagingFileStackOverflow())
by pschweitzer＠svn.reactos.org 01 May '13

01 May '13

Author: pschweitzer Date: Wed May 1 20:53:15 2013 New Revision: 58906 URL: http://svn.reactos.org/svn/reactos?rev=58906&view=rev Log: [NTOSKRNL] Implement post stack overflow functions (i.e. FsRtlPostStackOverflow() and FsRtlPostPagingFileStackOverflow()) Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c trunk/reactos/ntoskrnl/fsrtl/stackovf.c Modified: trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/fsrtlpc.c [iso-8859-1] Wed May 1 20:53:15 2013 @@ -16,6 +16,7 @@ PERESOURCE FsRtlPagingIoResources; ULONG FsRtlPagingIoResourceSelector; +NTSTATUS NTAPI INIT_FUNCTION FsRtlInitializeWorkerThread(); static UCHAR LegalAnsiCharacterArray[] = { @@ -183,7 +184,7 @@ ExInitializeResource(&FsRtlPagingIoResources[i]); } - return TRUE; + return NT_SUCCESS(FsRtlInitializeWorkerThread()); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/stackovf.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] Wed May 1 20:53:15 2013 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fsrtl/stackovf.c * PURPOSE: Provides Stack Overflow support for File System Drivers - * PROGRAMMERS: None. + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,8 +12,65 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ + +/* We have one queue for paging files, one queue for normal files + * Queue 0 is for non-paging files + * Queue 1 is for paging files + * Don't add new/change current queues unless you know what you do + * Most of the code relies on the fact that we have two queues in that order + */ +#define FSRTLP_MAX_QUEUES 2 + +typedef struct _STACK_OVERFLOW_WORK_ITEM +{ + + WORK_QUEUE_ITEM WorkItem; + PFSRTL_STACK_OVERFLOW_ROUTINE Routine; + PVOID Context; + PKEVENT Event; +} STACK_OVERFLOW_WORK_ITEM, *PSTACK_OVERFLOW_WORK_ITEM; + +KEVENT StackOverflowFallbackSerialEvent; +STACK_OVERFLOW_WORK_ITEM StackOverflowFallback; +KQUEUE FsRtlWorkerQueues[FSRTLP_MAX_QUEUES]; + /* PRIVATE FUNCTIONS *********************************************************/ +/* + * @implemented + */ +VOID +NTAPI +FsRtlStackOverflowRead(IN PVOID Context) +{ + PSTACK_OVERFLOW_WORK_ITEM WorkItem; + + WorkItem = (PSTACK_OVERFLOW_WORK_ITEM)Context; + + /* Put us as top IRP for current thread */ + IoSetTopLevelIrp((PIRP)FSRTL_FSP_TOP_LEVEL_IRP); + /* And call FsRtlSORoutine */ + WorkItem->Routine(WorkItem->Context, WorkItem->Event); + + /* If we were using fallback workitem, don't free it, just reset event */ + if (WorkItem == &StackOverflowFallback) + { + KeSetEvent(&StackOverflowFallbackSerialEvent, 0, FALSE); + } + /* Otherwise, free the work item */ + else + { + ExFreePoolWithTag(WorkItem, 'Fsrs'); + } + + /* Reset top level */ + IoSetTopLevelIrp(NULL); +} + +/* + * @implemented + */ VOID NTAPI FsRtlpPostStackOverflow(IN PVOID Context, @@ -21,14 +78,115 @@ IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine, IN BOOLEAN IsPaging) { - UNIMPLEMENTED; + PSTACK_OVERFLOW_WORK_ITEM WorkItem; + + /* Try to allocate a work item */ + WorkItem = ExAllocatePoolWithTag(NonPagedPool, sizeof(STACK_OVERFLOW_WORK_ITEM), 'FSrs'); + if (WorkItem == NULL) + { + /* If we failed, and we are not a paging file, just raise an error */ + if (!IsPaging) + { + RtlRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + } + + /* Otherwise, wait for fallback workitem to be available and use it */ + KeWaitForSingleObject(&StackOverflowFallbackSerialEvent, Executive, KernelMode, FALSE, NULL); + WorkItem = &StackOverflowFallback; + } + + /* Initialize work item */ + WorkItem->Context = Context; + WorkItem->Event = Event; + WorkItem->Routine = StackOverflowRoutine; + ExInitializeWorkItem(&WorkItem->WorkItem, FsRtlStackOverflowRead, WorkItem); + + /* And queue it in the appropriate queue (paging or not?) */ + KeInsertQueue(&FsRtlWorkerQueues[IsPaging], &WorkItem->WorkItem.List); +} + +/* + * @implemented + */ +VOID +NTAPI +FsRtlWorkerThread(IN PVOID StartContext) +{ + KIRQL Irql; + PLIST_ENTRY Entry; + PWORK_QUEUE_ITEM WorkItem; + ULONG QueueId = (ULONG)StartContext; + + /* Set our priority according to the queue we're dealing with */ + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + QueueId); + + /* Loop for events */ + for (;;) + { + /* Look for next event */ + Entry = KeRemoveQueue(&FsRtlWorkerQueues[QueueId], KernelMode, NULL); + WorkItem = CONTAINING_RECORD(Entry, WORK_QUEUE_ITEM, List); + + /* Call its routine (here: FsRtlStackOverflowRead) */ + WorkItem->WorkerRoutine(WorkItem->Parameter); + + /* Check we're still at passive level or bugcheck */ + Irql = KeGetCurrentIrql(); + if (Irql != PASSIVE_LEVEL) + { + KeBugCheckEx(IRQL_NOT_LESS_OR_EQUAL, (ULONG_PTR)WorkItem->WorkerRoutine, + (ULONG_PTR)Irql, (ULONG_PTR)WorkItem->WorkerRoutine, + (ULONG_PTR)WorkItem); + } + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +INIT_FUNCTION +FsRtlInitializeWorkerThread() +{ + ULONG i; + NTSTATUS Status; + HANDLE ThreadHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* Initialize each queue we have */ + for (i = 0; i < FSRTLP_MAX_QUEUES; ++i) + { + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + /* Initialize the queue and its associated thread and pass it the queue ID */ + KeInitializeQueue(&FsRtlWorkerQueues[i], 0); + Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, &ObjectAttributes, + 0, 0, FsRtlWorkerThread, (PVOID)i); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Don't leak handle */ + ZwClose(ThreadHandle); + } + + /* Also initialize our fallback event, set it to ensure it's already usable */ + KeInitializeEvent(&StackOverflowFallbackSerialEvent, SynchronizationEvent, TRUE); + + return Status; } /* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name FsRtlPostPagingFileStackOverflow - * @unimplemented NT 4.0 + * @implemented NT 5.2 * * The FsRtlPostPagingFileStackOverflow routine * @@ -54,7 +212,7 @@ /*++ * @name FsRtlPostStackOverflow - * @unimplemented NT 4.0 + * @implemented NT 5.2 * * The FsRtlPostStackOverflow routine *

1 0

[hbelusca] 58905: Code formatting only.
by hbelusca＠svn.reactos.org 01 May '13

01 May '13

Author: hbelusca Date: Wed May 1 19:02:10 2013 New Revision: 58905 URL: http://svn.reactos.org/svn/reactos?rev=58905&view=rev Log: Code formatting only. Modified: branches/kd++/include/reactos/windbgkd.h Modified: branches/kd++/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/include/reactos/windbg… ============================================================================== --- branches/kd++/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/kd++/include/reactos/windbgkd.h [iso-8859-1] Wed May 1 19:02:10 2013 @@ -451,7 +451,7 @@ ULONG Thread; ULONG ProgramCounter; union - { + { DBGKM_EXCEPTION32 Exception; DBGKD_LOAD_SYMBOLS32 LoadSymbols; } u; @@ -481,13 +481,13 @@ ULONG64 Thread; ULONG64 ProgramCounter; union - { + { DBGKM_EXCEPTION64 Exception; DBGKD_LOAD_SYMBOLS64 LoadSymbols; DBGKD_COMMAND_STRING CommandString; } u; union - { + { DBGKD_CONTROL_REPORT ControlReport; DBGKD_ANY_CONTROL_REPORT AnyControlReport; }; @@ -814,7 +814,7 @@ ULONG ApiNumber; ULONG Status; union - { + { ULONG64 ReserveSpace[7]; DBGKD_CREATE_FILE CreateFile; DBGKD_READ_FILE ReadFile; @@ -843,7 +843,7 @@ { ULONG ApiNumber; union - { + { DBGKD_REQUEST_BREAKPOINT RequestBreakpoint; DBGKD_RELEASE_BREAKPOINT ReleaseBreakpoint; } u;

1 0

[hbelusca] 58904: [DRIVERS] The *REAL* kdcom is renamed... kdcom.
by hbelusca＠svn.reactos.org 01 May '13

01 May '13

Author: hbelusca Date: Wed May 1 17:45:53 2013 New Revision: 58904 URL: http://svn.reactos.org/svn/reactos?rev=58904&view=rev Log: [DRIVERS] The *REAL* kdcom is renamed... kdcom. Added: branches/kd++/drivers/base/kdcom/ - copied from r58883, branches/kd++/drivers/base/kddll/ Removed: branches/kd++/drivers/base/kdcom/kddll.spec branches/kd++/drivers/base/kddll/ Modified: branches/kd++/drivers/base/CMakeLists.txt Modified: branches/kd++/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/CMakeList… ============================================================================== --- branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] Wed May 1 17:45:53 2013 @@ -3,7 +3,7 @@ add_subdirectory(bootvid) if(_WINKD_) -add_subdirectory(kddll) +add_subdirectory(kdcom) else() add_subdirectory(kdrosdbg) endif() Removed: branches/kd++/drivers/base/kdcom/kddll.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kddll/kdd… ============================================================================== --- branches/kd++/drivers/base/kdcom/kddll.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kdcom/kddll.spec (removed) @@ -1,8 +1,0 @@ -@ stdcall KdD0Transition() -@ stdcall KdD3Transition() -@ stdcall KdDebuggerInitialize0(ptr) -@ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) -@ stdcall KdRestore(long) -@ stdcall KdSave(long) -@ stdcall KdSendPacket(long ptr ptr ptr)

1 0

[hbelusca] 58903: [DRIVERS] - Move GCC-named kdcom to kdrosdbg. - Remove an unneeded export file.
by hbelusca＠svn.reactos.org 01 May '13

01 May '13

Author: hbelusca Date: Wed May 1 17:43:11 2013 New Revision: 58903 URL: http://svn.reactos.org/svn/reactos?rev=58903&view=rev Log: [DRIVERS] - Move GCC-named kdcom to kdrosdbg. - Remove an unneeded export file. Added: branches/kd++/drivers/base/kdrosdbg/ - copied from r58883, branches/kd++/drivers/base/kdcom/ Removed: branches/kd++/drivers/base/kdcom/ branches/kd++/drivers/base/kddll/kddll.spec Modified: branches/kd++/drivers/base/CMakeLists.txt Modified: branches/kd++/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/CMakeList… ============================================================================== --- branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/kd++/drivers/base/CMakeLists.txt [iso-8859-1] Wed May 1 17:43:11 2013 @@ -5,7 +5,7 @@ if(_WINKD_) add_subdirectory(kddll) else() -add_subdirectory(kdcom) +add_subdirectory(kdrosdbg) endif() add_subdirectory(nmidebug) add_subdirectory(null) Removed: branches/kd++/drivers/base/kddll/kddll.spec URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/drivers/base/kddll/kdd… ============================================================================== --- branches/kd++/drivers/base/kddll/kddll.spec [iso-8859-1] (original) +++ branches/kd++/drivers/base/kddll/kddll.spec (removed) @@ -1,8 +1,0 @@ -@ stdcall KdD0Transition() -@ stdcall KdD3Transition() -@ stdcall KdDebuggerInitialize0(ptr) -@ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) -@ stdcall KdRestore(long) -@ stdcall KdSave(long) -@ stdcall KdSendPacket(long ptr ptr ptr)

1 0

[hbelusca] 58902: [FREELDR] - Fix some function parameter types, so to avoid unuseful casts (from pointers to const strings to pointers to strings in particular). - The big thing: make FreeLdr load...
by hbelusca＠svn.reactos.org 01 May '13

01 May '13

Author: hbelusca Date: Wed May 1 17:12:56 2013 New Revision: 58902 URL: http://svn.reactos.org/svn/reactos?rev=58902&view=rev Log: [FREELDR] - Fix some function parameter types, so to avoid unuseful casts (from pointers to const strings to pointers to strings in particular). - The big thing: make FreeLdr load personalized Kernel Debugger Transport DLLs by reading at the kernel command line and interpreting the /DEBUGPORT=xxx entry (--> loads KDxxx.DLL dll in \SystemRoot\System32\). So now, we can not only load the "default" kdcom.dll, but also 3rd-party ones such as kdbazis.dll from VirtualKD. Read http://www.nynaeve.net/?p=173 for a trick I used : "[...] Another enhancement that could be done Microsoft-side would be a better interface for replacing KD transport modules. Right now, due to the fact that ntoskrnl is static linked to KDCOM.DLL, the OS loader has a hardcoded hack that interprets the KD type in the OS loader options, loads one of the (hardcoded filenames) "kdcom.dll", "kd1394.dll", or "kdusb2.dll" modules, and inserts them into the loaded module list under the name "kdcom.dll". [...]". Modified: branches/kd++/boot/freeldr/freeldr/windows/winldr.c Modified: branches/kd++/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/kd%2B%2B/boot/freeldr/freeldr/w… ============================================================================== --- branches/kd++/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ branches/kd++/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Wed May 1 17:12:56 2013 @@ -126,9 +126,7 @@ do { - while (*LoadOptions == '/') - ++LoadOptions; - + while (*LoadOptions == '/') ++LoadOptions; *NewLoadOptions++ = *LoadOptions; } while (*LoadOptions++); @@ -227,7 +225,7 @@ static BOOLEAN WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, - LPSTR BootPath, + LPCSTR BootPath, PUNICODE_STRING FilePath, ULONG Flags, PLDR_DATA_TABLE_ENTRY *DriverDTE) @@ -299,7 +297,7 @@ BOOLEAN WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, - LPSTR BootPath) + LPCSTR BootPath) { PLIST_ENTRY NextBd; PBOOT_DRIVER_LIST_ENTRY BootDriver; @@ -318,8 +316,11 @@ // Paths are relative (FIXME: Are they always relative?) // Load it - Status = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, BootPath, &BootDriver->FilePath, - 0, &BootDriver->LdrEntry); + Status = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, + BootPath, + &BootDriver->FilePath, + 0, + &BootDriver->LdrEntry); // If loading failed - cry loudly //FIXME: Maybe remove it from the list and try to continue? @@ -340,8 +341,10 @@ return TRUE; } -PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, - TYPE_OF_MEMORY MemoryType) +PVOID +WinLdrLoadModule(PCSTR ModuleName, + ULONG *Size, + TYPE_OF_MEMORY MemoryType) { ULONG FileId; PVOID PhysicalBase; @@ -397,7 +400,6 @@ return PhysicalBase; } - USHORT WinLdrDetectVersion() @@ -427,6 +429,7 @@ PCCH File, TYPE_OF_MEMORY MemoryType, PLDR_DATA_TABLE_ENTRY *Dte, + BOOLEAN IsKdTransportDll, ULONG Percentage) { CHAR FullFileName[MAX_PATH]; @@ -448,10 +451,137 @@ strcpy(FullFileName, "WINDOWS\\SYSTEM32\\"); strcat(FullFileName, File); - WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, File, - FullFileName, BaseAdress, Dte); + /* + * Cheat about the base DLL name if we are loading + * the Kernel Debugger Transport DLL, to make the + * PE loader happy. + */ + WinLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, + (IsKdTransportDll ? "KDCOM.DLL" : File), + FullFileName, + BaseAdress, + Dte); return BaseAdress; +} + +static +BOOLEAN +LoadWindowsCore(IN USHORT OperatingSystemVersion, + IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, + IN LPCSTR BootOptions, + IN LPCSTR BootPath, + IN OUT PLDR_DATA_TABLE_ENTRY* KernelDTE) +{ + BOOLEAN Status; + CHAR DirPath[MAX_PATH]; + CHAR KdTransportDllName[MAX_PATH]; + PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; + + if (!KernelDTE) return FALSE; + + /* Load the Kernel */ + LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, KernelDTE, FALSE, 30); + + /* Load the HAL */ + LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, FALSE, 45); + + /* Load the Kernel Debugger Transport DLL */ + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) + { + /* + * According to http://www.nynaeve.net/?p=173 : + * "[...] Another enhancement that could be done Microsoft-side would be + * a better interface for replacing KD transport modules. Right now, due + * to the fact that ntoskrnl is static linked to KDCOM.DLL, the OS loader + * has a hardcoded hack that interprets the KD type in the OS loader options, + * loads one of the (hardcoded filenames) "kdcom.dll", "kd1394.dll", or + * "kdusb2.dll" modules, and inserts them into the loaded module list under + * the name "kdcom.dll". [...]" + */ + + /* + * This loop replaces a dumb call to strstr(..., "DEBUGPORT="). + * Indeed I want it to be case-insensitive to allow "debugport=" + * or "DeBuGpOrT=" or... , and I don't want it to match malformed + * command-line options, such as: + * + * "...foo DEBUGPORT=xxx bar..." + * "...foo/DEBUGPORT=xxx bar..." + * "...foo/DEBUGPORT=bar..." + * + * i.e. the "DEBUGPORT=" switch must start with a slash and be separated + * from the rest by whitespace, unless it begins the command-line, e.g.: + * + * "/DEBUGPORT=COM1 foo...bar..." + * "...foo /DEBUGPORT=USB bar..." + * or: + * "...foo /DEBUGPORT= bar..." + * (in that case, we default the port to COM). + */ + while (BootOptions) + { + /* Skip possible initial whitespace */ + BootOptions += strspn(BootOptions, " \t"); + + /* Check whether a new commutator starts and it is the DEBUGPORT one */ + if (*BootOptions != '/' || _strnicmp(++BootOptions, "DEBUGPORT=", 10) != 0) + { + /* Search for another whitespace */ + BootOptions = strpbrk(BootOptions, " \t"); + continue; + } + else + { + /* We found the DEBUGPORT commutator. Move to the port name. */ + BootOptions += 10; + break; + } + } + + if (BootOptions) + { + /* + * We have found the DEBUGPORT commutator. Parse the port name. + * Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO + * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". + */ + strcpy(KdTransportDllName, "KD"); + if (_strnicmp(BootOptions, "COM", 3) == 0 && '0' <= BootOptions[3] && BootOptions[3] <= '9') + { + strncat(KdTransportDllName, BootOptions, 3); + } + else + { + size_t i = strcspn(BootOptions, " \t:"); /* Skip valid separators: whitespace or colon */ + if (i == 0) + strcat(KdTransportDllName, "COM"); + else + strncat(KdTransportDllName, BootOptions, i); + } + strcat(KdTransportDllName, ".DLL"); + _strupr(KdTransportDllName); + + /* + * Load the transport DLL. Specify it to LoadModule so that it can + * change the base DLL name of the loaded transport DLL to the default + * "KDCOM.DLL" name, to make the PE loader happy. + */ + LoadModule(LoaderBlock, BootPath, KdTransportDllName, LoaderSystemCode, &KdComDTE, TRUE, 60); + } + } + + /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ + strcpy(DirPath, BootPath); + strcat(DirPath, "system32\\"); + Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); + Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); + if (KdComDTE) + { + Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); + } + + return Status; } VOID @@ -496,7 +626,7 @@ strcat(BootPath, FileName); } - /* append a backslash */ + /* Append a backslash */ if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') strcat(BootPath, "\\"); @@ -553,7 +683,7 @@ Status = WinLdrScanSystemHive(LoaderBlock, BootPath); TRACE("SYSTEM hive scanned with status %d\n", Status); - + /* Finish loading */ LoadAndBootWindowsCommon(OperatingSystemVersion, LoaderBlock, BootOptions, @@ -571,8 +701,7 @@ { PLOADER_PARAMETER_BLOCK LoaderBlockVA; BOOLEAN Status; - CHAR FileName[MAX_PATH]; - PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; + PLDR_DATA_TABLE_ENTRY KernelDTE; KERNEL_ENTRY_POINT KiSystemStartup; LPCSTR SystemRoot; TRACE("LoadAndBootWindowsCommon()\n"); @@ -586,40 +715,30 @@ if (OperatingSystemVersion == 0) OperatingSystemVersion = WinLdrDetectVersion(); - /* Load kernel */ - LoadModule(LoaderBlock, BootPath, "NTOSKRNL.EXE", LoaderSystemCode, &KernelDTE, 30); - - /* Load HAL */ - LoadModule(LoaderBlock, BootPath, "HAL.DLL", LoaderHalCode, &HalDTE, 45); - - /* Load kernel-debugger support dll */ - if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) - { - LoadModule(LoaderBlock, BootPath, "KDCOM.DLL", LoaderSystemCode, &KdComDTE, 60); - } - - /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ - strcpy(FileName, BootPath); - strcat(FileName, "system32\\"); - Status = WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, KernelDTE); - Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, HalDTE); - if (KdComDTE) - Status &= WinLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, FileName, KdComDTE); - + /* Load the operating system core: the Kernel, the HAL and the Kernel Debugger Transport DLL */ + Status = LoadWindowsCore(OperatingSystemVersion, + LoaderBlock, + BootOptions, + BootPath, + &KernelDTE); if (!Status) { - UiMessageBox("Error loading imported dll."); + UiMessageBox("Error loading NTOS core."); return; } /* Load boot drivers */ UiDrawBackdrop(); UiDrawProgressBarCenter(100, 100, "Loading boot drivers..."); - Status = WinLdrLoadBootDrivers(LoaderBlock, (PCHAR)BootPath); + Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); TRACE("Boot drivers loaded with status %d\n", Status); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemRoot, BootPath, OperatingSystemVersion); + WinLdrInitializePhase1(LoaderBlock, + BootOptions, + SystemRoot, + BootPath, + OperatingSystemVersion); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; @@ -644,7 +763,7 @@ LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; TRACE("Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", - KiSystemStartup, LoaderBlockVA); + KiSystemStartup, LoaderBlockVA); // Zero KI_USER_SHARED_DATA page memset((PVOID)KI_USER_SHARED_DATA, 0, MM_PAGE_SIZE); @@ -722,5 +841,3 @@ NextBd = ArcDisk->ListEntry.Flink; } } - -

1 0

[akhaldi] 58901: [IEFRAME] * Fix the Home button label. Brought to you by Andre Guibert de Bruet. CORE-7144 #resolve #comment Thanks !
by akhaldi＠svn.reactos.org 01 May '13

01 May '13

Author: akhaldi Date: Wed May 1 16:00:36 2013 New Revision: 58901 URL: http://svn.reactos.org/svn/reactos?rev=58901&view=rev Log: [IEFRAME] * Fix the Home button label. Brought to you by Andre Guibert de Bruet. CORE-7144 #resolve #comment Thanks ! Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc Modified: trunk/reactos/dll/win32/ieframe/ieframe.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.rc [iso-8859-1] Wed May 1 16:00:36 2013 @@ -64,7 +64,7 @@ IDS_TB_FORWARD "Forward" IDS_TB_STOP "Stop" IDS_TB_REFRESH "Refresh" - IDS_TB_HOME "#msgctxt#home page#Home" + IDS_TB_HOME "Home" IDS_TB_PRINT "Print..." }

1 0

[ekohl] 58900: [INCLUDE] Add missing LSA_TOKEN_INFORMATION_NULL and LSA_TOKEN_INFORMATION_V1 types.
by ekohl＠svn.reactos.org 01 May '13

01 May '13

Author: ekohl Date: Wed May 1 13:44:24 2013 New Revision: 58900 URL: http://svn.reactos.org/svn/reactos?rev=58900&view=rev Log: [INCLUDE] Add missing LSA_TOKEN_INFORMATION_NULL and LSA_TOKEN_INFORMATION_V1 types. Modified: trunk/reactos/include/psdk/ntsecpkg.h Modified: trunk/reactos/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecpkg.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecpkg.h [iso-8859-1] Wed May 1 13:44:24 2013 @@ -60,6 +60,23 @@ } SECPKG_NAME_TYPE; /* struct definitions for SSP/AP */ +typedef struct _LSA_TOKEN_INFORMATION_NULL +{ + LARGE_INTEGER ExpirationTime; + PTOKEN_GROUPS Groups; +} LSA_TOKEN_INFORMATION_NULL, *PLSA_TOKEN_INFORMATION_NULL; + +typedef struct _LSA_TOKEN_INFORMATION_V1 +{ + LARGE_INTEGER ExpirationTime; + TOKEN_USER User; + PTOKEN_GROUPS Groups; + TOKEN_PRIMARY_GROUP PrimaryGroup; + PTOKEN_PRIVILEGES Privileges; + TOKEN_OWNER Owner; + TOKEN_DEFAULT_DACL DefaultDacl; +} LSA_TOKEN_INFORMATION_V1, *PLSA_TOKEN_INFORMATION_V1; + typedef struct _SECPKG_PRIMARY_CRED { LUID LogonId; UNICODE_STRING DownlevelName;

1 0

[pschweitzer] 58899: [NTOSKRNL] Make post stack overflow functions use the same (unimplemented) helper function
by pschweitzer＠svn.reactos.org 01 May '13

01 May '13

Author: pschweitzer Date: Wed May 1 10:54:02 2013 New Revision: 58899 URL: http://svn.reactos.org/svn/reactos?rev=58899&view=rev Log: [NTOSKRNL] Make post stack overflow functions use the same (unimplemented) helper function Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c Modified: trunk/reactos/ntoskrnl/fsrtl/stackovf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/stackovf.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/stackovf.c [iso-8859-1] Wed May 1 10:54:02 2013 @@ -11,6 +11,18 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +FsRtlpPostStackOverflow(IN PVOID Context, + IN PKEVENT Event, + IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine, + IN BOOLEAN IsPaging) +{ + UNIMPLEMENTED; +} /* PUBLIC FUNCTIONS **********************************************************/ @@ -37,7 +49,7 @@ IN PKEVENT Event, IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { - UNIMPLEMENTED; + FsRtlpPostStackOverflow(Context, Event, StackOverflowRoutine, TRUE); } /*++ @@ -63,7 +75,7 @@ IN PKEVENT Event, IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine) { - KeBugCheck(FILE_SYSTEM); + FsRtlpPostStackOverflow(Context, Event, StackOverflowRoutine, FALSE); } /* EOF */

1 0

[akhaldi] 58898: [NET] * Fix MSVC build.
by akhaldi＠svn.reactos.org 01 May '13

01 May '13

Author: akhaldi Date: Wed May 1 10:00:06 2013 New Revision: 58898 URL: http://svn.reactos.org/svn/reactos?rev=58898&view=rev Log: [NET] * Fix MSVC build. Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c Modified: trunk/reactos/base/applications/network/net/cmdHelpMsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdHelpMsg.c [iso-8859-1] Wed May 1 10:00:06 2013 @@ -14,12 +14,14 @@ { wchar_t *endptr; LPSTR lpBuffer; + long errNum; + if(argc<3) { puts("Usage: NET HELPMSG <Error Code>"); return 1; } - long errNum=wcstol(argv[2], &endptr, 10); + errNum = wcstol(argv[2], &endptr, 10); if(*endptr != 0) { puts("Usage: NET HELPMSG <Error Code>");

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