Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[sir_richard] 49035: [NTOS]: Add support for user-mode VAD faults on page tables (just a couple lines of extra code). [NTOS]: Add support for user-mode VAD demand zero faults. [NTOS]: Remove broken...
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 17:27:23 2010 New Revision: 49035 URL: http://svn.reactos.org/svn/reactos?rev=49035&view=rev Log: [NTOS]: Add support for user-mode VAD faults on page tables (just a couple lines of extra code). [NTOS]: Add support for user-mode VAD demand zero faults. [NTOS]: Remove broken ASSERT. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c 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] Thu Oct 7 17:27:23 2010 @@ -32,8 +32,25 @@ /* No prototype/section support for now */ *ProtoVad = NULL; - /* Only valid for user VADs for now */ - ASSERT(VirtualAddress <= MM_HIGHEST_USER_ADDRESS); + /* Check if this is a page table address */ + if (MI_IS_PAGE_TABLE_ADDRESS(VirtualAddress)) + { + /* This should never happen, as these addresses are handled by the double-maping */ + if (((PMMPTE)VirtualAddress >= MiAddressToPte(MmPagedPoolStart)) && + ((PMMPTE)VirtualAddress <= MmPagedPoolInfo.LastPteForPagedPool)) + { + /* Fail such access */ + *ProtectCode = MM_NOACCESS; + return NULL; + } + + /* Return full access rights */ + *ProtectCode = MM_READWRITE; + return NULL; + } + + /* Should not be a session address */ + ASSERT(MI_IS_SESSION_ADDRESS(VirtualAddress) == FALSE); /* Special case for shared data */ if (PAGE_ALIGN(VirtualAddress) == (PVOID)USER_SHARED_DATA) @@ -642,7 +659,7 @@ // // Check for kernel fault // - if (Address >= MmSystemRangeStart) + while (Address >= MmSystemRangeStart) { // // What are you even DOING here? @@ -718,25 +735,16 @@ // if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) { - // - // This might happen...not sure yet - // - DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); #if (_MI_PAGING_LEVELS == 2) - // - // Map in the page table - // + /* Could be paged pool access from a new process -- synchronize the page directories */ if (MiCheckPdeForPagedPool(Address) == STATUS_WAIT_1) { DPRINT1("PAGE TABLES FAULTED IN!\n"); return STATUS_SUCCESS; } #endif - // - // Otherwise the page table doesn't actually exist - // - DPRINT1("FAILING\n"); - return STATUS_ACCESS_VIOLATION; + /* Otherwise this could be a commit of a virtual address */ + break; } /* In this path, we are using the system working set */ @@ -866,7 +874,8 @@ #endif /* First things first, is the PDE valid? */ - ASSERT(PointerPde != MiAddressToPde(PTE_BASE)); +// DPRINT1("The PDE we faulted on: %lx %lx\n", PointerPde, MiAddressToPde(PTE_BASE)); + //ASSERT(PointerPde != MiAddressToPde(PTE_BASE)); ASSERT(PointerPde->u.Hard.LargePage == 0); if (PointerPde->u.Hard.Valid == 0) { @@ -901,8 +910,27 @@ ASSERT(PointerPde->u.Hard.Valid == 1); } - /* Now capture the PTE. We only handle cases where it's totally empty */ + /* Now capture the PTE. Ignore virtual faults for now */ TempPte = *PointerPte; + ASSERT(TempPte.u.Hard.Valid == 0); + + /* Quick check for demand-zero */ + if (TempPte.u.Long == (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)) + { + /* Resolve the fault */ + //DPRINT1("VAD demand-zero fault: %p\n", Address); + MiResolveDemandZeroFault(Address, + PointerPte, + CurrentProcess, + MM_NOIRQL); + + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_PAGE_FAULT_DEMAND_ZERO; + } + + /* Don't handle prototype PTEs yet -- only kernel demand zero PTEs */ + ASSERT(TempPte.u.Soft.Prototype == 0); ASSERT(TempPte.u.Long == 0); /* Check if this address range belongs to a valid allocation (VAD) */

1 0

[fireball] 49034: [HEAP] - Fix allocated/free memory fillers to match those Windows uses (winetests) - Add missing coalesce-on-free flag check in RtlCreateHeap - Turn on tail check/pattern filling ...
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 17:05:29 2010 New Revision: 49034 URL: http://svn.reactos.org/svn/reactos?rev=49034&view=rev Log: [HEAP] - Fix allocated/free memory fillers to match those Windows uses (winetests) - Add missing coalesce-on-free flag check in RtlCreateHeap - Turn on tail check/pattern filling in RtlAllocateHeap. - Add extra stuff storage support in RtlAllocateHeap and its helpers. - Set win32 statuses where necessary. - Return success in RtlValidateHeap to reduce spam when running winetest. Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Thu Oct 7 17:05:29 2010 @@ -30,8 +30,8 @@ #define HEAP_ENTRY_SHIFT 3 #define HEAP_MAX_BLOCK_SIZE ((0x80000 - PAGE_SIZE) >> HEAP_ENTRY_SHIFT) -#define ARENA_INUSE_FILLER 0x55555555 -#define ARENA_FREE_FILLER 0xaaaaaaaa +#define ARENA_INUSE_FILLER 0xBAADF00D +#define ARENA_FREE_FILLER 0xFEEEFEEE #define HEAP_TAIL_FILL 0xab // from ntifs.h, should go to another header! @@ -261,6 +261,7 @@ HEAP_ENTRY BusyBlock; } HEAP_VIRTUAL_ALLOC_ENTRY, *PHEAP_VIRTUAL_ALLOC_ENTRY; +extern BOOLEAN RtlpPageHeapEnabled; HANDLE NTAPI RtlpSpecialHeapCreate(ULONG Flags, PVOID Addr, @@ -341,6 +342,9 @@ PSIZE_T FreeSize, BOOLEAN Remove); +PHEAP_ENTRY_EXTRA NTAPI +RtlpGetExtraStuffPointer(PHEAP_ENTRY HeapEntry); + /* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -1546,7 +1550,8 @@ Heap = RtlpSpecialHeapCreate(Flags, Addr, TotalSize, CommitSize, Lock, Parameters); if (Heap) return Heap; - ASSERT(FALSE); + //ASSERT(FALSE); + DPRINT1("Enabling page heap failed\n"); } /* Check validation flags */ @@ -1560,11 +1565,17 @@ if (!Parameters) Parameters = &SafeParams; /* Check global flags */ + if (NtGlobalFlags & FLG_HEAP_DISABLE_COALESCING) + Flags |= HEAP_DISABLE_COALESCE_ON_FREE; + if (NtGlobalFlags & FLG_HEAP_ENABLE_FREE_CHECK) Flags |= HEAP_FREE_CHECKING_ENABLED; if (NtGlobalFlags & FLG_HEAP_ENABLE_TAIL_CHECK) Flags |= HEAP_TAIL_CHECKING_ENABLED; + + if (Flags & HEAP_TAIL_CHECKING_ENABLED) + DPRINT1("TailChecking!\n"); if (RtlpGetMode() == UserMode) { @@ -2014,7 +2025,7 @@ if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) { /* Insert it to the free list if it's the last entry */ - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, TRUE); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); Heap->TotalFreeSize += FreeSize; } else @@ -2025,7 +2036,7 @@ if (SplitBlock2->Flags & HEAP_ENTRY_BUSY) { SplitBlock2->PreviousSize = (USHORT)FreeSize; - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, TRUE); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); Heap->TotalFreeSize += FreeSize; } else @@ -2034,7 +2045,7 @@ SplitBlock->Flags = SplitBlock2->Flags; /* Remove that next entry */ - RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, TRUE); + RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, FALSE); /* Update sizes */ FreeSize += SplitBlock2->Size; @@ -2052,7 +2063,7 @@ } /* Actually insert it */ - RtlpInsertFreeBlockHelper( Heap, SplitBlock, (USHORT)FreeSize, TRUE ); + RtlpInsertFreeBlockHelper(Heap, SplitBlock, (USHORT)FreeSize, FALSE); /* Update total size */ Heap->TotalFreeSize += FreeSize; @@ -2094,6 +2105,7 @@ PLIST_ENTRY FreeListHead, Next; PHEAP_FREE_ENTRY FreeBlock; PHEAP_ENTRY InUseEntry; + PHEAP_ENTRY_EXTRA Extra; EXCEPTION_RECORD ExceptionRecord; /* Go through the zero list to find a place where to insert the new entry */ @@ -2130,6 +2142,27 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* Return pointer to the */ return InUseEntry + 1; @@ -2158,13 +2191,34 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* Return pointer to the */ return InUseEntry + 1; } /* Really unfortunate, out of memory condition */ - //STATUS_NO_MEMORY; + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); /* Generate an exception */ if (Flags & HEAP_GENERATE_EXCEPTIONS) @@ -2209,6 +2263,7 @@ EXCEPTION_RECORD ExceptionRecord; BOOLEAN HeapLocked = FALSE; PHEAP_VIRTUAL_ALLOC_ENTRY VirtualBlock = NULL; + PHEAP_ENTRY_EXTRA Extra; NTSTATUS Status; /* Force flags */ @@ -2217,7 +2272,7 @@ /* Check for the maximum size */ if (Size >= 0x80000000) { - // STATUS_NO_MEMORY + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); return FALSE; } @@ -2225,24 +2280,27 @@ HEAP_VALIDATE_ALL_ENABLED | HEAP_VALIDATE_PARAMETERS_ENABLED | HEAP_FLAG_PAGE_ALLOCS | - HEAP_EXTRA_FLAGS_MASK | HEAP_CREATE_ENABLE_TRACING | - HEAP_FREE_CHECKING_ENABLED | - HEAP_TAIL_CHECKING_ENABLED | HEAP_CREATE_ALIGN_16)) { DPRINT1("HEAP: RtlAllocateHeap is called with unsupported flags %x, ignoring\n", Flags); } + if (Flags & HEAP_TAIL_CHECKING_ENABLED) + DPRINT1("TailChecking, Heap %p\n!", Heap); + /* Calculate allocation size and index */ - if (!Size) Size = 1; - AllocationSize = (Size + Heap->AlignRound) & Heap->AlignMask; + if (Size) + AllocationSize = Size; + else + AllocationSize = 1; + AllocationSize = (AllocationSize + Heap->AlignRound) & Heap->AlignMask; Index = AllocationSize >> HEAP_ENTRY_SHIFT; /* Acquire the lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE)) { - RtlEnterHeapLock( Heap->LockVariable ); + RtlEnterHeapLock(Heap->LockVariable); HeapLocked = TRUE; } @@ -2261,7 +2319,7 @@ /* Save flags and remove the free entry */ FreeFlags = FreeBlock->Flags; - RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, TRUE); + RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, FALSE); /* Update the total free size of the heap */ Heap->TotalFreeSize -= Index; @@ -2308,7 +2366,7 @@ FreeBlock = CONTAINING_RECORD(FreeListHead->Blink, HEAP_FREE_ENTRY, FreeList); - RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, TRUE); + RtlpRemoveFreeBlock(Heap, FreeBlock, TRUE, FALSE); /* Split it */ InUseEntry = RtlpSplitEntry(Heap, FreeBlock, AllocationSize, Index, Size); @@ -2320,6 +2378,27 @@ /* Zero memory if that was requested */ if (Flags & HEAP_ZERO_MEMORY) RtlZeroMemory(InUseEntry + 1, Size); + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Fill this block with a special pattern */ + RtlFillMemoryUlong(InUseEntry + 1, Size & ~0x3, ARENA_INUSE_FILLER); + } + + /* Fill tail of the block with a special pattern too if requested */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, sizeof(HEAP_ENTRY), HEAP_TAIL_FILL); + InUseEntry->Flags |= HEAP_ENTRY_FILL_PATTERN; + } + + /* Prepare extra if it's present */ + if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) + { + Extra = RtlpGetExtraStuffPointer(InUseEntry); + RtlZeroMemory(Extra, sizeof(HEAP_ENTRY_EXTRA)); + + // TODO: Tagging + } /* User data starts right after the entry's header */ return InUseEntry + 1; @@ -2377,7 +2456,7 @@ RtlRaiseException(&ExceptionRecord); } - //STATUS_BUFFER_TOO_SMALL; + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_BUFFER_TOO_SMALL); /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); @@ -2431,7 +2510,7 @@ { /* This is an invalid block */ DPRINT1("HEAP: Trying to free an invalid address %p!\n", Ptr); - // FIXME: Set STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); /* Release the heap lock */ if (Locked) RtlLeaveHeapLock(Heap->LockVariable); @@ -2457,7 +2536,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed releasing memory with Status 0x%08X\n", Status); - // TODO: Set this status in user mode + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(Status); } } else @@ -2593,7 +2672,7 @@ /* Return success in case of a null pointer */ if (!Ptr) { - // STATUS_SUCCESS + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_SUCCESS); return NULL; } @@ -2605,7 +2684,7 @@ /* Make sure size is valid */ if (Size >= 0x80000000) { - // STATUS_NO_MEMORY + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); return NULL; } @@ -2635,7 +2714,7 @@ /* If that entry is not really in-use, we have a problem */ if (!(InUseEntry->Flags & HEAP_ENTRY_BUSY)) { - // STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); /* Release the lock and return */ if (HeapLocked) @@ -3086,7 +3165,7 @@ /* Return -1 if that entry is free */ if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) { - // STATUS_INVALID_PARAMETER + RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_INVALID_PARAMETER); return (SIZE_T)-1; } @@ -3131,7 +3210,9 @@ ) { UNIMPLEMENTED; - return FALSE; + + /* Imitate success */ + return TRUE; } VOID

1 0

[fireball] 49033: [NTDLL] - Fix a typo which always set page heap enabled to true.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 16:51:19 2010 New Revision: 49033 URL: http://svn.reactos.org/svn/reactos?rev=49033&view=rev Log: [NTDLL] - Fix a typo which always set page heap enabled to true. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Thu Oct 7 16:51:19 2010 @@ -139,53 +139,53 @@ FLG_USER_STACK_TRACE_DB | FLG_HEAP_ENABLE_TAGGING | FLG_HEAP_ENABLE_TAG_BY_DLL); - } - - /* Get page heap flags without checking return value */ - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapFlags", - REG_DWORD, - (PVOID)&RtlpPageHeapGlobalFlags, - sizeof(RtlpPageHeapGlobalFlags), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapSizeRangeStart", - REG_DWORD, - (PVOID)&RtlpPageHeapSizeRangeStart, - sizeof(RtlpPageHeapSizeRangeStart), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapSizeRangeEnd", - REG_DWORD, - (PVOID)&RtlpPageHeapSizeRangeEnd, - sizeof(RtlpPageHeapSizeRangeEnd), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapDllRangeStart", - REG_DWORD, - (PVOID)&RtlpPageHeapDllRangeStart, - sizeof(RtlpPageHeapDllRangeStart), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapDllRangeEnd", - REG_DWORD, - (PVOID)&RtlpPageHeapDllRangeEnd, - sizeof(RtlpPageHeapDllRangeEnd), - &ValueSize); - - LdrQueryImageFileExecutionOptions(&ImageName, - L"PageHeapTargetDlls", - REG_SZ, - (PVOID)RtlpPageHeapTargetDlls, - sizeof(RtlpPageHeapTargetDlls), - &ValueSize); - - /* Now when all parameters are read, enable page heap */ - RtlpPageHeapEnabled = TRUE; + + /* Get page heap flags without checking return value */ + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapFlags", + REG_DWORD, + (PVOID)&RtlpPageHeapGlobalFlags, + sizeof(RtlpPageHeapGlobalFlags), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeStart, + sizeof(RtlpPageHeapSizeRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapSizeRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapSizeRangeEnd, + sizeof(RtlpPageHeapSizeRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeStart", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeStart, + sizeof(RtlpPageHeapDllRangeStart), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapDllRangeEnd", + REG_DWORD, + (PVOID)&RtlpPageHeapDllRangeEnd, + sizeof(RtlpPageHeapDllRangeEnd), + &ValueSize); + + LdrQueryImageFileExecutionOptions(&ImageName, + L"PageHeapTargetDlls", + REG_SZ, + (PVOID)RtlpPageHeapTargetDlls, + sizeof(RtlpPageHeapTargetDlls), + &ValueSize); + + /* Now when all parameters are read, enable page heap */ + RtlpPageHeapEnabled = TRUE; + } } }

1 0

[khornicek] 49032: Don't deny people their bugchecks. Merge r49031.
by khornicek＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: khornicek Date: Thu Oct 7 14:07:45 2010 New Revision: 49032 URL: http://svn.reactos.org/svn/reactos?rev=49032&view=rev Log: Don't deny people their bugchecks. Merge r49031. Modified: branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c Modified: branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/ntosk… ============================================================================== --- branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Oct 7 14:07:45 2010 @@ -1431,8 +1431,8 @@ IN ULONG_PTR BugCheckParameter4) { /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!(BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010)) + if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && + (BugCheckParameter1 == 0xDEAD0010))) { /* Call the internal API */ KeBugCheckWithTf(BugCheckCode,

1 0

[sir_richard] 49031: [NTOS]: My attempt at making bugchecks a thing of the past has failed, someone has caught the typo. Bugchecks will now happen in ReactOS again instead of being ignored. Maybe y...
by sir_richard＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: sir_richard Date: Thu Oct 7 13:52:42 2010 New Revision: 49031 URL: http://svn.reactos.org/svn/reactos?rev=49031&view=rev Log: [NTOS]: My attempt at making bugchecks a thing of the past has failed, someone has caught the typo. Bugchecks will now happen in ReactOS again instead of being ignored. Maybe you can "forget" to merge this one with the release branch? ;-) Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4903… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Thu Oct 7 13:52:42 2010 @@ -1431,8 +1431,8 @@ IN ULONG_PTR BugCheckParameter4) { /* Workaround for Windows Server 2003 Checked PCI Driver issue */ - if (!(BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && - (BugCheckParameter1 == 0xDEAD0010)) + if (!((BugCheckCode == PCI_BUS_DRIVER_INTERNAL) && + (BugCheckParameter1 == 0xDEAD0010))) { /* Call the internal API */ KeBugCheckWithTf(BugCheckCode,

1 0

[jgardou] 49030: [CMAKE] - add missing file to mingw_common
by jgardou＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: jgardou Date: Thu Oct 7 11:47:29 2010 New Revision: 49030 URL: http://svn.reactos.org/svn/reactos?rev=49030&view=rev Log: [CMAKE] - add missing file to mingw_common Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Thu Oct 7 11:47:29 2010 @@ -7,7 +7,7 @@ add_definitions(-Wno-main) endif(NOT MSVC) -set(MINGW_COMMON_SOURCE +list(APPEND MINGW_COMMON_SOURCE _newmode.c atonexit.c binmode.c @@ -27,6 +27,7 @@ pseudo-reloc.c pseudo-reloc-list.c tlsmcrt.c + tlsmthread.c tlssup.c tlsthrd.c txtmode.c @@ -40,7 +41,8 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE}) if(NOT MSVC) -target_link_libraries(mingw_common oldnames -lkernel32 -lntdll) + target_link_libraries(mingw_common oldnames) + add_importlibs(mingw_common kernel32 ntdll) endif(NOT MSVC) set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)

1 0

[fireball] 49029: [WIN32K] - Roel Messiant: Return correct address in the user heap commit routine. Should fix boot with the new heap manager.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 07:56:26 2010 New Revision: 49029 URL: http://svn.reactos.org/svn/reactos?rev=49029&view=rev Log: [WIN32K] - Roel Messiant: Return correct address in the user heap commit routine. Should fix boot with the new heap manager. Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c Modified: trunk/reactos/subsystems/win32/win32k/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/usrheap.c [iso-8859-1] Thu Oct 7 07:56:26 2010 @@ -32,7 +32,8 @@ PW32HEAP_USER_MAPPING Mapping; PVOID UserBase = NULL; NTSTATUS Status; - SIZE_T Delta = (SIZE_T)((ULONG_PTR)(*CommitAddress) - (ULONG_PTR)Base); + SIZE_T Delta; + PVOID UserCommitAddress; W32Process = PsGetCurrentProcessWin32Process(); @@ -79,18 +80,23 @@ return Status; } - /* commit! */ - UserBase = (PVOID)((ULONG_PTR)UserBase + Delta); - + /* Apply the commit address offset to the user base address */ + Delta = (SIZE_T) ((ULONG_PTR) (*CommitAddress) - (ULONG_PTR) (Base)); + UserCommitAddress = (PVOID) ((ULONG_PTR) (UserBase) + Delta); + + /* Perform the actual commit */ Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &UserBase, + &UserCommitAddress, 0, CommitSize, MEM_COMMIT, PAGE_EXECUTE_READ); + if (NT_SUCCESS(Status)) { - *CommitAddress = (PVOID)((ULONG_PTR)UserBase + Delta); + /* Determine the address to return */ + Delta = (SIZE_T) ((ULONG_PTR) (UserCommitAddress) - (ULONG_PTR) (UserBase)); + *CommitAddress = (PVOID) ((ULONG_PTR) (Base) + Delta); } if (W32Process == NULL)

1 0

[fireball] 49028: [ADVAPI32] - Roel Messiant: Properly handle STATUS_BUFFER_TOO_SMALL in RegEnumValueW implementation. See issue #2492 for more details.
by fireball＠svn.reactos.org 07 Oct '10

07 Oct '10

Author: fireball Date: Thu Oct 7 07:21:08 2010 New Revision: 49028 URL: http://svn.reactos.org/svn/reactos?rev=49028&view=rev Log: [ADVAPI32] - Roel Messiant: Properly handle STATUS_BUFFER_TOO_SMALL in RegEnumValueW implementation. See issue #2492 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Oct 7 07:21:08 2010 @@ -2928,12 +2928,12 @@ status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + if (status && (status != STATUS_BUFFER_OVERFLOW) && (status != STATUS_BUFFER_TOO_SMALL)) goto done; if (value || data) { /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) + while ((status == STATUS_BUFFER_OVERFLOW) || (status == STATUS_BUFFER_TOO_SMALL)) { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size )))

1 0

[mkupfer] 49027: Carlo Bramini <carlo DOT bramix AT libero DOT it> - Fix for render status bar after changing line wrap and flicker issue. - See issue #5635 for details.
by mkupfer＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: mkupfer Date: Wed Oct 6 22:11:12 2010 New Revision: 49027 URL: http://svn.reactos.org/svn/reactos?rev=49027&view=rev Log: Carlo Bramini <carlo DOT bramix AT libero DOT it> - Fix for render status bar after changing line wrap and flicker issue. - See issue #5635 for details. Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -687,53 +687,177 @@ SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); } -VOID DIALOG_EditWrap(VOID) -{ - static const TCHAR edit[] = _T("edit"); - DWORD dwStyle; - RECT rc, rcstatus; - DWORD size; +VOID DoCreateStatusBar(VOID) +{ + RECT rc; + RECT rcstatus; + BOOL bStatusBarVisible; + + // Check if status bar object already exists. + if (Globals.hStatusBar == NULL) + { + // Try to create the status bar + Globals.hStatusBar = CreateStatusWindow( + WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, + NULL, + Globals.hMainWnd, + CMD_STATUSBAR_WND_ID); + + if (Globals.hStatusBar == NULL) + { + ShowLastError(); + return; + } + + // Load the string for formatting column/row text output + LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); + + // Set the status bar for single-text output + SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); + } + + // Set status bar visible or not accordind the the settings. + if (Globals.bWrapLongLines == TRUE || + Globals.bShowStatusBar == FALSE) + { + bStatusBarVisible = FALSE; + ShowWindow(Globals.hStatusBar, SW_HIDE); + } + else + { + bStatusBarVisible = TRUE; + ShowWindow(Globals.hStatusBar, SW_SHOW); + SendMessage(Globals.hStatusBar, WM_SIZE, 0, 0); + } + + // Set check state in show status bar item. + if (Globals.bShowStatusBar == TRUE) + { + CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); + } + else + { + CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_UNCHECKED); + } + + // Update menu mar with the previous changes + DrawMenuBar(Globals.hMainWnd); + + // Sefety test is edit control exists + if (Globals.hEdit != NULL) + { + // Retrieve the sizes of the controls + GetClientRect(Globals.hMainWnd, &rc); + GetClientRect(Globals.hStatusBar, &rcstatus); + + // If status bar is currently visible, update dimensions of edir control + if (bStatusBarVisible) + rc.bottom -= (rcstatus.bottom - rcstatus.top); + + // Resize edit control to right size. + MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); + } + + // Update content with current row/column text + DIALOG_StatusBarUpdateCaretPos(); +} + +VOID DoCreateEditWindow(VOID) +{ + DWORD dwStyle; + int iSize; LPTSTR pTemp; - TCHAR buff[MAX_PATH]; - - Globals.bWrapLongLines = !Globals.bWrapLongLines; - - size = GetWindowTextLength(Globals.hEdit) + 1; - pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!pTemp) + + iSize = 0; + + // If the edit control already exists, try to save its content + if (Globals.hEdit != NULL) + { + // number of chars currently written into the editor. + iSize = GetWindowTextLength(Globals.hEdit); + + if (iSize) + { + // Allocates temporary buffer. + pTemp = HeapAlloc(GetProcessHeap(), 0, (iSize + 1) * sizeof(TCHAR)); + + if (!pTemp) + { + ShowLastError(); + return; + } + + // Recover the text into the control. + GetWindowText(Globals.hEdit, pTemp, iSize + 1); + } + + // Restore original window procedure + SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)Globals.EditProc); + + // Destroy the edit control + DestroyWindow(Globals.hEdit); + } + + // Update wrap status into the main menu and recover style flags + if (Globals.bWrapLongLines) + { + dwStyle = EDIT_STYLE_WRAP; + EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); + } else { + dwStyle = EDIT_STYLE; + EnableMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_ENABLED); + } + + // Update previous changes + DrawMenuBar(Globals.hMainWnd); + + // Create the new edit control + Globals.hEdit = CreateWindowEx( + WS_EX_CLIENTEDGE, + EDIT_CLASS, + NULL, + dwStyle, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + Globals.hMainWnd, + NULL, + Globals.hInstance, + NULL); + + if (Globals.hEdit == NULL) { ShowLastError(); return; } - GetWindowText(Globals.hEdit, pTemp, size); - DestroyWindow(Globals.hEdit); - GetClientRect(Globals.hMainWnd, &rc); - dwStyle = Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE; - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, - MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); - if ( Globals.hStatusBar ) - { - if ( Globals.bWrapLongLines ) - ShowWindow(Globals.hStatusBar, SW_HIDE); - else if ( Globals.bShowStatusBar ) - { - GetClientRect(Globals.hStatusBar, &rcstatus); - rc.bottom -= (rcstatus.bottom - rcstatus.top); - ShowWindow(Globals.hStatusBar, SW_SHOW); - } - } - Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, edit, NULL, dwStyle, - 0, 0, rc.right, rc.bottom, Globals.hMainWnd, - NULL, Globals.hInstance, NULL); + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); - SetWindowText(Globals.hEdit, pTemp); + + // If some text was previously saved, restore it. + if (iSize != 0) + { + SetWindowText(Globals.hEdit, pTemp); + HeapFree(GetProcessHeap(), 0, pTemp); + } + + // Sub-class a new window callback for row/column detection. + Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); + + // Create/update status bar + DoCreateStatusBar(); + + // Finally shows new edit control and set focus into it. + ShowWindow(Globals.hEdit, SW_SHOW); SetFocus(Globals.hEdit); - Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - _stprintf(buff, Globals.szStatusBarLineCol, 1, 1); - SendMessage(Globals.hStatusBar, SB_SETTEXT, SB_SIMPLEID, (LPARAM)buff); - HeapFree(GetProcessHeap(), 0, pTemp); - DrawMenuBar(Globals.hMainWnd); +} + +VOID DIALOG_EditWrap(VOID) +{ + Globals.bWrapLongLines = !Globals.bWrapLongLines; + + DoCreateEditWindow(); } VOID DIALOG_SelectFont(VOID) @@ -887,27 +1011,9 @@ VOID DIALOG_ViewStatusBar(VOID) { - RECT rc; - RECT rcstatus; - - Globals.bShowStatusBar = !Globals.bShowStatusBar; - if ( !Globals.hStatusBar ) - { - Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID ); - LoadString(Globals.hInstance, STRING_LINE_COLUMN, Globals.szStatusBarLineCol, MAX_PATH-1); - SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); - } - CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, - MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); - DrawMenuBar(Globals.hMainWnd); - GetClientRect(Globals.hMainWnd, &rc); - GetClientRect(Globals.hStatusBar, &rcstatus); - if ( Globals.bShowStatusBar ) - rc.bottom -= (rcstatus.bottom - rcstatus.top); - - MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); - ShowWindow(Globals.hStatusBar, Globals.bShowStatusBar); - DIALOG_StatusBarUpdateCaretPos(); + Globals.bShowStatusBar = !Globals.bShowStatusBar; + + DoCreateStatusBar(); } VOID DIALOG_HelpContents(VOID) Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.h [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -63,3 +63,5 @@ BOOL HasFileExtension(LPCTSTR szFilename); BOOL DoCloseFile(void); void DoOpenFile(LPCTSTR szFileName); +VOID DoCreateStatusBar(VOID); +VOID DoCreateEditWindow(VOID); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.c [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -29,9 +29,9 @@ VOID NOTEPAD_EnableSearchMenu() { - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH, + EnableMenuItem(Globals.hMenu, CMD_SEARCH, MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); - EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_SEARCH_NEXT, + EnableMenuItem(Globals.hMenu, CMD_SEARCH_NEXT, MF_BYCOMMAND | ((GetWindowTextLength(Globals.hEdit) == 0) ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); } @@ -334,23 +334,8 @@ switch (msg) { case WM_CREATE: - { - static const TCHAR edit[] = _T("edit"); - RECT rc; - GetClientRect(hWnd, &rc); - Globals.hEdit = CreateWindowEx(EDIT_EXSTYLE, edit, NULL, Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE, - 0, 0, rc.right, rc.bottom, hWnd, - NULL, Globals.hInstance, NULL); - if (!Globals.hEdit) - return -1; - SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); - if (Globals.hFont) - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); - - Globals.EditProc = (WNDPROC) SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)EDIT_WndProc); - - break; - } + Globals.hMenu = GetMenu(hWnd); + break; case WM_COMMAND: if (HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == EN_HSCROLL || HIWORD(wParam) == EN_VSCROLL) @@ -386,7 +371,8 @@ case WM_SIZE: { - if (Globals.bShowStatusBar) + if (Globals.bShowStatusBar == TRUE && + Globals.bWrapLongLines == FALSE) { RECT rcStatusBar; HDWP hdwp; @@ -412,6 +398,12 @@ break; } + + // The entire client area is covered by edit control and by + // the status bar. So there is no need to erase main background. + // This resolves the horrible fliker effect during windows resizes. + case WM_ERASEBKGND: + return 1; case WM_SETFOCUS: SetFocus(Globals.hEdit); @@ -613,6 +605,8 @@ ExitProcess(1); } + DoCreateEditWindow(); + NOTEPAD_InitData(); DIALOG_FileNew(); Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/main.h [iso-8859-1] Wed Oct 6 22:11:12 2010 @@ -23,10 +23,11 @@ #include "notepad_res.h" -#define EDIT_STYLE_WRAP (WS_CHILD | WS_VISIBLE | WS_VSCROLL \ +#define EDIT_STYLE_WRAP (WS_CHILD | WS_VSCROLL \ | ES_AUTOVSCROLL | ES_MULTILINE | ES_NOHIDESEL) #define EDIT_STYLE (EDIT_STYLE_WRAP | WS_HSCROLL | ES_AUTOHSCROLL) -#define EDIT_EXSTYLE (WS_EX_CLIENTEDGE) + +#define EDIT_CLASS _T("EDIT") #define MAX_STRING_LEN 255 @@ -47,6 +48,7 @@ HWND hEdit; HWND hStatusBar; HFONT hFont; /* Font used by the edit control */ + HMENU hMenu; LOGFONT lfFont; BOOL bWrapLongLines; BOOL bShowStatusBar;

1 0

[ekohl] 49026: [RTL] Change RtlLockBootStatusData prototype according to http://cookp.com/%2F/thread/1111206/how%20can%20i%20detect%20last%20boot%20success
by ekohl＠svn.reactos.org 06 Oct '10

06 Oct '10

Author: ekohl Date: Wed Oct 6 20:43:51 2010 New Revision: 49026 URL: http://svn.reactos.org/svn/reactos?rev=49026&view=rev Log: [RTL] Change RtlLockBootStatusData prototype according to http://cookp.com/%2F/thread/1111206/how%20can%20i%20detect%20last%20boot%20… Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/bootdata.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Oct 6 20:43:51 2010 @@ -3496,14 +3496,14 @@ NTSTATUS NTAPI RtlLockBootStatusData( - HANDLE FileHandle + OUT PHANDLE FileHandle ); NTSYSAPI NTSTATUS NTAPI RtlUnlockBootStatusData( - HANDLE FileHandle + IN HANDLE FileHandle ); #endif Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=490… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Wed Oct 6 20:43:51 2010 @@ -707,7 +707,7 @@ NTSTATUS NTAPI RtlLockBootStatusData( - HANDLE Filehandle + OUT PHANDLE Filehandle ) { UNIMPLEMENTED; @@ -720,7 +720,7 @@ NTSTATUS NTAPI RtlUnlockBootStatusData( - HANDLE Filehandle + IN HANDLE Filehandle ) { UNIMPLEMENTED;

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2010