Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[jgardou] 66327: [RSHELL] - Do not free invalid data. See MSDN SHBindToParent documentation for details.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Feb 16 22:33:08 2015 New Revision: 66327 URL: http://svn.reactos.org/svn/reactos?rev=66327&view=rev Log: [RSHELL] - Do not free invalid data. See MSDN SHBindToParent documentation for details. Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp Modified: trunk/reactos/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CStartMe… ============================================================================== --- trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Mon Feb 16 22:33:08 2015 @@ -496,7 +496,6 @@ return hr; StrRetToBuf(&str, pcidlPrograms, szDisplayName, _countof(szDisplayName)); - ILFree((LPITEMIDLIST)pcidlPrograms); ILFree(pidlProgramsAbsolute); hr = psf->ParseDisplayName(NULL, NULL, szDisplayName, NULL, &pidlPrograms, NULL);

9 years, 7 months

[jgardou] 66326: [NTDLL_APITEST] - Add tests showing windows behaviour in case of stack overflow.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Feb 16 21:15:55 2015 New Revision: 66326 URL: http://svn.reactos.org/svn/reactos?rev=66326&view=rev Log: [NTDLL_APITEST] - Add tests showing windows behaviour in case of stack overflow. Added: trunk/rostests/apitests/ntdll/StackOverflow.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -27,6 +27,7 @@ RtlGetLongestNtPathLength.c RtlInitializeBitMap.c RtlMemoryStream.c + StackOverflow.c SystemInfo.c Timer.c testlist.c) Added: trunk/rostests/apitests/ntdll/StackOverflow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/StackOverf… ============================================================================== --- trunk/rostests/apitests/ntdll/StackOverflow.c (added) +++ trunk/rostests/apitests/ntdll/StackOverflow.c [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -0,0 +1,184 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for stack overflow + * PROGRAMMER: JÃ©rÃ´me Gardou + */ + +#define WIN32_NO_STATUS +#include <apitest.h> +#include <stdio.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> + +static int iteration = 0; +static PVOID StackAllocationBase; +static PVOID LastStackAllocation; +static ULONG StackSize; + +static +void +infinite_recursive(void) +{ + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + NTSTATUS Status; + char Buffer[0x500]; + + sprintf(Buffer, "Iteration %d.\n", iteration++); + + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + &Buffer[0], + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + /* This never changes */ + ok_ptr(MemoryBasicInfo.AllocationBase, StackAllocationBase); + /* Stack is committed one page at a time */ + ok_ptr(MemoryBasicInfo.BaseAddress, (PVOID)PAGE_ROUND_DOWN(&Buffer[0])); + /* This is the protection of the memory when it was reserved. */ + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_READWRITE); + /* Windows commits the whole used stack at once, +2 pages. */ +#if 0 + ok_long(MemoryBasicInfo.RegionSize, ((ULONG_PTR)StackAllocationBase + StackSize + 2* PAGE_SIZE) - PAGE_ROUND_DOWN(&Buffer[0])); +#endif + /* This is the state of the queried address */ + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + /* This is the protection of the queried address */ + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + /* Of course this is private memory. */ + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); + + LastStackAllocation = &Buffer[-0x500]; + + infinite_recursive(); +} + +START_TEST(StackOverflow) +{ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; + + /* Get the base of the stack */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + &Status, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + StackAllocationBase = MemoryBasicInfo.AllocationBase; + trace("Stack allocation base is %p.\n", StackAllocationBase); + StackSize = MemoryBasicInfo.RegionSize; + + /* Check TEB attributes */ + ok_ptr(NtCurrentTeb()->DeallocationStack, StackAllocationBase); + ok_ptr(NtCurrentTeb()->NtTib.StackBase, (PVOID)((ULONG_PTR)MemoryBasicInfo.BaseAddress + MemoryBasicInfo.RegionSize)); + ok_ptr(NtCurrentTeb()->NtTib.StackLimit, (PVOID)((ULONG_PTR)MemoryBasicInfo.BaseAddress - PAGE_SIZE)); + trace("Guaranteed stack size is %lu.\n", NtCurrentTeb()->GuaranteedStackBytes); + + /* Get its size */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + StackAllocationBase, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* This is the complete stack size */ + StackSize += MemoryBasicInfo.RegionSize; + trace("Stack size is 0x%lx.\n", StackSize); + + trace("Stack limit %p, stack base %p.\n", NtCurrentTeb()->NtTib.StackLimit, NtCurrentTeb()->NtTib.StackBase); + + /* Take a look at what is beyond the stack limit */ + Status = NtQueryVirtualMemory( + NtCurrentProcess(), + NtCurrentTeb()->NtTib.StackLimit, + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + ok_ptr(MemoryBasicInfo.BaseAddress, NtCurrentTeb()->NtTib.StackLimit); + ok_ptr(MemoryBasicInfo.AllocationBase, StackAllocationBase); + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_READWRITE); + ok_long(MemoryBasicInfo.RegionSize, 2 * PAGE_SIZE); + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); + + /* Accessing below stack limit is OK, as long as we don't starve the reserved space. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit - PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + _SEH2_TRY + { + infinite_recursive(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + trace("Exception after %d iteration.\n", iteration); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ok_ntstatus(Status, STATUS_STACK_OVERFLOW); + + /* Windows lets 2 pages between the reserved memory and the smallest possible stack address */ + ok((ULONG_PTR)LastStackAllocation > (ULONG_PTR)StackAllocationBase, "\n"); + ok_long(PAGE_ROUND_DOWN(LastStackAllocation), (ULONG_PTR)StackAllocationBase + 2 * PAGE_SIZE); + + /* And in fact, this is the true condition of the stack overflow */ + ok_ptr(NtCurrentTeb()->NtTib.StackLimit, (PVOID)((ULONG_PTR)StackAllocationBase + PAGE_SIZE)); + + trace("Stack limit %p, stack base %p.\n", NtCurrentTeb()->NtTib.StackLimit, NtCurrentTeb()->NtTib.StackBase); + + /* Of course, accessing above the stack limit is OK. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit + PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + /* But once stack is starved, it's starved. */ + _SEH2_TRY + { + volatile CHAR* Pointer = (PVOID)((ULONG_PTR)NtCurrentTeb()->NtTib.StackLimit - PAGE_SIZE / 2); + CHAR Value = *Pointer; + (void)Value; + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + trace("Exception after %d iteration.\n", iteration); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); +} Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/ntdll/StackOverflow.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Mon Feb 16 21:15:55 2015 @@ -31,6 +31,7 @@ extern void func_RtlGetLongestNtPathLength(void); extern void func_RtlInitializeBitMap(void); extern void func_RtlMemoryStream(void); +extern void func_StackOverflow(void); extern void func_TimerResolution(void); const struct test winetest_testlist[] = @@ -63,6 +64,7 @@ { "RtlGetLongestNtPathLength", func_RtlGetLongestNtPathLength }, { "RtlInitializeBitMap", func_RtlInitializeBitMap }, { "RtlMemoryStream", func_RtlMemoryStream }, + { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, { 0, 0 }

9 years, 7 months

[jgardou] 66325: [NTDLL_APITEST] - Add tests showing how NtAllocateVirtualMemory and NtQueryVirtualMemory work together

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Feb 16 21:15:27 2015 New Revision: 66325 URL: http://svn.reactos.org/svn/reactos?rev=66325&view=rev Log: [NTDLL_APITEST] - Add tests showing how NtAllocateVirtualMemory and NtQueryVirtualMemory work together Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Mon Feb 16 21:15:27 2015 @@ -367,6 +367,7 @@ NTSTATUS Status; PVOID BaseAddress; SIZE_T Size; + MEMORY_BASIC_INFORMATION MemoryBasicInfo; /* Reserve a full 64k region */ BaseAddress = UlongToPtr(0x50000000); @@ -486,6 +487,42 @@ } _SEH2_END; ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* Commit a page at the end of the first region */ + BaseAddress = UlongToPtr(0x5000F000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_ptr(BaseAddress, UlongToPtr(0x5000F000)); + + /* See where is the base of this newly committed area + * (choose a base address in the middle of it) */ + Status = NtQueryVirtualMemory(NtCurrentProcess(), + UlongToPtr(0x5000F700), + MemoryBasicInformation, + &MemoryBasicInfo, + sizeof(MemoryBasicInfo), + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + /* The base address is the beginning of the committed area */ + ok_ptr(MemoryBasicInfo.BaseAddress, UlongToPtr(0x5000F000)); + /* The allocation base address is the beginning of the whole region */ + ok_ptr(MemoryBasicInfo.AllocationBase, UlongToPtr(0x50000000)); + /* This is the protection of the memory when it was reserved. */ + ok_long(MemoryBasicInfo.AllocationProtect, PAGE_NOACCESS); + /* This is the size of the committed region. (ie, smallest chunk size) */ + ok_long(MemoryBasicInfo.RegionSize, 0x1000); + /* This is the state of the queried address */ + ok_long(MemoryBasicInfo.State, MEM_COMMIT); + /* This is the protection of the queried address */ + ok_long(MemoryBasicInfo.Protect, PAGE_READWRITE); + /* NtAllocateVirtualMemory makes it MEM_PRIVATE */ + ok_long(MemoryBasicInfo.Type, MEM_PRIVATE); /* Try to free the whole region at once */ BaseAddress = UlongToPtr(0x50000000);

9 years, 7 months

[jgardou] 66324: [KERNEL32] - Fix mixed arguments. CORE-9201 #resolve CORE-9124 #comment Please retest

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Feb 16 21:13:36 2015 New Revision: 66324 URL: http://svn.reactos.org/svn/reactos?rev=66324&view=rev Log: [KERNEL32] - Fix mixed arguments. CORE-9201 #resolve CORE-9124 #comment Please retest Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Mon Feb 16 21:13:36 2015 @@ -351,8 +351,8 @@ NTSTATUS WINAPI BaseCreateStack(HANDLE hProcess, + SIZE_T StackCommit, SIZE_T StackReserve, - SIZE_T StackCommit, PINITIAL_TEB InitialTeb) { NTSTATUS Status;

9 years, 7 months

[jgardou] 66323: [KERNEL32] Revert r64525 - Always allocate a guard page at the bottom of the stack.

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Feb 16 21:12:51 2015 New Revision: 66323 URL: http://svn.reactos.org/svn/reactos?rev=66323&view=rev Log: [KERNEL32] Revert r64525 - Always allocate a guard page at the bottom of the stack. Modified: trunk/reactos/dll/win32/kernel32/client/utils.c Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Mon Feb 16 21:12:51 2015 @@ -358,6 +358,7 @@ NTSTATUS Status; PIMAGE_NT_HEADERS Headers; ULONG_PTR Stack; + BOOLEAN UseGuard; ULONG PageSize, Dummy, AllocationGranularity; SIZE_T StackReserveHeader, StackCommitHeader, GuardPageSize, GuaranteedStackCommit; DPRINT("BaseCreateStack (hProcess: %p, Max: %lx, Current: %lx)\n", @@ -425,6 +426,18 @@ /* Update the Stack Position */ Stack += StackReserve - StackCommit; + /* Check if we will need a guard page */ + if (StackReserve > StackCommit) + { + Stack -= PageSize; + StackCommit += PageSize; + UseGuard = TRUE; + } + else + { + UseGuard = FALSE; + } + /* Allocate memory for the stack */ Status = NtAllocateVirtualMemory(hProcess, (PVOID*)&Stack, @@ -444,21 +457,25 @@ InitialTeb->StackLimit = (PVOID)Stack; /* Create a guard page */ - GuardPageSize = PageSize; - Status = NtProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failure to set guard page\n"); - return Status; - } - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + - GuardPageSize); + if (UseGuard) + { + /* Set the guard page */ + GuardPageSize = PAGE_SIZE; + Status = NtProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to set guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit + + GuardPageSize); + } /* We are done! */ return STATUS_SUCCESS;

9 years, 7 months

[dreimer] 66322: ... ANSI vs UTF-8... sorry

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Feb 16 20:44:12 2015 New Revision: 66322 URL: http://svn.reactos.org/svn/reactos?rev=66322&view=rev Log: ... ANSI vs UTF-8... sorry Modified: trunk/reactos/base/system/services/lang/de-DE.rc Modified: trunk/reactos/base/system/services/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] Mon Feb 16 20:44:12 2015 @@ -6,7 +6,7 @@ IDS_SERVICE_STOP "beenden" IDS_SERVICE_PAUSE "anhalten" IDS_SERVICE_RESUME "fortsetzen" - IDS_SERVICE_RUNNING "Ausgeführt" + IDS_SERVICE_RUNNING "AusgefÃ¼hrt" IDS_SERVICE_STOPPED "Beendet" IDS_SERVICE_PAUSED "Angehalten" END

9 years, 7 months

[dreimer] 66321: [SERVICES] German translation & Small fix I think which should be right for English ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Feb 16 20:27:29 2015 New Revision: 66321 URL: http://svn.reactos.org/svn/reactos?rev=66321&view=rev Log: [SERVICES] German translation & Small fix I think which should be right for English ^^ Added: trunk/reactos/base/system/services/lang/de-DE.rc (with props) Modified: trunk/reactos/base/system/services/lang/en-US.rc trunk/reactos/base/system/services/services.rc Added: trunk/reactos/base/system/services/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/de-DE.rc (added) +++ trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -0,0 +1,12 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "starten" + IDS_SERVICE_STOP "beenden" + IDS_SERVICE_PAUSE "anhalten" + IDS_SERVICE_RESUME "fortsetzen" + IDS_SERVICE_RUNNING "Ausgeführt" + IDS_SERVICE_STOPPED "Beendet" + IDS_SERVICE_PAUSED "Angehalten" +END Propchange: trunk/reactos/base/system/services/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lang/en-US.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -6,7 +6,7 @@ IDS_SERVICE_STOP "stop" IDS_SERVICE_PAUSE "pause" IDS_SERVICE_RESUME "resume" - IDS_SERVICE_RUNNING "running" - IDS_SERVICE_STOPPED "stopped" - IDS_SERVICE_PAUSED "paused" + IDS_SERVICE_RUNNING "Running" + IDS_SERVICE_STOPPED "Stopped" + IDS_SERVICE_PAUSED "Paused" END Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -12,6 +12,10 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif + #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

9 years, 7 months

[tfaber] 66320: [BOOTCDREGTEST] - Add /n switch to rosautotest invocation to see how much of a difference it makes on testbot

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 16 16:17:22 2015 New Revision: 66320 URL: http://svn.reactos.org/svn/reactos?rev=66320&view=rev Log: [BOOTCDREGTEST] - Add /n switch to rosautotest invocation to see how much of a difference it makes on testbot Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] Mon Feb 16 16:17:22 2015 @@ -9,4 +9,4 @@ ) dbgprint --process "ipconfig" -start rosautotest /r /s +start rosautotest /r /s /n

9 years, 7 months

[ekohl] 66319: [NTOSKRNL] NtQueryInformationFile: Implement the FileModeInformation case according to 'File System Internals' page 485.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 16 15:33:34 2015 New Revision: 66319 URL: http://svn.reactos.org/svn/reactos?rev=66319&view=rev Log: [NTOSKRNL] NtQueryInformationFile: Implement the FileModeInformation case according to 'File System Internals' page 485. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Mon Feb 16 15:33:34 2015 @@ -863,6 +863,35 @@ *Handle = TargetHandle; return STATUS_SUCCESS; +} + +static +ULONG +IopGetFileMode(IN PFILE_OBJECT FileObject) +{ + ULONG Mode = 0; + + if (FileObject->Flags & FO_WRITE_THROUGH) + Mode |= FILE_WRITE_THROUGH; + + if (FileObject->Flags & FO_SEQUENTIAL_ONLY) + Mode |= FILE_SEQUENTIAL_ONLY; + + if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) + Mode |= FILE_NO_INTERMEDIATE_BUFFERING; + + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + if (FileObject->Flags & FO_ALERTABLE_IO) + Mode |= FILE_SYNCHRONOUS_IO_ALERT; + else + Mode |= FILE_SYNCHRONOUS_IO_NONALERT; + } + + if (FileObject->Flags & FO_DELETE_ON_CLOSE) + Mode |= FILE_DELETE_ON_CLOSE; + + return Mode; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -1865,6 +1894,7 @@ IO_STATUS_BLOCK KernelIosb; BOOLEAN CallDriver = TRUE; PFILE_ACCESS_INFORMATION AccessBuffer; + PFILE_MODE_INFORMATION ModeBuffer; PFILE_ALIGNMENT_INFORMATION AlignmentBuffer; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2053,6 +2083,13 @@ AccessBuffer = Irp->AssociatedIrp.SystemBuffer; AccessBuffer->AccessFlags = HandleInformation.GrantedAccess; Irp->IoStatus.Information = sizeof(FILE_ACCESS_INFORMATION); + CallDriver = FALSE; + } + else if (FileInformationClass == FileModeInformation) + { + ModeBuffer = Irp->AssociatedIrp.SystemBuffer; + ModeBuffer->Mode = IopGetFileMode(FileObject); + Irp->IoStatus.Information = sizeof(FILE_MODE_INFORMATION); CallDriver = FALSE; } else if (FileInformationClass == FileAlignmentInformation)

9 years, 7 months

[tfaber] 66318: [ROSAUTOTEST] - Add /n option to suppress console output. May or may not help to speed up testbot runs, but can't hurt to have in here.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 16 14:55:39 2015 New Revision: 66318 URL: http://svn.reactos.org/svn/reactos?rev=66318&view=rev Log: [ROSAUTOTEST] - Add /n option to suppress console output. May or may not help to speed up testbot runs, but can't hurt to have in here. Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CConfiguration.h trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -16,13 +16,12 @@ * Constructs an empty CConfiguration object */ CConfiguration::CConfiguration() + : m_CrashRecovery(false), + m_PrintToConsole(true), + m_Shutdown(false), + m_Submit(false) { WCHAR WindowsDirectory[MAX_PATH]; - - /* Zero-initialize variables */ - m_CrashRecovery = false; - m_Shutdown = false; - m_Submit = false; /* Check if we are running under ReactOS from the SystemRoot directory */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) @@ -55,6 +54,10 @@ m_Comment = UnicodeToAscii(argv[i]); break; + case 'n': + m_PrintToConsole = false; + break; + case 'r': m_CrashRecovery = true; break; Modified: trunk/rostests/rosautotest/CConfiguration.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -10,6 +10,7 @@ private: bool m_CrashRecovery; bool m_IsReactOS; + bool m_PrintToConsole; bool m_Shutdown; bool m_Submit; string m_Comment; @@ -26,6 +27,7 @@ void GetConfigurationFromFile(); bool DoCrashRecovery() const { return m_CrashRecovery; } + bool DoPrint() const { return m_PrintToConsole; } bool DoShutdown() const { return m_Shutdown; } bool DoSubmit() const { return m_Submit; } bool IsReactOS() const { return m_IsReactOS; } Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -23,6 +23,7 @@ << " /c <comment> - Specifies the comment to be submitted to the Web Service." << endl << " Skips the comment set in the configuration file (if any)." << endl << " Only has an effect when /w is also used." << endl + << " /n - Do not print test output to console" << endl << " /r - Maintain information to resume from ReactOS crashes" << endl << " Can only be run under ReactOS and relies on sysreg2," << endl << " so incompatible with /w" << endl Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -149,7 +149,8 @@ if(forcePrint == true || NewString[curr_pos - 1] == '\n') { /* Output the whole string */ - cout << NewString; + if(Configuration.DoPrint()) + cout << NewString; memcpy(DbgString, NewString.c_str() + start, size); DbgString[size] = 0; @@ -160,7 +161,8 @@ } /* Output full lines only */ - cout << NewString.substr(0, start); + if(Configuration.DoPrint()) + cout << NewString.substr(0, start); /* Return the remaining chunk */ return NewString.substr(start, size);

9 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
38
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 2015