Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[ion] 55737: [NTOSKRNL]: Fix the zombie fix. Should fix toolhelp tests. [NTOSKRNL]: If you're going to fake success when doing access checks, also grant the rights that would normally be refused, f...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 07:30:26 2012 New Revision: 55737 URL: http://svn.reactos.org/svn/reactos?rev=55737&view=rev Log: [NTOSKRNL]: Fix the zombie fix. Should fix toolhelp tests. [NTOSKRNL]: If you're going to fake success when doing access checks, also grant the rights that would normally be refused, for consistency's sake. Should fix a bunch of the kernel32:synch tests (which have nothing to do with synch...). Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Feb 20 07:30:26 2012 @@ -721,8 +721,6 @@ SystemProcess = PsIdleProcess; Process = SystemProcess; Current = (PUCHAR) Spi; - CurrentSize = 0; - ImageNameMaximumLength = 0; do { @@ -733,7 +731,10 @@ !(Process->ActiveThreads) && (IsListEmpty(&Process->Pcb.ThreadListHead))) { - DPRINT1("Skipping zombie\n"); + DPRINT1("Process %p (%s:%lx) is a zombie\n", + Process, Process->ImageFileName, Process->UniqueProcessId); + CurrentSize = 0; + ImageNameMaximumLength = 0; goto Skip; } Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Mon Feb 20 07:30:26 2012 @@ -705,6 +705,7 @@ *GrantedAccess, DesiredAccess, GenericMapping); //*AccessStatus = STATUS_ACCESS_DENIED; //return FALSE; + *GrantedAccess = DesiredAccess; *AccessStatus = STATUS_SUCCESS; return TRUE; }

12 years, 7 months

[ion] 55736: [NDK]: Fix completely messed up SYSTEM_PROCESS_INFORMATION and SYSTEM_THREAD_INFORMATION classes, which were causing the kernel to return totally wrong data for NtQuerySystemInformatio...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:45:02 2012 New Revision: 55736 URL: http://svn.reactos.org/svn/reactos?rev=55736&view=rev Log: [NDK]: Fix completely messed up SYSTEM_PROCESS_INFORMATION and SYSTEM_THREAD_INFORMATION classes, which were causing the kernel to return totally wrong data for NtQuerySystemInformation(SystemProcessInformation). Fixes Winetests, I assume Taskmgr, and other similar system tools. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Mon Feb 20 06:45:02 2012 @@ -843,7 +843,9 @@ ULONG ContextSwitches; ULONG ThreadState; ULONG WaitReason; + ULONG PadPadAlignment; } SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION; +C_ASSERT(sizeof(SYSTEM_THREAD_INFORMATION) == 0x40); // Must be 8-byte aligned typedef struct _SYSTEM_PROCESS_INFORMATION { @@ -890,10 +892,11 @@ LARGE_INTEGER ReadTransferCount; LARGE_INTEGER WriteTransferCount; LARGE_INTEGER OtherTransferCount; - - SYSTEM_THREAD_INFORMATION TH[1]; +// SYSTEM_THREAD_INFORMATION TH[1]; } SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; - +C_ASSERT(sizeof(SYSTEM_PROCESS_INFORMATION) == 0xB8); // Must be 8-byte aligned + +// // Class 6 typedef struct _SYSTEM_CALL_COUNT_INFORMATION {

12 years, 7 months

[ion] 55735: [NTOSKRNL]: MOV CRX, YYY and MOV YYY, CRX, as well as the DR equivalents were not correctly detected as privileged instructions in the GPF handler. Fixes Winetests. [NTOSKRNL]: The "Wr...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:43:54 2012 New Revision: 55735 URL: http://svn.reactos.org/svn/reactos?rev=55735&view=rev Log: [NTOSKRNL]: MOV CRX, YYY and MOV YYY, CRX, as well as the DR equivalents were not correctly detected as privileged instructions in the GPF handler. Fixes Winetests. [NTOSKRNL]: The "Write" bit in the x86 Error Code is not bit 1, it is bit 2. Fix all the GPF handlers to check for bit 2 instead when determining if an exception was due to read or write. Fixes Winetests. I'll say it nicely this time for Timo: when you rewrite ASM, do it carefully :) Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Feb 20 06:43:54 2012 @@ -970,6 +970,12 @@ } /* Check for privileged instructions */ + DPRINT("Instruction (%d) at fault: %lx %lx %lx %lx\n", + i, + Instructions[i], + Instructions[i + 1], + Instructions[i + 2], + Instructions[i + 3]); if (Instruction == 0xF4) // HLT { /* HLT is privileged */ @@ -988,10 +994,11 @@ (Instructions[i + 1] == 0x08) || // INVD (Instructions[i + 1] == 0x09) || // WBINVD (Instructions[i + 1] == 0x35) || // SYSEXIT - (Instructions[i + 1] == 0x26) || // MOV DR, XXX + (Instructions[i + 1] == 0x21) || // MOV DR, XXX (Instructions[i + 1] == 0x06) || // CLTS (Instructions[i + 1] == 0x20) || // MOV CR, XXX - (Instructions[i + 1] == 0x24) || // MOV YYY, DR + (Instructions[i + 1] == 0x22) || // MOV XXX, CR + (Instructions[i + 1] == 0x23) || // MOV YYY, DR (Instructions[i + 1] == 0x30) || // WRMSR (Instructions[i + 1] == 0x33)) // RDPMC // INVLPG, INVLPGA, SYSRET @@ -1192,7 +1199,7 @@ KeBugCheckWithTf(IRQL_NOT_LESS_OR_EQUAL, Cr2, -1, - TrapFrame->ErrCode & 1, + TrapFrame->ErrCode & 2 ? TRUE : FALSE, TrapFrame->Eip, TrapFrame); } @@ -1254,7 +1261,7 @@ /* This status code is repurposed so we can recognize it later */ KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, TrapFrame->Eip, - TrapFrame->ErrCode & 1, + TrapFrame->ErrCode & 2 ? TRUE : FALSE, Cr2, TrapFrame); } @@ -1264,7 +1271,7 @@ /* These faults only have two parameters */ KiDispatchException2Args(Status, TrapFrame->Eip, - TrapFrame->ErrCode & 1, + TrapFrame->ErrCode & 2 ? TRUE : FALSE, Cr2, TrapFrame); } @@ -1273,7 +1280,7 @@ KiDispatchExceptionFromTrapFrame(STATUS_IN_PAGE_ERROR, TrapFrame->Eip, 3, - TrapFrame->ErrCode & 1, + TrapFrame->ErrCode & 2 ? TRUE : FALSE, Cr2, Status, TrapFrame);

12 years, 7 months

[ion] 55734: [NTOSKRNL]: Implement ProcessDebugObjectHandle and a bunch more query/set process classes. Fixes Winetests. [NTOSKRNL]: We should not be setting *ReturnLength in most failure cases, so...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:42:02 2012 New Revision: 55734 URL: http://svn.reactos.org/svn/reactos?rev=55734&view=rev Log: [NTOSKRNL]: Implement ProcessDebugObjectHandle and a bunch more query/set process classes. Fixes Winetests. [NTOSKRNL]: We should not be setting *ReturnLength in most failure cases, so no longer do so. Fixes Winetests. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Mon Feb 20 06:42:02 2012 @@ -1504,6 +1504,46 @@ &DbgkDebugObjectType); } +NTSTATUS +NTAPI +DbgkOpenProcessDebugPort(IN PEPROCESS Process, + IN KPROCESSOR_MODE PreviousMode, + OUT HANDLE *DebugHandle) +{ + PDEBUG_OBJECT DebugObject; + NTSTATUS Status; + PAGED_CODE(); + + /* If there's no debug port, just exit */ + if (!Process->DebugPort) return STATUS_PORT_NOT_SET; + + /* Otherwise, acquire the lock while we grab the port */ + ExAcquireFastMutex(&DbgkpProcessDebugPortMutex); + + /* Grab it and reference it if it exists */ + DebugObject = Process->DebugPort; + if (DebugObject) ObReferenceObject(DebugObject); + + /* Release the lock now */ + ExReleaseFastMutex(&DbgkpProcessDebugPortMutex); + + /* Bail out if it doesn't exist */ + if (!DebugObject) return STATUS_PORT_NOT_SET; + + /* Now get a handle to it */ + Status = ObOpenObjectByPointer(DebugObject, + 0, + NULL, + MAXIMUM_ALLOWED, + DbgkDebugObjectType, + PreviousMode, + DebugHandle); + if (!NT_SUCCESS(Status)) ObDereferenceObject(DebugObject); + + /* Return status */ + return Status; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Mon Feb 20 06:42:02 2012 @@ -134,6 +134,14 @@ IN PDEBUG_OBJECT SourceDebugObject ); +NTSTATUS +NTAPI +DbgkOpenProcessDebugPort( + IN PEPROCESS Process, + IN KPROCESSOR_MODE PreviousMode, + OUT HANDLE *DebugHandle +); + extern ULONG DbgkpTraceLevel; extern POBJECT_TYPE DbgkDebugObjectType; Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Mon Feb 20 06:42:02 2012 @@ -1507,6 +1507,10 @@ NTAPI MmSetExecuteOptions(IN ULONG ExecuteOptions); +NTSTATUS +NTAPI +MmGetExecuteOptions(IN PULONG ExecuteOptions); + VOID NTAPI MmDeleteProcessPageDirectory(struct _EPROCESS *Process); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Mon Feb 20 06:42:02 2012 @@ -1096,9 +1096,50 @@ NTSTATUS NTAPI +MmGetExecuteOptions(IN PULONG ExecuteOptions) +{ + PKPROCESS CurrentProcess = &PsGetCurrentProcess()->Pcb; + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + *ExecuteOptions = 0; + + if (CurrentProcess->Flags.ExecuteDisable) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE; + } + + if (CurrentProcess->Flags.ExecuteEnable) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_ENABLE; + } + + if (CurrentProcess->Flags.DisableThunkEmulation) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION; + } + + if (CurrentProcess->Flags.Permanent) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_PERMANENT; + } + + if (CurrentProcess->Flags.ExecuteDispatchEnable) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE; + } + + if (CurrentProcess->Flags.ImageDispatchEnable) + { + *ExecuteOptions |= MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE; + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI MmSetExecuteOptions(IN ULONG ExecuteOptions) { - PKPROCESS CurrentProcess = &PsGetCurrentProcess()->Pcb; KLOCK_QUEUE_HANDLE ProcessLock; NTSTATUS Status = STATUS_ACCESS_DENIED; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Mon Feb 20 06:42:02 2012 @@ -69,6 +69,7 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; ULONG Length = 0; + HANDLE DebugPort = 0; PPROCESS_BASIC_INFORMATION ProcessBasicInfo = (PPROCESS_BASIC_INFORMATION)ProcessInformation; PKERNEL_USER_TIMES ProcessTime = (PKERNEL_USER_TIMES)ProcessInformation; @@ -81,7 +82,8 @@ PQUOTA_LIMITS QuotaLimits = (PQUOTA_LIMITS)ProcessInformation; PROCESS_DEVICEMAP_INFORMATION DeviceMap; PUNICODE_STRING ImageName; - ULONG Cookie; + ULONG Cookie, ExecuteOptions = 0; + ULONG_PTR Wow64 = 0; PAGED_CODE(); /* Check for user-mode caller */ @@ -443,9 +445,6 @@ break; } - /* Set the return length */ - Length = ProcessInformationLength; - /* Reference the process */ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_QUERY_INFORMATION, @@ -471,6 +470,10 @@ VmCounters->PagefileUsage = Process->QuotaUsage[2] << PAGE_SHIFT; VmCounters->PeakPagefileUsage = Process->QuotaPeak[2] << PAGE_SHIFT; //VmCounters->PrivateUsage = Process->CommitCharge << PAGE_SHIFT; + // + + /* Set the return length */ + Length = ProcessInformationLength; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -825,8 +828,42 @@ break; case ProcessDebugObjectHandle: - DPRINT1("Debug Object Query Not implemented: %lx\n", ProcessInformationClass); - Status = STATUS_NOT_IMPLEMENTED; + + /* Set the return length */ + Length = sizeof(HANDLE); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Get the debug port */ + Status = DbgkOpenProcessDebugPort(Process, PreviousMode, &DebugPort); + + /* Let go of the process */ + ObDereferenceObject(Process); + + /* Protect write in SEH */ + _SEH2_TRY + { + /* Return the count of handles */ + *(PHANDLE)ProcessInformation = DebugPort; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; break; case ProcessHandleTracing: @@ -835,6 +872,7 @@ break; case ProcessLUIDDeviceMapsEnabled: + /* Set the return length */ Length = sizeof(ULONG); if (ProcessInformationLength != Length) @@ -860,15 +898,118 @@ _SEH2_END; break; + case ProcessWx86Information: + + /* Set the return length */ + Length = sizeof(ULONG); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Indicate success */ + Status = STATUS_SUCCESS; + + /* Protect write in SEH */ + _SEH2_TRY + { + /* Return if the flag is set */ + *(PULONG)ProcessInformation = (ULONG)Process->VdmAllowed; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + break; + + case ProcessWow64Information: + + /* Set return length */ + Length = sizeof(ULONG_PTR); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) break; + + /* Make sure the process isn't dying */ + if (ExAcquireRundownProtection(&Process->RundownProtect)) + { + /* Get the WOW64 process structure */ +#ifdef _WIN64 + Wow64 = Process->Wow64Process; +#else + Wow64 = 0; +#endif + /* Release the lock */ + ExReleaseRundownProtection(&Process->RundownProtect); + } + + /* Protect write with SEH */ + _SEH2_TRY + { + /* Return whether or not we have a debug port */ + *(PULONG_PTR)ProcessInformation = Wow64; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Dereference the process */ + ObDereferenceObject(Process); + break; + case ProcessExecuteFlags: - DPRINT1("No execute Not implemented: %lx\n", ProcessInformationClass); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessWow64Information: + + /* Set return length */ + Length = sizeof(ULONG); + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (ProcessHandle != NtCurrentProcess()) + { + return STATUS_INVALID_PARAMETER; + } + + /* Get the options */ + Status = MmGetExecuteOptions(&ExecuteOptions); + if (NT_SUCCESS(Status)) + { + /* Protect write with SEH */ + _SEH2_TRY + { + /* Return them */ + *(PULONG)ProcessInformation = ExecuteOptions; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + break; + case ProcessLdtInformation: - case ProcessWx86Information: - DPRINT1("VDM/16-bit implemented: %lx\n", ProcessInformationClass); + DPRINT1("VDM/16-bit not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break; @@ -892,7 +1033,7 @@ _SEH2_TRY { /* Check if caller wanted return length */ - if (ReturnLength) *ReturnLength = Length; + if ((ReturnLength) && (Length)) *ReturnLength = Length; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -928,7 +1069,7 @@ KAFFINITY ValidAffinity, Affinity = 0; ULONG DefaultHardErrorMode = 0, BasePriority = 0, MemoryPriority = 0; ULONG DisableBoost = 0, DebugFlags = 0, EnableFixup = 0, Boost = 0; - ULONG NoExecute = 0; + ULONG NoExecute = 0, VdmPower = 0; BOOLEAN HasPrivilege; PLIST_ENTRY Next; PETHREAD Thread; @@ -970,6 +1111,49 @@ /* Check what kind of information class this is */ switch (ProcessInformationClass) { + case ProcessWx86Information: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(HANDLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Use SEH for capture */ + _SEH2_TRY + { + /* Capture the boolean */ + VdmPower = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Getting VDM powers requires the SeTcbPrivilege */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Bail out */ + Status = STATUS_PRIVILEGE_NOT_HELD; + DPRINT1("Need TCB privilege\n"); + break; + } + + /* Set or clear the flag */ + if (VdmPower) + { + PspSetProcessFlag(Process, PSF_VDM_ALLOWED_BIT); + } + else + { + PspClearProcessFlag(Process, PSF_VDM_ALLOWED_BIT); + } + break; + /* Error/Exception Port */ case ProcessExceptionPort: @@ -1670,7 +1854,6 @@ case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: - case ProcessWx86Information: DPRINT1("VDM/16-bit Request not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; break;

12 years, 7 months

[ion] 55733: [RTL]: Force RtlIpToString APIs to behave inexplicably like on Windows, returning -1 instead of crashing when sprintfing to a NULL pointer.

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:37:13 2012 New Revision: 55733 URL: http://svn.reactos.org/svn/reactos?rev=55733&view=rev Log: [RTL]: Force RtlIpToString APIs to behave inexplicably like on Windows, returning -1 instead of crashing when sprintfing to a NULL pointer. Modified: trunk/reactos/lib/rtl/network.c Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=5573… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Mon Feb 20 06:37:13 2012 @@ -32,6 +32,8 @@ OUT PCHAR S) { INT Length; + + if (!S) return (LPSTR)~0; Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, @@ -85,6 +87,8 @@ { INT Length; + if (!S) return (LPWSTR)~0; + Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, Addr->S_un.S_un_b.s_b3,

12 years, 7 months

[ion] 55732: [KERNEL32]: Add support for NO_DEBUG_INHERIT in CreateProcess. Fixes a winetest.

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:36:17 2012 New Revision: 55732 URL: http://svn.reactos.org/svn/reactos?rev=55732&view=rev Log: [KERNEL32]: Add support for NO_DEBUG_INHERIT in CreateProcess. Fixes a winetest. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Mon Feb 20 06:36:17 2012 @@ -3016,7 +3016,8 @@ /* Check if only this process will be debugged */ if (dwCreationFlags & DEBUG_ONLY_THIS_PROCESS) { - /* FIXME: Set process flag */ + /* Set process flag */ + hDebug = (HANDLE)((ULONG_PTR)hDebug | 0x1); } }

12 years, 7 months

[ion] 55731: [NTOSKRNL]: NtQuerySystemInformation(SystemProcessInformation) should skip zombie processes, and it should use the KTHREAD ThreadListEntry, not the ETHREAD ThreadListEntry. Fixes winet...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 06:35:05 2012 New Revision: 55731 URL: http://svn.reactos.org/svn/reactos?rev=55731&view=rev Log: [NTOSKRNL]: NtQuerySystemInformation(SystemProcessInformation) should skip zombie processes, and it should use the KTHREAD ThreadListEntry, not the ETHREAD ThreadListEntry. Fixes winetest since Idle Threads are int he former, not the latter (verified and Windows does this too). Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Feb 20 06:35:05 2012 @@ -711,7 +711,9 @@ /* Check for overflow */ if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) + { Overflow = TRUE; + } /* Zero user's buffer */ if (!Overflow) RtlZeroMemory(Spi, Size); @@ -719,14 +721,25 @@ SystemProcess = PsIdleProcess; Process = SystemProcess; Current = (PUCHAR) Spi; + CurrentSize = 0; + ImageNameMaximumLength = 0; do { SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current; + + if ((Process->ProcessExiting) && + (Process->Pcb.Header.SignalState) && + !(Process->ActiveThreads) && + (IsListEmpty(&Process->Pcb.ThreadListHead))) + { + DPRINT1("Skipping zombie\n"); + goto Skip; + } ThreadsCount = 0; - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) + CurrentEntry = Process->Pcb.ThreadListHead.Flink; + while (CurrentEntry != &Process->Pcb.ThreadListHead) { ThreadsCount++; CurrentEntry = CurrentEntry->Flink; @@ -770,7 +783,9 @@ /* Check for overflow */ if (TotalSize > Size) + { Overflow = TRUE; + } /* Fill system information */ if (!Overflow) @@ -821,10 +836,10 @@ SpiCurrent->PrivatePageCount = Process->CommitCharge; ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) + CurrentEntry = Process->Pcb.ThreadListHead.Flink; + while (CurrentEntry != &Process->Pcb.ThreadListHead) { - CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, + CurrentThread = (PETHREAD)CONTAINING_RECORD(CurrentEntry, KTHREAD, ThreadListEntry); ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); @@ -850,6 +865,7 @@ } /* Handle idle process entry */ +Skip: if (Process == PsIdleProcess) Process = NULL; Process = PsGetNextProcess(Process);

12 years, 7 months

[sir_richard] 55730: [NTDLL_WINETEST]: Skip an obviously nonsensical test of trying to sprintf into NULL.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Feb 20 01:13:50 2012 New Revision: 55730 URL: http://svn.reactos.org/svn/reactos?rev=55730&view=rev Log: [NTDLL_WINETEST]: Skip an obviously nonsensical test of trying to sprintf into NULL. Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Mon Feb 20 01:13:50 2012 @@ -1173,10 +1173,13 @@ len = strlen(buffer); ok(res == (buffer + len), "got %p with '%s' (expected %p)\n", res, buffer, buffer + len); - res = pRtlIpv4AddressToStringA(&ip, NULL); - ok( (res == (char *)~0) || - broken(res == (char *)0 + len), /* XP and w2003 */ - "got %p (expected ~0)\n", res); + if (0) { + /* this crashes in windows */ + res = pRtlIpv4AddressToStringA(&ip, NULL); + ok( (res == (char *)~0) || + broken(res == (char *)0 + len), /* XP and w2003 */ + "got %p (expected ~0)\n", res); + } if (0) { /* this crashes in windows */

12 years, 7 months

[ion] 55729: [NTDLL/RTL]: Implement RtlGet/SetThreadErrorMode. [NTDLL/RTL]: Fix RtlIpv4AddressToStringA and RtlIpv4AddressToStringW to work like in Windows (and crash with a NULL buffer).

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 01:13:31 2012 New Revision: 55729 URL: http://svn.reactos.org/svn/reactos?rev=55729&view=rev Log: [NTDLL/RTL]: Implement RtlGet/SetThreadErrorMode. [NTDLL/RTL]: Fix RtlIpv4AddressToStringA and RtlIpv4AddressToStringW to work like in Windows (and crash with a NULL buffer). Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/rtl/error.c trunk/reactos/lib/rtl/network.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 Feb 20 01:13:31 2012 @@ -683,7 +683,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlGetSetBootStatusData(ptr long long ptr long long) -//@ stdcall RtlGetThreadErrorMode +@ stdcall RtlGetThreadErrorMode() //@ stdcall RtlGetUnloadEventTrace @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) @@ -894,7 +894,7 @@ @ stdcall RtlSetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) //@ stdcall RtlSetSecurityObjectEx -//@ stdcall RtlSetThreadErrorMode +@ stdcall RtlSetThreadErrorMode(long ptr) @ stdcall RtlSetThreadIsCritical(long ptr long) @ stdcall RtlSetThreadPoolStartFunc(ptr ptr) @ stdcall RtlSetTimeZoneInformation(ptr) 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 Feb 20 01:13:31 2012 @@ -681,7 +681,7 @@ @ stdcall RtlGetSaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlGetSetBootStatusData(ptr long long ptr long long) -;@ stdcall RtlGetThreadErrorMode +@ stdcall RtlGetThreadErrorMode() ;@ stdcall RtlGetUnloadEventTrace @ stdcall RtlGetUserInfoHeap(ptr long ptr ptr ptr) @ stdcall RtlGetVersion(ptr) @@ -894,7 +894,7 @@ @ stdcall RtlSetSecurityDescriptorRMControl(ptr ptr) @ stdcall RtlSetSecurityObject(long ptr ptr ptr ptr) ;@ stdcall RtlSetSecurityObjectEx -;@ stdcall RtlSetThreadErrorMode +@ stdcall RtlSetThreadErrorMode(long ptr) @ stdcall RtlSetThreadIsCritical(long ptr long) @ stdcall RtlSetThreadPoolStartFunc(ptr ptr) @ stdcall RtlSetTimeZoneInformation(ptr) Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=55729&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Mon Feb 20 01:13:31 2012 @@ -23,6 +23,10 @@ #define NDEBUG #include <debug.h> + +#define RTL_SEM_FAILCRITICALERRORS (SEM_FAILCRITICALERRORS << 4) +#define RTL_SEM_NOGPFAULTERRORBOX (SEM_NOGPFAULTERRORBOX << 4) +#define RTL_SEM_NOALIGNMENTFAULTEXCEPT (SEM_NOALIGNMENTFAULTEXCEPT << 4) struct error_table { @@ -169,6 +173,44 @@ { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetThreadErrorMode(IN ULONG NewMode, + OUT PULONG OldMode OPTIONAL) +{ + PTEB Teb = NtCurrentTeb(); + + /* Ignore invalid error modes */ + if (NewMode & ~(RTL_SEM_FAILCRITICALERRORS | + RTL_SEM_NOGPFAULTERRORBOX | + RTL_SEM_NOALIGNMENTFAULTEXCEPT)) + { + DPRINT1("Invalid error mode\n"); + return STATUS_INVALID_PARAMETER_1; + } + + /* Return old mode */ + if (OldMode) *OldMode = Teb->HardErrorMode; + + /* Set new one and return success */ + Teb->HardErrorMode = NewMode; + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlGetThreadErrorMode(VOID) +{ + /* Return it from the TEB */ + return NtCurrentTeb()->HardErrorMode; } /* conversion tables */ Modified: trunk/reactos/lib/rtl/network.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/network.c?rev=5572… ============================================================================== --- trunk/reactos/lib/rtl/network.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/network.c [iso-8859-1] Mon Feb 20 01:13:31 2012 @@ -31,18 +31,13 @@ RtlIpv4AddressToStringA(IN struct in_addr *Addr, OUT PCHAR S) { - CHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; INT Length; - if(!S) - return NULL; - - Length = sprintf(Buffer, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Length = sprintf(S, "%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, Addr->S_un.S_un_b.s_b2, Addr->S_un.S_un_b.s_b3, Addr->S_un.S_un_b.s_b4); - strcpy(S, Buffer); return S + Length; } @@ -88,19 +83,12 @@ RtlIpv4AddressToStringW(IN struct in_addr *Addr, OUT PWCHAR S) { - WCHAR Buffer[IPV4_ADDR_STRING_MAX_LEN]; INT Length; - if (!S) - return NULL; - - Length = swprintf(Buffer, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, - Addr->S_un.S_un_b.s_b2, - Addr->S_un.S_un_b.s_b3, - Addr->S_un.S_un_b.s_b4); - - wcscpy(S, Buffer); - + Length = swprintf(S, L"%u.%u.%u.%u", Addr->S_un.S_un_b.s_b1, + Addr->S_un.S_un_b.s_b2, + Addr->S_un.S_un_b.s_b3, + Addr->S_un.S_un_b.s_b4); return S + Length; }

12 years, 7 months

[ion] 55728: [NTOSKRNL]: Fix ntdll:om winetest. When querying for filenames if the caller did not specify a buffer large enough (which they normally don't, initially), we would just fail but not te...

by ion＠svn.reactos.org

Author: ion Date: Mon Feb 20 00:11:24 2012 New Revision: 55728 URL: http://svn.reactos.org/svn/reactos?rev=55728&view=rev Log: [NTOSKRNL]: Fix ntdll:om winetest. When querying for filenames if the caller did not specify a buffer large enough (which they normally don't, initially), we would just fail but not tell them how large to request it (so they'd get back an uninitailized huge value). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Mon Feb 20 00:11:24 2012 @@ -1317,6 +1317,7 @@ if (Length < sizeof(OBJECT_NAME_INFORMATION)) { /* Wrong length, fail */ + *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); return STATUS_INFO_LENGTH_MISMATCH; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Feb 20 00:11:24 2012 @@ -1120,7 +1120,7 @@ ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + sizeof(UNICODE_NULL)); ObjectNameInfo->Name.Buffer = ObjectName; - _SEH2_YIELD(return STATUS_SUCCESS); + Status = STATUS_SUCCESS; } else {

12 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
58
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 February 2012