Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[tfaber] 61100: [POWRPROF] - Fix a warning

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 26 15:00:06 2013 New Revision: 61100 URL: http://svn.reactos.org/svn/reactos?rev=61100&view=rev Log: [POWRPROF] - Fix a warning Modified: trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Tue Nov 26 15:00:06 2013 @@ -920,8 +920,8 @@ return FALSE; } //Lohnegrim: The BroadcastCapacityResolution presents the Powerlevel in Percent, if invalid set th 100 == FULL - if ((pGPP->mach.BroadcastCapacityResolution < 0) || (pGPP->mach.BroadcastCapacityResolution > 100)) - pGPP->mach.BroadcastCapacityResolution=100; + if (pGPP->mach.BroadcastCapacityResolution > 100) + pGPP->mach.BroadcastCapacityResolution = 100; //Lohnegrim: I have no idear, if they are realy needed, or if they are spezific for my System, or what they mean, so i removed them //pGPP->user.DischargePolicy[1].PowerPolicy.EventCode = pGPP->user.DischargePolicy[1].PowerPolicy.EventCode | 0x010000;

10 years, 9 months

[tfaber] 61099: [KMTESTS:RTL] - Fix a warning

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 26 14:26:31 2013 New Revision: 61099 URL: http://svn.reactos.org/svn/reactos?rev=61099&view=rev Log: [KMTESTS:RTL] - Fix a warning Modified: trunk/rostests/kmtests/rtl/RtlRegistry.c Modified: trunk/rostests/kmtests/rtl/RtlRegistry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlRegistry.c… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] Tue Nov 26 14:26:31 2013 @@ -122,7 +122,8 @@ #define DO_QUERY(ExpectedArray, ExpectedCount) do \ { \ ULONG _i; \ - for (_i = 0; _i < (ExpectedCount); _i++) \ + ULONG _ExpectedCount = (ExpectedCount); \ + for (_i = 0; _i < _ExpectedCount; _i++) \ { \ Expected.Values[_i].ValueName = ValueName.Buffer; \ Expected.Values[_i].ValueType = REG_SZ; \ @@ -130,8 +131,8 @@ Expected.Values[_i].ValueLength = (ExpectedArray)[_i].Len; \ } \ Expected.CurrentIndex = 0; \ - Expected.Count = (ExpectedCount); \ - if ((ExpectedCount) == 1) \ + Expected.Count = _ExpectedCount; \ + if (_ExpectedCount == 1) \ QueryTable[0].EntryContext = &Expected.Values[0]; \ else \ QueryTable[0].EntryContext = NULL; \

10 years, 9 months

[tfaber] 61098: [NTOS] - FORCEINLINE belongs before the return type (-Wold-style-declaration)

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Nov 26 13:45:33 2013 New Revision: 61098 URL: http://svn.reactos.org/svn/reactos?rev=61098&view=rev Log: [NTOS] - FORCEINLINE belongs before the return type (-Wold-style-declaration) Modified: trunk/reactos/lib/rtl/avlsupp.c trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/time.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/miavl.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=6109… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -27,8 +27,8 @@ /* FUNCTIONS ******************************************************************/ +FORCEINLINE TABLE_SEARCH_RESULT -FORCEINLINE RtlpFindAvlTableNodeOrParent(IN PRTL_AVL_TABLE Table, IN PVOID Buffer, OUT PRTL_BALANCED_LINKS *NodeOrParent) @@ -94,8 +94,8 @@ } } +FORCEINLINE VOID -FORCEINLINE RtlPromoteAvlTreeNode(IN PRTL_BALANCED_LINKS Node) { PRTL_BALANCED_LINKS ParentNode, SuperParentNode; @@ -122,8 +122,8 @@ RtlSetParent(Node, SuperParentNode); } +FORCEINLINE BOOLEAN -FORCEINLINE RtlpRebalanceAvlTreeNode(IN PRTL_BALANCED_LINKS Node) { PRTL_BALANCED_LINKS ChildNode, SubChildNode; @@ -203,8 +203,8 @@ return TRUE; } +FORCEINLINE VOID -FORCEINLINE RtlpInsertAvlTreeNode(IN PRTL_AVL_TABLE Table, IN PRTL_BALANCED_LINKS NewNode, IN OUT PVOID NodeOrParent, @@ -290,8 +290,8 @@ } } +FORCEINLINE VOID -FORCEINLINE RtlpDeleteAvlTreeNode(IN PRTL_AVL_TABLE Table, IN PRTL_BALANCED_LINKS Node) { Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -83,8 +83,8 @@ return NULL; } -VOID FORCEINLINE +VOID FsRtlNotifyAcquireFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync) { ULONG_PTR CurrentThread = (ULONG_PTR)KeGetCurrentThread(); @@ -233,8 +233,8 @@ } } -VOID FORCEINLINE +VOID FsRtlNotifyReleaseFastMutex(IN PREAL_NOTIFY_SYNC RealNotifySync) { RealNotifySync->OwnerCount--; Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -553,8 +553,8 @@ // // Returns a thread's FPU save area // +FORCEINLINE PFX_SAVE_AREA -FORCEINLINE KiGetThreadNpxArea(IN PKTHREAD Thread) { return (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); @@ -614,9 +614,9 @@ // // Exception with no arguments // -VOID FORCEINLINE DECLSPEC_NORETURN +VOID KiDispatchException0Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN PKTRAP_FRAME TrapFrame) @@ -628,9 +628,9 @@ // // Exception with one argument // -VOID FORCEINLINE DECLSPEC_NORETURN +VOID KiDispatchException1Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, @@ -643,9 +643,9 @@ // // Exception with two arguments // -VOID FORCEINLINE DECLSPEC_NORETURN +VOID KiDispatchException2Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, @@ -676,8 +676,8 @@ * */ #ifdef __GNUC__ +FORCEINLINE NTSTATUS -FORCEINLINE KiSystemCallTrampoline(IN PVOID Handler, IN PVOID Arguments, IN ULONG StackBytes) @@ -702,8 +702,8 @@ return Result; } #elif defined(_MSC_VER) +FORCEINLINE NTSTATUS -FORCEINLINE KiSystemCallTrampoline(IN PVOID Handler, IN PVOID Arguments, IN ULONG StackBytes) @@ -729,8 +729,8 @@ // // Checks for pending APCs // -VOID -FORCEINLINE +FORCEINLINE +VOID KiCheckForApcDelivery(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -767,8 +767,8 @@ // Converts a base thread to a GUI thread // #ifdef __GNUC__ +FORCEINLINE NTSTATUS -FORCEINLINE KiConvertToGuiThread(VOID) { NTSTATUS Result; @@ -814,8 +814,8 @@ // // Switches from boot loader to initial kernel stack // -VOID -FORCEINLINE +FORCEINLINE +VOID KiSwitchToBootStack(IN ULONG_PTR InitialStack) { /* We have to switch to a new stack before continuing kernel initialization */ @@ -849,9 +849,9 @@ // // Emits the iret instruction for C code // +FORCEINLINE DECLSPEC_NORETURN VOID -FORCEINLINE KiIret(VOID) { #if defined(__GNUC__) @@ -874,8 +874,8 @@ // Normally this is done by the HAL, but on x86 as an optimization, the kernel // initiates the end by calling back into the HAL and exiting the trap here. // -VOID -FORCEINLINE +FORCEINLINE +VOID KiEndInterrupt(IN KIRQL Irql, IN PKTRAP_FRAME TrapFrame) { @@ -890,8 +890,8 @@ // // PERF Code // -VOID -FORCEINLINE +FORCEINLINE +VOID Ki386PerfEnd(VOID) { extern ULONGLONG BootCyclesEnd, BootCycles; Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -19,8 +19,8 @@ // // Helper Code // +FORCEINLINE BOOLEAN -FORCEINLINE KiUserTrap(IN PKTRAP_FRAME TrapFrame) { /* Anything else but Ring 0 is Ring 3 */ @@ -30,8 +30,8 @@ // // Debug Macros // -VOID -FORCEINLINE +FORCEINLINE +VOID KiDumpTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* Dump the whole thing */ @@ -100,8 +100,8 @@ extern BOOLEAN StopChecking; -VOID -FORCEINLINE +FORCEINLINE +VOID KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame, IN BOOLEAN SkipPreviousMode) { @@ -180,8 +180,8 @@ StopChecking = FALSE; } -VOID -FORCEINLINE +FORCEINLINE +VOID KiExitSystemCallDebugChecks(IN ULONG SystemCall, IN PKTRAP_FRAME TrapFrame) { @@ -248,8 +248,8 @@ // // Save user mode debug registers and restore kernel values // -VOID -FORCEINLINE +FORCEINLINE +VOID KiHandleDebugRegistersOnTrapEntry( IN PKTRAP_FRAME TrapFrame) { @@ -275,8 +275,8 @@ __writedr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); } -VOID -FORCEINLINE +FORCEINLINE +VOID KiHandleDebugRegistersOnTrapExit( PKTRAP_FRAME TrapFrame) { @@ -295,9 +295,9 @@ // // Virtual 8086 Mode Optimized Trap Exit // -VOID FORCEINLINE DECLSPEC_NORETURN +VOID KiExitV86Trap(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -342,8 +342,8 @@ // // Virtual 8086 Mode Optimized Trap Entry // -VOID -FORCEINLINE +FORCEINLINE +VOID KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame) { /* Save exception list */ @@ -361,8 +361,8 @@ // // Interrupt Trap Entry // -VOID -FORCEINLINE +FORCEINLINE +VOID KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { /* Save exception list and terminate it */ @@ -391,8 +391,8 @@ // // Generic Trap Entry // -VOID -FORCEINLINE +FORCEINLINE +VOID KiEnterTrap(IN PKTRAP_FRAME TrapFrame) { /* Save exception list */ Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -852,8 +852,8 @@ return STATUS_WAIT_0; } +FORCEINLINE ULONG -FORCEINLINE KiComputeTimerTableIndex(IN ULONGLONG DueTime) { return (DueTime / KeMaximumIncrement) & (TIMER_TABLE_SIZE - 1); Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -24,8 +24,8 @@ ULONG SidStart; } KNOWN_COMPOUND_ACE, *PKNOWN_COMPOUND_ACE; +FORCEINLINE PSID -FORCEINLINE SepGetGroupFromDescriptor(PVOID _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; @@ -43,8 +43,8 @@ } } +FORCEINLINE PSID -FORCEINLINE SepGetOwnerFromDescriptor(PVOID _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; @@ -62,8 +62,8 @@ } } +FORCEINLINE PACL -FORCEINLINE SepGetDaclFromDescriptor(PVOID _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; @@ -83,8 +83,8 @@ } } +FORCEINLINE PACL -FORCEINLINE SepGetSaclFromDescriptor(PVOID _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -277,8 +277,8 @@ /* * @implemented */ +FORCEINLINE VOID -FORCEINLINE IopNotifyFileSystemChange(IN PDEVICE_OBJECT DeviceObject, IN BOOLEAN DriverActive) { Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -129,9 +129,9 @@ KeRegisterInterruptHandler(Interrupt->Vector, Handler); } -VOID FORCEINLINE DECLSPEC_NORETURN +VOID KiExitInterrupt(IN PKTRAP_FRAME TrapFrame, IN KIRQL OldIrql, IN BOOLEAN Spurious) 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] Tue Nov 26 13:45:33 2013 @@ -57,8 +57,8 @@ /* TRAP EXIT CODE *************************************************************/ +FORCEINLINE BOOLEAN -FORCEINLINE KiVdmTrap(IN PKTRAP_FRAME TrapFrame) { /* Either the V8086 flag is on, or this is user-mode with a VDM */ @@ -66,16 +66,16 @@ ((KiUserTrap(TrapFrame)) && (PsGetCurrentProcess()->VdmObjects))); } +FORCEINLINE BOOLEAN -FORCEINLINE KiV86Trap(IN PKTRAP_FRAME TrapFrame) { /* Check if the V8086 flag is on */ return ((TrapFrame->EFlags & EFLAGS_V86_MASK) != 0); } +FORCEINLINE BOOLEAN -FORCEINLINE KiIsFrameEdited(IN PKTRAP_FRAME TrapFrame) { /* An edited frame changes esp. It is marked by clearing the bits @@ -83,8 +83,8 @@ return ((TrapFrame->SegCs & FRAME_EDITED) == 0); } -VOID FORCEINLINE +VOID KiCommonExit(IN PKTRAP_FRAME TrapFrame, BOOLEAN SkipPreviousMode) { /* Disable interrupts until we return */ @@ -1521,9 +1521,9 @@ return Result; } -DECLSPEC_NORETURN -VOID FORCEINLINE +DECLSPEC_NORETURN +VOID KiSystemCall(IN PKTRAP_FRAME TrapFrame, IN PVOID Arguments) { Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=610… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -20,8 +20,8 @@ /* FUNCTIONS ******************************************************************/ -VOID FORCEINLINE +VOID KiWriteSystemTime(volatile KSYSTEM_TIME *SystemTime, ULARGE_INTEGER NewTime) { #ifdef _WIN64 @@ -35,8 +35,8 @@ #endif } -VOID FORCEINLINE +VOID KiCheckForTimerExpiration( PKPRCB Prcb, PKTRAP_FRAME TrapFrame, Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -731,8 +731,8 @@ extern LARGE_INTEGER MmCriticalSectionTimeout; extern LIST_ENTRY MmWorkingSetExpansionHead; +FORCEINLINE BOOLEAN -FORCEINLINE MiIsMemoryTypeFree(TYPE_OF_MEMORY MemoryType) { return ((MemoryType == LoaderFree) || @@ -741,8 +741,8 @@ (MemoryType == LoaderOsloaderStack)); } +FORCEINLINE BOOLEAN -FORCEINLINE MiIsMemoryTypeInvisible(TYPE_OF_MEMORY MemoryType) { return ((MemoryType == LoaderFirmwarePermanent) || @@ -752,44 +752,44 @@ } #ifdef _M_AMD64 +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPxe(PVOID Address) { return ((ULONG_PTR)Address >> 7) == 0x1FFFFEDF6FB7DA0ULL; } +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPpe(PVOID Address) { return ((ULONG_PTR)Address >> 16) == 0xFFFFF6FB7DA0ULL; } +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPde(PVOID Address) { return ((ULONG_PTR)Address >> 25) == 0x7FFFFB7DA0ULL; } +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPte(PVOID Address) { return ((ULONG_PTR)Address >> 34) == 0x3FFFFDA0ULL; } #else +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPde(PVOID Address) { return ((Address >= (PVOID)MiAddressToPde(NULL)) && (Address <= (PVOID)MiHighestUserPde)); } +FORCEINLINE BOOLEAN -FORCEINLINE MiIsUserPte(PVOID Address) { return (Address <= (PVOID)MiHighestUserPte); @@ -799,8 +799,8 @@ // // Figures out the hardware bits for a PTE // +FORCEINLINE ULONG_PTR -FORCEINLINE MiDetermineUserGlobalPteMask(IN PVOID PointerPte) { MMPTE TempPte; @@ -991,8 +991,8 @@ // // Writes a valid PTE // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_WRITE_VALID_PTE(IN PMMPTE PointerPte, IN MMPTE TempPte) { @@ -1005,8 +1005,8 @@ // // Writes an invalid PTE // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_WRITE_INVALID_PTE(IN PMMPTE PointerPte, IN MMPTE InvalidPte) { @@ -1018,8 +1018,8 @@ // // Writes a valid PDE // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_WRITE_VALID_PDE(IN PMMPDE PointerPde, IN MMPDE TempPde) { @@ -1032,8 +1032,8 @@ // // Writes an invalid PDE // -VOID -FORCEINLINE +FORCEINLINE +VOID MI_WRITE_INVALID_PDE(IN PMMPDE PointerPde, IN MMPDE InvalidPde) { @@ -1082,8 +1082,8 @@ // // New ARM3<->RosMM PAGE Architecture // +FORCEINLINE BOOLEAN -FORCEINLINE MiIsRosSectionObject(IN PVOID Section) { PROS_SECTION_OBJECT RosSection = Section; @@ -2294,8 +2294,8 @@ // then we'd like to have our own code to grab a free page and zero it out, by // using MiRemoveAnyPage. This macro implements this. // +FORCEINLINE PFN_NUMBER -FORCEINLINE MiRemoveZeroPageSafe(IN ULONG Color) { if (MmFreePagesByColor[ZeroedPageList][Color].Flink != LIST_HEAD) return MiRemoveZeroPage(Color); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miavl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miavl.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -28,8 +28,8 @@ #define PRTL_BALANCED_LINKS PMMADDRESS_NODE #define MI_ASSERT(x) ASSERT(x) +FORCEINLINE VOID -FORCEINLINE RtlpCopyAvlNodeData(IN PRTL_BALANCED_LINKS Node1, IN PRTL_BALANCED_LINKS Node2) { @@ -38,8 +38,8 @@ Node1->RightChild = Node2->RightChild; } +FORCEINLINE RTL_GENERIC_COMPARE_RESULTS -FORCEINLINE RtlpAvlCompareRoutine(IN PRTL_AVL_TABLE Table, IN PVOID Buffer, IN PVOID UserData) @@ -60,73 +60,73 @@ } } +FORCEINLINE VOID -FORCEINLINE RtlSetParent(IN PRTL_BALANCED_LINKS Node, IN PRTL_BALANCED_LINKS Parent) { Node->u1.Parent = (PRTL_BALANCED_LINKS)((ULONG_PTR)Parent | (Node->u1.Balance & 0x3)); } +FORCEINLINE VOID -FORCEINLINE RtlSetBalance(IN PRTL_BALANCED_LINKS Node, IN SCHAR Balance) { Node->u1.Balance = Balance; } +FORCEINLINE SCHAR -FORCEINLINE RtlBalance(IN PRTL_BALANCED_LINKS Node) { return (SCHAR)Node->u1.Balance; } +FORCEINLINE PRTL_BALANCED_LINKS -FORCEINLINE RtlParentAvl(IN PRTL_BALANCED_LINKS Node) { return (PRTL_BALANCED_LINKS)((ULONG_PTR)Node->u1.Parent & ~3); } +FORCEINLINE BOOLEAN -FORCEINLINE RtlIsRootAvl(IN PRTL_BALANCED_LINKS Node) { return (RtlParentAvl(Node) == Node); } +FORCEINLINE PRTL_BALANCED_LINKS -FORCEINLINE RtlRightChildAvl(IN PRTL_BALANCED_LINKS Node) { return Node->RightChild; } +FORCEINLINE PRTL_BALANCED_LINKS -FORCEINLINE RtlLeftChildAvl(IN PRTL_BALANCED_LINKS Node) { return Node->LeftChild; } +FORCEINLINE BOOLEAN -FORCEINLINE RtlIsLeftChildAvl(IN PRTL_BALANCED_LINKS Node) { return (RtlLeftChildAvl(RtlParentAvl(Node)) == Node); } +FORCEINLINE BOOLEAN -FORCEINLINE RtlIsRightChildAvl(IN PRTL_BALANCED_LINKS Node) { return (RtlRightChildAvl(RtlParentAvl(Node)) == Node); } +FORCEINLINE VOID -FORCEINLINE RtlInsertAsLeftChildAvl(IN PRTL_BALANCED_LINKS Parent, IN PRTL_BALANCED_LINKS Node) { @@ -134,8 +134,8 @@ RtlSetParent(Node, Parent); } +FORCEINLINE VOID -FORCEINLINE RtlInsertAsRightChildAvl(IN PRTL_BALANCED_LINKS Parent, IN PRTL_BALANCED_LINKS Node) { 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] Tue Nov 26 13:45:33 2013 @@ -311,8 +311,8 @@ } #if (_MI_PAGING_LEVELS == 2) +FORCEINLINE BOOLEAN -FORCEINLINE MiSynchronizeSystemPde(PMMPDE PointerPde) { MMPDE SystemPde; Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -98,8 +98,8 @@ return UnprotectedPages ? TRUE : FALSE; } +FORCEINLINE VOID -FORCEINLINE MiProtectedPoolUnProtectLinks(IN PLIST_ENTRY Links, OUT PVOID* PoolFlink, OUT PVOID* PoolBlink) @@ -133,8 +133,8 @@ } } +FORCEINLINE VOID -FORCEINLINE MiProtectedPoolProtectLinks(IN PVOID PoolFlink, IN PVOID PoolBlink) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -56,8 +56,8 @@ // being released, which is then inserted in front of the recorded cluster. // +FORCEINLINE ULONG -FORCEINLINE MI_GET_CLUSTER_SIZE(IN PMMPTE Pte) { // Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Nov 26 13:45:33 2013 @@ -199,8 +199,8 @@ } /* Taken from ARM3/pagfault.c */ +FORCEINLINE BOOLEAN -FORCEINLINE MiSynchronizeSystemPde(PMMPDE PointerPde) { MMPDE SystemPde;

10 years, 9 months

[tfaber] 61096: [CMAKE] - Enable -Wtype-limits in GCC builds

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Nov 25 12:30:03 2013 New Revision: 61096 URL: http://svn.reactos.org/svn/reactos?rev=61096&view=rev Log: [CMAKE] - Enable -Wtype-limits in GCC builds Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=61096&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Nov 25 12:30:03 2013 @@ -65,6 +65,7 @@ add_compile_flags("-Werror -Wall -Wpointer-arith") add_compile_flags("-Wno-char-subscripts -Wno-multichar -Wno-unused-value -Wno-maybe-uninitialized") add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=narrowing") +add_compile_flags("-Wtype-limits -Wno-error=type-limits") if(ARCH STREQUAL "amd64") add_compile_flags("-Wno-format")

10 years, 9 months

[tkreuzer] 61095: [NTOSKRNL] Windows / ReactOS uses a software protection field called protection mask, which is stored inside invalid (Software) PTEs to provide information about the desired prote...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Nov 25 00:18:33 2013 New Revision: 61095 URL: http://svn.reactos.org/svn/reactos?rev=61095&view=rev Log: [NTOSKRNL] Windows / ReactOS uses a software protection field called protection mask, which is stored inside invalid (Software) PTEs to provide information about the desired protection, when a page is made valid by the page fault handler. The mask consists of the values 0-7 specifying the read/write/execute rights, 0 being inaccessible aka MM_ZERO_ACCESS, plus 2 flag-like bits, for uncached and writecombine memory respectively. Both flags together don't make sense, so this combination is used to mark guard pages. Since all these flags only make sense when used together with a proper access (i.e. not MM_ZERO_ACCESS), the combination of these flags together with MM_ZERO_ACCESS was given special meaning: MM_DECOMMIT, which equals MM_GUARDPAGE | MM_ZERO_ACCESS is for decommitted pages, that are not yet erased to zero, MM_NOACCESS, which is the mask for pages that are mapped with PAGE_NOACCESS (this is to make sure that a software PTE of a committed page is never completely 0, which it could be, when MM_ZERO_ACCESS was used), and finally MM_OUTSWAPPED_KSTACK for outswapped kernel stacks. See also https://www.reactos.org/wiki/Techwiki:Memory_Protection_constants. The next thing to know is that the number of PTEs that are not null is counted for each PDE. So once a page gets committed, a software PTE is written and the reference count is incremented. When the page is made valid by the fault handler, the count is not changed, when the page is decommitted, the MM_DECOMMIT software PTE is written and again the PTE stays non-null and nothing is changed. Only when the range is cleaned up totally, the PTEs get erased and the reference count is decremented. Now it happened that our page fault handler missed to validate the access rights of protection constants. The problem that came up with this is a major one: since a decommitted page is a software PTE with MM_DECOMMIT as the protection mask (which we remember has the MM_GUARDPAGE bit set), the fault handler considered faults on decommitted PTEs as faults on guard pages and simply removed the guard page flag, leaving a completely empty PTE behind! So the decommitted page got erased without decrementing the reference count. This lead to CORE-7445. - Add protection flags (MM_GUARDPAGE, MM_WRITECOMBINE, MM_OUTSWAPPED_KSTACK) - Instead of writing 0 to a PTE, use MI_WRITE_INVALID_PTE with MmZeroPte - Implement MiIsAccessAllowed that checks for read/write/execute access and use it in MiAccessCheck - Add some more ASSERTs CORE-7445 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Nov 25 00:18:33 2013 @@ -96,6 +96,7 @@ // // Protection Bits part of the internal memory manager Protection Mask, from: // http://reactos.org/wiki/Techwiki:Memory_management_in_the_Windows_XP_kernel +// https://www.reactos.org/wiki/Techwiki:Memory_Protection_constants // and public assertions. // #define MM_ZERO_ACCESS 0 @@ -106,9 +107,20 @@ #define MM_WRITECOPY 5 #define MM_EXECUTE_READWRITE 6 #define MM_EXECUTE_WRITECOPY 7 -#define MM_NOCACHE 8 -#define MM_DECOMMIT 0x10 -#define MM_NOACCESS (MM_DECOMMIT | MM_NOCACHE) + +// +// These are flags on top of the actual protection mask +// +#define MM_NOCACHE 0x08 +#define MM_GUARDPAGE 0x10 +#define MM_WRITECOMBINE 0x18 + +// +// These are special cases +// +#define MM_DECOMMIT (MM_ZERO_ACCESS | MM_GUARDPAGE) +#define MM_NOACCESS (MM_ZERO_ACCESS | MM_WRITECOMBINE) +#define MM_OUTSWAPPED_KSTACK (MM_EXECUTE_WRITECOPY | MM_WRITECOMBINE) #define MM_INVALID_PROTECTION 0xFFFFFFFF // @@ -576,6 +588,7 @@ LONG ImageLoadingCount; } MM_SESSION_SPACE, *PMM_SESSION_SPACE; +static const MMPTE MmZeroPte = {{0}}; extern PMM_SESSION_SPACE MmSessionSpace; extern MMPTE HyperTemplatePte; extern MMPDE ValidKernelPde; 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 Nov 25 00:18:33 2013 @@ -112,12 +112,41 @@ return STATUS_STACK_OVERFLOW; } +FORCEINLINE +BOOLEAN +MiIsAccessAllowed( + _In_ ULONG ProtectionMask, + _In_ BOOLEAN Write, + _In_ BOOLEAN Execute) +{ + #define _BYTE_MASK(Bit0, Bit1, Bit2, Bit3, Bit4, Bit5, Bit6, Bit7) \ + (Bit0) | ((Bit1) << 1) | ((Bit2) << 2) | ((Bit3) << 3) | \ + ((Bit4) << 4) | ((Bit5) << 5) | ((Bit6) << 6) | ((Bit7) << 7) + static const UCHAR MiAccessAllowedMask[2][2] = + { + { // Protect 0 1 2 3 4 5 6 7 + _BYTE_MASK(0, 1, 1, 1, 1, 1, 1, 1), // READ + _BYTE_MASK(0, 0, 1, 1, 0, 0, 1, 1), // EXECUTE READ + }, + { + _BYTE_MASK(0, 0, 0, 0, 1, 1, 1, 1), // WRITE + _BYTE_MASK(0, 0, 0, 0, 0, 0, 1, 1), // EXECUTE WRITE + } + }; + + /* We want only the low 3 bits */ + ProtectionMask &= 7; + + /* Look it up in the table */ + return (MiAccessAllowedMask[Write != 0][Execute != 0] >> ProtectionMask) & 1; +} + NTSTATUS NTAPI MiAccessCheck(IN PMMPTE PointerPte, IN BOOLEAN StoreInstruction, IN KPROCESSOR_MODE PreviousMode, - IN ULONG_PTR ProtectionCode, + IN ULONG_PTR ProtectionMask, IN PVOID TrapFrame, IN BOOLEAN LockHeld) { @@ -151,20 +180,17 @@ return STATUS_SUCCESS; } - /* Convert any fault flag to 1 only */ - if (StoreInstruction) StoreInstruction = 1; - -#if 0 /* Check if the protection on the page allows what is being attempted */ - if ((MmReadWrite[Protection] - StoreInstruction) < 10) + if (!MiIsAccessAllowed(ProtectionMask, StoreInstruction, FALSE)) { return STATUS_ACCESS_VIOLATION; } -#endif /* Check if this is a guard page */ - if (ProtectionCode & MM_DECOMMIT) - { + if (ProtectionMask & MM_GUARDPAGE) + { + NT_ASSERT(ProtectionMask != MM_DECOMMIT); + /* Attached processes can't expand their stack */ if (KeIsAttachedProcess()) return STATUS_ACCESS_VIOLATION; @@ -173,7 +199,9 @@ (TempPte.u.Soft.Prototype == 0)) == FALSE); /* Remove the guard page bit, and return a guard page violation */ - PointerPte->u.Soft.Protection = ProtectionCode & ~MM_DECOMMIT; + TempPte.u.Soft.Protection = ProtectionMask & ~MM_GUARDPAGE; + NT_ASSERT(TempPte.u.Long != 0); + MI_WRITE_INVALID_PTE(PointerPte, TempPte); return STATUS_GUARD_PAGE_VIOLATION; } @@ -950,6 +978,9 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return STATUS_ACCESS_VIOLATION; } + + /* There is no such thing as a decommitted prototype PTE */ + NT_ASSERT(TempPte.u.Long != MmDecommittedPte.u.Long); /* Check for access rights on the PTE proper */ PteContents = *PointerPte; @@ -1863,10 +1894,14 @@ } /* Is this a guard page? */ - if (ProtectionCode & MM_DECOMMIT) - { + if (ProtectionCode & MM_GUARDPAGE) + { + /* The VAD protection cannot be MM_DECOMMIT! */ + NT_ASSERT(ProtectionCode != MM_DECOMMIT); + /* Remove the bit */ - PointerPte->u.Soft.Protection = ProtectionCode & ~MM_DECOMMIT; + TempPte.u.Soft.Protection = ProtectionCode & ~MM_GUARDPAGE; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); /* Not supported */ ASSERT(ProtoPte == NULL); @@ -1892,7 +1927,8 @@ else { /* No, create a new PTE. First, write the protection */ - PointerPte->u.Soft.Protection = ProtectionCode; + TempPte.u.Soft.Protection = ProtectionCode; + MI_WRITE_INVALID_PTE(PointerPte, TempPte); } /* Lock the PFN database since we're going to grab a page */ @@ -1972,6 +2008,7 @@ /* Write the prototype PTE */ TempPte = PrototypePte; TempPte.u.Soft.Protection = ProtectionCode; + NT_ASSERT(TempPte.u.Long != 0); MI_WRITE_INVALID_PTE(PointerPte, TempPte); } else Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Nov 25 00:18:33 2013 @@ -198,7 +198,7 @@ } /* This actually turns on guard page in this scenario! */ - ProtectMask |= MM_DECOMMIT; + ProtectMask |= MM_GUARDPAGE; } /* Check for nocache option */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Mon Nov 25 00:18:33 2013 @@ -350,7 +350,7 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); /* Destroy the PTE */ - PointerPte->u.Long = 0; + MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); } /* Actual legitimate pages */ @@ -368,7 +368,7 @@ ASSERT(PointerPte->u.Soft.PageFileHigh == 0); /* Destroy the PTE */ - PointerPte->u.Long = 0; + MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); } /* Keep going */ @@ -486,7 +486,7 @@ } /* Destroy the PTE and flush the TLB */ - PointerPte->u.Long = 0; + MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); KeFlushCurrentTb(); } @@ -618,7 +618,7 @@ (TempPte.u.Soft.Prototype == 1)) { /* Just nuke it */ - PointerPte->u.Long = 0; + MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); } else { @@ -632,7 +632,7 @@ else { /* The PTE was never mapped, just nuke it here */ - PointerPte->u.Long = 0; + MI_WRITE_INVALID_PTE(PointerPte, MmZeroPte); } } @@ -2113,7 +2113,8 @@ ASSERT(PteContents.u.Soft.Transition == 0); /* The PTE is already demand-zero, just update the protection mask */ - PointerPte->u.Soft.Protection = ProtectionMask; + PteContents.u.Soft.Protection = ProtectionMask; + MI_WRITE_INVALID_PTE(PointerPte, PteContents); ASSERT(PointerPte->u.Long != 0); }

10 years, 9 months

[gadamopoulos] 61094: [shell32] - define STR_FILE_SYS_BIND_DATA in the public headers and use it in IFileSystemBindDataImpl and CFSFolder. Now we use the same string to store the IFileSystemBindDat...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Nov 24 21:42:28 2013 New Revision: 61094 URL: http://svn.reactos.org/svn/reactos?rev=61094&view=rev Log: [shell32] - define STR_FILE_SYS_BIND_DATA in the public headers and use it in IFileSystemBindDataImpl and CFSFolder. Now we use the same string to store the IFileSystemBindDataImpl in the bind context. - Fix CFSFolder::ParseDisplayName to properly parse paths with a IBindCtx - Should fix creating pidls that represent files that don't exist and fix SHChangeNotify tests that hanged for a whole minute in our test suite Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/shlfsbind.cpp trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Sun Nov 24 21:42:28 2013 @@ -110,7 +110,6 @@ */ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) { - static WCHAR szfsbc[] = L"File System Bind Data"; IFileSystemBindData *fsbd = NULL; LPITEMIDLIST pidl = NULL; IUnknown *param = NULL; @@ -123,7 +122,7 @@ return NULL; /* see if the caller bound File System Bind Data */ - r = pbc->GetObjectParam((LPOLESTR)szfsbc, &param); + r = pbc->GetObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, &param); if (FAILED(r)) return NULL; @@ -198,20 +197,27 @@ if (pchEaten) *pchEaten = 0; /* strange but like the original */ - pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName); - if (!pidlTemp && *lpszDisplayName) + if (*lpszDisplayName) { /* get the next element */ szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* build the full pathname to the element */ - lstrcpynW(szPath, sPathTarget, MAX_PATH - 1); - PathAddBackslashW(szPath); - len = wcslen(szPath); - lstrcpynW(szPath + len, szElement, MAX_PATH - len); - - /* get the pidl */ - hr = _ILCreateFromPathW(szPath, &pidlTemp); + pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, szElement); + if (pidlTemp != NULL) + { + hr = S_OK; + } + else + { + /* build the full pathname to the element */ + lstrcpynW(szPath, sPathTarget, MAX_PATH - 1); + PathAddBackslashW(szPath); + len = wcslen(szPath); + lstrcpynW(szPath + len, szElement, MAX_PATH - len); + + /* get the pidl */ + hr = _ILCreateFromPathW(szPath, &pidlTemp); + } if (SUCCEEDED(hr)) { Modified: trunk/reactos/dll/win32/shell32/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfsbin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfsbind.cpp [iso-8859-1] Sun Nov 24 21:42:28 2013 @@ -49,9 +49,6 @@ END_COM_MAP() }; -static const WCHAR wFileSystemBindData[] = { - 'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d','D','a','t','a',0}; - HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV) { CComPtr<IFileSystemBindData> fileSystemBindData; @@ -83,7 +80,7 @@ hResult = bindContext->SetBindOptions(&bindOpts); if (FAILED(hResult)) return hResult; - hResult = bindContext->RegisterObjectParam((LPOLESTR)wFileSystemBindData, fileSystemBindData); + hResult = bindContext->RegisterObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, fileSystemBindData); if (FAILED(hResult)) return hResult; @@ -103,7 +100,7 @@ if (!pfd) return E_INVALIDARG; - ret = pbc->GetObjectParam((LPOLESTR)wFileSystemBindData, &pUnk); + ret = pbc->GetObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, &pUnk); if (SUCCEEDED(ret)) { ret = pUnk->QueryInterface(IID_PPV_ARG(IFileSystemBindData, &pfsbd)); @@ -121,7 +118,7 @@ TRACE("%p, %p\n", pbc, pfd); - ret = pbc->GetObjectParam((LPOLESTR)wFileSystemBindData, &pUnk); + ret = pbc->GetObjectParam((LPOLESTR)STR_FILE_SYS_BIND_DATA, &pUnk); if (SUCCEEDED(ret)) { ret = pUnk->QueryInterface(IID_PPV_ARG(IFileSystemBindData, &pfsbd)); Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Sun Nov 24 21:42:28 2013 @@ -1833,6 +1833,8 @@ [in] LPCITEMIDLIST pidl2); } +cpp_quote("#define STR_FILE_SYS_BIND_DATA L\"File System Bind Data\"") + /***************************************************************************** * IFileSystemBindData interface */

10 years, 9 months

[tfaber] 61093: [RTL] - Allow parsing manifest files larger than 32 kB. Fix a DPRINT. Patch by David Quintana. CORE-7642 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 24 20:04:45 2013 New Revision: 61093 URL: http://svn.reactos.org/svn/reactos?rev=61093&view=rev Log: [RTL] - Allow parsing manifest files larger than 32 kB. Fix a DPRINT. Patch by David Quintana. CORE-7642 #resolve Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=61093… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Nov 24 20:04:45 2013 @@ -1176,6 +1176,7 @@ struct assembly* assembly) { xmlstr_t attr_name, attr_value; + UNICODE_STRING attr_nameU, attr_valueU; BOOL end = FALSE, error; struct entity* entity; @@ -1194,7 +1195,9 @@ } else { - DPRINT1("unknown attr %S=%S\n", attr_name.ptr, attr_value.ptr); + attr_nameU = xmlstr2unicode(&attr_name); + attr_valueU = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } } @@ -1658,36 +1661,31 @@ else { /* TODO: this doesn't handle arbitrary encodings */ - ANSI_STRING xmlA; - UNICODE_STRING xmlW; - - ASSERT(size < MAXUSHORT); - xmlA.Buffer = (PCHAR)buffer; - xmlA.Length = xmlA.MaximumLength = (USHORT)size; - - _SEH2_TRY - { - status = RtlAnsiStringToUnicodeString(&xmlW, &xmlA, TRUE); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("Exception accessing buffer\n"); - _SEH2_YIELD(return STATUS_SXS_CANT_GEN_ACTCTX); - } - _SEH2_END; - + WCHAR *new_buff; + ULONG sizeU; + + status = RtlMultiByteToUnicodeSize(&sizeU, buffer, size); if (!NT_SUCCESS(status)) { - DPRINT1("RtlAnsiStringToUnicodeString failed with %lx\n", status); + DPRINT1("RtlMultiByteToUnicodeSize failed with %lx\n", status); return STATUS_SXS_CANT_GEN_ACTCTX; } - ASSERT(xmlW.Buffer != NULL); - - xmlbuf.ptr = xmlW.Buffer; - xmlbuf.end = xmlbuf.ptr + xmlW.Length / sizeof(WCHAR); - status = parse_manifest_buffer( acl, assembly, ai, &xmlbuf ); - - RtlFreeUnicodeString(&xmlW); + + new_buff = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeU); + if (!new_buff) + return STATUS_NO_MEMORY; + + status = RtlMultiByteToUnicodeN(new_buff, sizeU, &sizeU, buffer, size); + if (!NT_SUCCESS(status)) + { + DPRINT1("RtlMultiByteToUnicodeN failed with %lx\n", status); + return STATUS_SXS_CANT_GEN_ACTCTX; + } + + xmlbuf.ptr = new_buff; + xmlbuf.end = xmlbuf.ptr + sizeU / sizeof(WCHAR); + status = parse_manifest_buffer(acl, assembly, ai, &xmlbuf); + RtlFreeHeap(RtlGetProcessHeap(), 0, new_buff); } return status; }

10 years, 9 months

[ekohl] 61092: [MSGINA] - Add a disabled "Change Password" button to the Security dialog. - Add the "Change Password" dialog and a basic dialog function.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 24 17:24:44 2013 New Revision: 61092 URL: http://svn.reactos.org/svn/reactos?rev=61092&view=rev Log: [MSGINA] - Add a disabled "Change Password" button to the Security dialog. - Add the "Change Password" dialog and a basic dialog function. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -229,6 +229,42 @@ return TRUE; } + +static INT_PTR CALLBACK +ChangePasswordDialogProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + FIXME("ChangePasswordDialogProc: WM_INITDLG\n"); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, TRUE); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + return TRUE; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, FALSE); + return TRUE; + } + + return FALSE; +} + + static VOID OnInitSecurityDlg(HWND hwnd, PGINA_CONTEXT pgContext) @@ -257,6 +293,30 @@ SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); } + + +static BOOL +OnChangePassword( + IN HWND hwnd, + IN PGINA_CONTEXT pgContext) +{ + INT res; + + FIXME("OnChangePassword()\n"); + + res = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_CHANGE_PASSWORD), + hwnd, + ChangePasswordDialogProc, + (LPARAM)pgContext); + + FIXME("Result: %x\n", res); + + return FALSE; +} + static INT_PTR CALLBACK LoggedOnWindowProc( @@ -265,10 +325,17 @@ IN WPARAM wParam, IN LPARAM lParam) { + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + switch (uMsg) { case WM_INITDIALOG: { + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + OnInitSecurityDlg(hwndDlg, (PGINA_CONTEXT)lParam); SetFocus(GetDlgItem(hwndDlg, IDNO)); return TRUE; @@ -286,6 +353,10 @@ return TRUE; case IDC_SHUTDOWN: EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); + return TRUE; + case IDC_CHANGEPWD: + if (OnChangePassword(hwndDlg, pgContext)) + EndDialog(hwndDlg, WLX_SAS_ACTION_PWD_CHANGED); return TRUE; case IDC_TASKMGR: EndDialog(hwndDlg, WLX_SAS_ACTION_TASKLIST); Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°",IDC_LOCK,25,154,99,14 PUSHBUTTON "ÐÐ·ÑÐ¾Ð´",IDC_LOGOFF,90,135,75,14 PUSHBUTTON "ÐÐ·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ",IDC_SHUTDOWN,170,135,75,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»",IDC_TASKMGR,10,135,75,14 PUSHBUTTON "ÐÑÐºÐ°Ð·",IDCANCEL,130,154,99,14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ´ÑÐ°Ð²ÐµÐ¹ÑÐµ!" Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -51,6 +51,7 @@ PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,135,70,14 PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "Vypnout",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "SprÃ¡vce Ãºloh",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "Storno",IDCANCEL,170,154,70,14 END @@ -84,6 +85,26 @@ PUSHBUTTON "Storno",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "VÃtejte!" Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "Computer sperren",IDC_LOCK,10,135,76,14 PUSHBUTTON "Abmelden",IDC_LOGOFF,100,135,75,14 PUSHBUTTON "Herunterfahren",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Password Ã¤ndern",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Taskmanager",IDC_TASKMGR,100,154,75,14 PUSHBUTTON "Abbrechen",IDCANCEL,189,154,76,14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Abbrechen",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Willkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "Lock computer",IDC_LOCK,10,135,76,14 PUSHBUTTON "Log off",IDC_LOGOFF,100,135,75,14 PUSHBUTTON "Shutdown",IDC_SHUTDOWN,189,135,76,14 + PUSHBUTTON "Change Password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Task manager",IDC_TASKMGR,100,154,75,14 PUSHBUTTON "Cancel",IDCANCEL,189,154,76,14 END @@ -71,12 +72,32 @@ ICON IDI_LOCKICON,-1,7,59,20,20 LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 LTEXT "Message",IDC_LOCKMSG,36,75,232,26 - LTEXT "Username:",IDC_STATIC,36,107,40,8 + LTEXT "User name:",IDC_STATIC,36,107,40,8 EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,36,125,42,8 EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 +END + +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 END STRINGTABLE Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -51,6 +51,7 @@ PUSHBUTTON "Bloquear computadora",IDC_LOCK, 4,135, 83, 14 PUSHBUTTON "Salir",IDC_LOGOFF, 92,135, 88, 14 PUSHBUTTON "Cerrar",IDC_SHUTDOWN, 186,135, 70, 14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Administrador de tareas",IDC_TASKMGR, 92,154, 88, 14 PUSHBUTTON "Cancelar",IDCANCEL, 186,154, 70, 14 END @@ -84,6 +85,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Â¡Bienvenido!" Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "Verrouiller l'ordinateur",IDC_LOCK, 4,135, 82, 14 PUSHBUTTON "DÃ©connecter",IDC_LOGOFF, 93,135, 85, 14 PUSHBUTTON "Ãteindre",IDC_SHUTDOWN, 184,135, 70, 14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Gestionnaire de tÃ¢ches",IDC_TASKMGR, 93,154, 85, 14 PUSHBUTTON "Annuler",IDCANCEL, 184,154, 70, 14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bienvenue!" Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "×× ×¢×× ××ª ××××©×",IDC_LOCK,10,76,70,14 PUSHBUTTON "×××ª× ×ª×§",IDC_LOGOFF,90,76,70,14 PUSHBUTTON "×××××ª",IDC_SHUTDOWN,170,76,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "×× ×× ×××©××××ª",IDC_TASKMGR,90,95,70,14 PUSHBUTTON "×××××",IDCANCEL,170,95,70,14 END @@ -79,6 +80,26 @@ PUSHBUTTON "×××××",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "××¨×××× ×××××!" Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "Kunci komputer",IDC_LOCK,10,135,70,14 PUSHBUTTON "Keluar",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "Matikan",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Manager Tugas",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "Batal",IDCANCEL,170,154,70,14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Selamat datang!" Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -54,6 +54,7 @@ PUSHBUTTON "Bloccare il computer",IDC_LOCK,10,135,70,14 PUSHBUTTON "Fine sessione",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "Spegnimento",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Task manager",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "Annulla",IDCANCEL,170,154,70,14 END @@ -87,6 +88,26 @@ PUSHBUTTON "Annulla",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Benvenuti!" Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "ã³ã³ãã¥ã¼ã¿ã®ããã¯",IDC_LOCK,10,135,70,14 PUSHBUTTON "ãã°ãªã",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "ã·ã£ãããã¦ã³",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "ã¿ã¹ã¯ ããã¼ã¸ã£",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "ãã£ã³ã»ã«",IDCANCEL,170,154,70,14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ãããã!" Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -46,6 +46,7 @@ PUSHBUTTON "LÃ¥s datamaskinen...",IDC_LOCK, 7, 135, 74, 14 PUSHBUTTON "Logg av...",IDC_LOGOFF, 86, 135, 78, 14 PUSHBUTTON "Avslutt...",IDC_SHUTDOWN, 170, 135, 70, 14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Oppgavebehandling...",IDC_TASKMGR, 86, 154, 78, 14 PUSHBUTTON "Avbryt",IDCANCEL, 170, 154, 70, 14 END @@ -79,6 +80,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Velkommen!" Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -54,6 +54,7 @@ PUSHBUTTON "Blokada komputera",IDC_LOCK,10,135,70,14 PUSHBUTTON "Wyloguj",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "WyÅÄcz",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "MenedÅ¼er zadaÅ",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "Anuluj",IDCANCEL,170,154,70,14 END @@ -87,6 +88,26 @@ PUSHBUTTON "Anuluj",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Witaj!" Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -47,6 +47,7 @@ PUSHBUTTON "&BlocheazÄ calculatorul", IDC_LOCK,10,135,70,14 PUSHBUTTON "&DeautentificÄ-mÄ", IDC_LOGOFF,90,135,70,14 PUSHBUTTON "Ãnchid&ere calculatorul", IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "Gestionar de &activitÄÈi", IDC_TASKMGR,90,154,70,14 PUSHBUTTON "A&nuleazÄ", IDCANCEL,170,154,70,14 END @@ -80,6 +81,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Bun venit!" Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -48,6 +48,7 @@ PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7,135, 86, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102,135, 86, 14 PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ",IDC_SHUTDOWN, 198,135, 70, 14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ",IDC_TASKMGR, 102,154, 86, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198,154, 70, 14 END @@ -81,6 +82,26 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ!" Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -51,6 +51,7 @@ PUSHBUTTON "UzamknÃºÅ¥ poÄÃtaÄ",IDC_LOCK,10,135,70,14 PUSHBUTTON "OdhlÃ¡siÅ¥",IDC_LOGOFF,90,135,70,14 PUSHBUTTON "VypnÃºÅ¥",IDC_SHUTDOWN,170,135,70,14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "SprÃ¡vca Ãºloh",IDC_TASKMGR,90,154,70,14 PUSHBUTTON "ZruÅ¡iÅ¥",IDCANCEL,170,154,70,14 END @@ -84,6 +85,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Vitajte!" Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -54,6 +54,7 @@ PUSHBUTTON "ÐÐ»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ",IDC_LOCK, 6,135, 70, 14 PUSHBUTTON "ÐÐ¸ÑÑÐ´ ÑÐ· ÑÐ¸ÑÑÐµÐ¼Ð¸...",IDC_LOGOFF, 80,135, 80, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸...",IDC_SHUTDOWN, 165,135, 86, 14 + PUSHBUTTON "Change password",IDC_CHANGEPWD,10,154,76,14,WS_DISABLED PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð²Ð´Ð°Ð½Ñ",IDC_TASKMGR, 80,154, 80, 14 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL, 165,154, 86, 14 END @@ -87,6 +88,26 @@ PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 END +IDD_CHANGE_PASSWORD DIALOGEX 0,0,275,166 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP +CAPTION "Change Password" +FONT 8,"MS Shell Dlg",400,0,1 +BEGIN + CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 + LTEXT "User name:",IDC_STATIC,7,61,78,8 + EDITTEXT IDC_CHANGEPWD_USERNAME,90,59,127,12,ES_AUTOHSCROLL + LTEXT "Log on to:",IDC_STATIC,7,78,78,8 + COMBOBOX IDC_CHANGEPWD_DOMAIN,90,75,127,144,CBS_DROPDOWNLIST|CBS_SORT + LTEXT "Old Password:",IDC_STATIC,7,95,78,8 + EDITTEXT IDC_CHANGEPWD_OLDPWD,90,92,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "New Password:",IDC_STATIC,7,111,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD1,90,109,127,12,ES_AUTOHSCROLL|ES_PASSWORD + LTEXT "Confirm new Password:",IDC_STATIC,7,127,78,8 + EDITTEXT IDC_CHANGEPWD_NEWPWD2,90,125,127,12,ES_AUTOHSCROLL|ES_PASSWORD + PUSHBUTTON "OK",IDOK,164,145,50,14,BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel",IDCANCEL,218,145,50,14 +END + STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾!" Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Sun Nov 24 17:24:44 2013 @@ -19,6 +19,14 @@ #define IDC_LOCKMSG 1009 #define IDC_LOGONMSG 1010 #define IDC_LOGONDATE 1011 +#define IDC_CHANGEPWD 1012 + +#define IDD_CHANGE_PASSWORD 106 +#define IDC_CHANGEPWD_USERNAME 1013 +#define IDC_CHANGEPWD_DOMAIN 1014 +#define IDC_CHANGEPWD_OLDPWD 1015 +#define IDC_CHANGEPWD_NEWPWD1 1016 +#define IDC_CHANGEPWD_NEWPWD2 1017 #define IDI_ROSLOGO 20000

10 years, 9 months

[tfaber] 61091: [NPFS] - Fix a use after free in NpFsdCreate

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Nov 24 16:22:17 2013 New Revision: 61091 URL: http://svn.reactos.org/svn/reactos?rev=61091&view=rev Log: [NPFS] - Fix a use after free in NpFsdCreate Modified: trunk/reactos/drivers/filesystems/npfs/create.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Nov 24 16:22:17 2013 @@ -25,7 +25,7 @@ PIRP Irp; ULONG i; PAGED_CODE(); - + ListHead = &Dcb->NotifyList; for (i = 0; i < 2; i++) { @@ -211,6 +211,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + IO_STATUS_BLOCK IoStatus; PEXTENDED_IO_STACK_LOCATION IoStack; UNICODE_STRING FileName; PFILE_OBJECT FileObject; @@ -230,6 +231,9 @@ FileName = FileObject->FileName; DesiredAccess = IoStack->Parameters.CreatePipe.SecurityContext->DesiredAccess; + IoStatus.Information = 0; + IoStatus.Status = STATUS_SUCCESS; + FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); @@ -250,25 +254,25 @@ (FileName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) && !(RelatedFileObject)) { - Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, - FileObject, - DesiredAccess, - &DeferredList); + IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, + FileObject, + DesiredAccess, + &DeferredList); goto Quickie; } } else if (!(RelatedFileObject) || (Type == NPFS_NTC_VCB)) { - Irp->IoStatus = NpOpenNamedPipeFileSystem(FileObject, - DesiredAccess); + IoStatus = NpOpenNamedPipeFileSystem(FileObject, + DesiredAccess); goto Quickie; } else if (Type == NPFS_NTC_ROOT_DCB) { - Irp->IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, - FileObject, - DesiredAccess, - &DeferredList); + IoStatus = NpOpenNamedPipeRootDirectory(NpVcb->RootDcb, + FileObject, + DesiredAccess, + &DeferredList); goto Quickie; } @@ -279,19 +283,19 @@ if (Type == NPFS_NTC_ROOT_DCB) { Dcb = (PNP_DCB)Ccb; - Irp->IoStatus.Status = NpFindRelativePrefix(Dcb, - &FileName, - 1, - &Prefix, - &Fcb); - if (!NT_SUCCESS(Irp->IoStatus.Status)) + IoStatus.Status = NpFindRelativePrefix(Dcb, + &FileName, + 1, + &Prefix, + &Fcb); + if (!NT_SUCCESS(IoStatus.Status)) { goto Quickie; } } else if ((Type != NPFS_NTC_CCB) || (FileName.Length)) { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } else @@ -304,7 +308,7 @@ if ((FileName.Length <= sizeof(OBJ_NAME_PATH_SEPARATOR)) || (FileName.Buffer[0] != OBJ_NAME_PATH_SEPARATOR)) { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } @@ -313,56 +317,57 @@ if (Prefix.Length) { - Irp->IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? - STATUS_OBJECT_NAME_NOT_FOUND : - STATUS_OBJECT_NAME_INVALID; + IoStatus.Status = Fcb->NodeType != NPFS_NTC_FCB ? + STATUS_OBJECT_NAME_NOT_FOUND : + STATUS_OBJECT_NAME_INVALID; goto Quickie; } if (Fcb->NodeType != NPFS_NTC_FCB) { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_INVALID; + IoStatus.Status = STATUS_OBJECT_NAME_INVALID; goto Quickie; } if (!Fcb->ServerOpenCount) { - Irp->IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; - goto Quickie; - } - - Irp->IoStatus = NpCreateClientEnd(Fcb, - FileObject, - DesiredAccess, - IoStack->Parameters.CreatePipe. - SecurityContext->SecurityQos, - IoStack->Parameters.CreatePipe. - SecurityContext->AccessState, - IoStack->Flags & - SL_FORCE_ACCESS_CHECK ? - UserMode : Irp->RequestorMode, - Irp->Tail.Overlay.Thread, - &DeferredList); + IoStatus.Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + IoStatus = NpCreateClientEnd(Fcb, + FileObject, + DesiredAccess, + IoStack->Parameters.CreatePipe. + SecurityContext->SecurityQos, + IoStack->Parameters.CreatePipe. + SecurityContext->AccessState, + IoStack->Flags & + SL_FORCE_ACCESS_CHECK ? + UserMode : Irp->RequestorMode, + Irp->Tail.Overlay.Thread, + &DeferredList); Quickie: ExReleaseResourceLite(&NpVcb->Lock); NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); + Irp->IoStatus = IoStatus; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Irp->IoStatus.Status; + return IoStatus.Status; } IO_STATUS_BLOCK NTAPI -NpCreateExistingNamedPipe(IN PNP_FCB Fcb, - IN PFILE_OBJECT FileObject, +NpCreateExistingNamedPipe(IN PNP_FCB Fcb, + IN PFILE_OBJECT FileObject, IN ACCESS_MASK DesiredAccess, - IN PACCESS_STATE AccessState, - IN KPROCESSOR_MODE PreviousMode, - IN ULONG Disposition, - IN ULONG ShareAccess, - IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, + IN PACCESS_STATE AccessState, + IN KPROCESSOR_MODE PreviousMode, + IN ULONG Disposition, + IN ULONG ShareAccess, + IN PNAMED_PIPE_CREATE_PARAMETERS Parameters, IN PEPROCESS Process, OUT PLIST_ENTRY List) { @@ -642,9 +647,7 @@ ShareAccess = IoStack->Parameters.CreatePipe.ShareAccess & 0xFFFF; Parameters = IoStack->Parameters.CreatePipe.Parameters; - FileName.Buffer = FileObject->FileName.Buffer; - FileName.Length = FileObject->FileName.Length; - FileName.MaximumLength = FileObject->FileName.MaximumLength; + FileName = FileObject->FileName; IoStatus.Status = STATUS_SUCCESS; IoStatus.Information = 0;

10 years, 9 months

[tkreuzer] 61090: [NTOSKRNL] Remove deprecated and unused functions MmDisableVirtualMapping and MmRawDeleteVirtualMapping

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 24 16:18:50 2013 New Revision: 61090 URL: http://svn.reactos.org/svn/reactos?rev=61090&view=rev Log: [NTOSKRNL] Remove deprecated and unused functions MmDisableVirtualMapping and MmRawDeleteVirtualMapping Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/arm/page.c trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/i386/pagepae.c trunk/reactos/ntoskrnl/mm/powerpc/page.c 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] Sun Nov 24 16:18:50 2013 @@ -1292,24 +1292,10 @@ VOID NTAPI -MmDisableVirtualMapping( - struct _EPROCESS *Process, - PVOID Address, - BOOLEAN* WasDirty, - PPFN_NUMBER Page -); - -VOID -NTAPI MmEnableVirtualMapping( struct _EPROCESS *Process, PVOID Address ); - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address); - VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -508,20 +508,6 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address) -{ - UNIMPLEMENTED; -} - -VOID -NTAPI MmDeleteVirtualMapping( PEPROCESS Process, PVOID Address, Modified: trunk/reactos/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/page.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/page.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -155,24 +155,6 @@ return (PULONG)KeArmTranslationTableRegisterGet().AsUlong; } -VOID -NTAPI -MmDisableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PBOOLEAN WasDirty, - OUT PPFN_NUMBER Page) -{ - UNIMPLEMENTED_DBGBREAK(); -} - -VOID -NTAPI -MmEnableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address) -{ - UNIMPLEMENTED_DBGBREAK(); -} - NTSTATUS NTAPI MmCreateVirtualMappingUnsafe(IN PEPROCESS Process, Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -390,19 +390,6 @@ VOID NTAPI -MmDisableVirtualMapping(IN PEPROCESS Process, - IN PVOID Address, - OUT PBOOLEAN WasDirty, - OUT PPFN_NUMBER Page) -{ - // - // TODO - // - UNIMPLEMENTED_DBGBREAK(); -} - -VOID -NTAPI MmEnableVirtualMapping(IN PEPROCESS Process, IN PVOID Address) { @@ -573,30 +560,6 @@ Protection, Pages, PageCount); -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(IN PVOID Address) -{ - PMMPTE PointerPte; - - // - // Get the PTE - // - PointerPte = MiGetPageTableForProcess(NULL, Address, FALSE); - if ((PointerPte) && (PointerPte->u.Hard.Valid)) - { - // - // Destroy it - // - PointerPte->u.Hard.AsUlong = 0; - - // - // Flush the TLB - // - MiFlushTlb(PointerPte, Address); - } } VOID Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -146,7 +146,7 @@ /* FUNCTIONS ***************************************************************/ -BOOLEAN MmUnmapPageTable(PULONG Pt); +static BOOLEAN MmUnmapPageTable(PULONG Pt); VOID MiFlushTlb(PULONG Pt, PVOID Address) @@ -326,7 +326,7 @@ return Pt; } -BOOLEAN MmUnmapPageTable(PULONG Pt) +static BOOLEAN MmUnmapPageTable(PULONG Pt) { if (!IS_HYPERSPACE(Pt)) { @@ -367,69 +367,6 @@ return 0; } return(PTE_TO_PFN(Entry)); -} - -VOID -NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - BOOLEAN WasValid; - ULONG Pte; - PULONG Pt; - - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* - * Atomically disable the present bit and get the old value. - */ - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); - - MiFlushTlb(Pt, Address); - - WasValid = (Pte & PA_PRESENT); - if (!WasValid) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* - * Return some information to the caller - */ - if (WasDirty != NULL) - { - *WasDirty = Pte & PA_DIRTY; - } - if (Page != NULL) - { - *Page = PTE_TO_PFN(Pte); - } -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address) -{ - PULONG Pt; - - Pt = MmGetPageTableForProcess(NULL, Address, FALSE); - if (Pt && *Pt) - { - /* - * Set the entry to zero - */ - InterlockedExchangePte(Pt, 0); - MiFlushTlb(Pt, Address); - } } VOID Modified: trunk/reactos/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pagepae.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/pagepae.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -810,126 +810,6 @@ VOID NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - BOOLEAN WasValid; - if (Ke386Pae) - { - ULONGLONG Pte; - ULONGLONG tmpPte; - PULONGLONG Pt; - - Pt = MmGetPageTableForProcessForPAE(Process, Address, FALSE); - if (Pt == NULL) - { - ASSERT(FALSE); - } - /* - * Atomically disable the present bit and get the old value. - */ - do - { - Pte = *Pt; - tmpPte = Pte & ~PA_PRESENT; - } while (Pte != ExfInterlockedCompareExchange64UL(Pt, &tmpPte, &Pte)); - - MiFlushTlb((PULONG)Pt, Address); - WasValid = PAE_PAGE_MASK(Pte) != 0LL ? TRUE : FALSE; - if (!WasValid) - { - ASSERT(FALSE); - } - - /* - * Return some information to the caller - */ - if (WasDirty != NULL) - { - *WasDirty = Pte & PA_DIRTY ? TRUE : FALSE; - } - if (Page != NULL) - { - *Page = PAE_PTE_TO_PFN(Pte); - } - } - else - { - ULONG Pte; - PULONG Pt; - - Pt = MmGetPageTableForProcess(Process, Address, FALSE); - if (Pt == NULL) - { - ASSERT(FALSE); - } - /* - * Atomically disable the present bit and get the old value. - */ - do - { - Pte = *Pt; - } while (Pte != InterlockedCompareExchangeUL(Pt, Pte & ~PA_PRESENT, Pte)); - - MiFlushTlb(Pt, Address); - WasValid = (PAGE_MASK(Pte) != 0); - if (!WasValid) - { - ASSERT(FALSE); - } - - /* - * Return some information to the caller - */ - if (WasDirty != NULL) - { - *WasDirty = Pte & PA_DIRTY; - } - if (Page != NULL) - { - *Page = PTE_TO_PFN(Pte); - } - } -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address) -{ - if (Ke386Pae) - { - PULONGLONG Pt; - ULONGLONG ZeroPte = 0LL; - Pt = MmGetPageTableForProcessForPAE(NULL, Address, FALSE); - if (Pt) - { - /* - * Set the entry to zero - */ - (void)ExfpInterlockedExchange64UL(Pt, &ZeroPte); - MiFlushTlb((PULONG)Pt, Address); - } - } - else - { - PULONG Pt; - - Pt = MmGetPageTableForProcess(NULL, Address, FALSE); - if (Pt && *Pt) - { - /* - * Set the entry to zero - */ - (void)InterlockedExchangeUL(Pt, 0); - MiFlushTlb(Pt, Address); - } - } -} - -VOID -NTAPI MmDeleteVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN FreePage, BOOLEAN* WasDirty, PPFN_NUMBER Page) /* Modified: trunk/reactos/ntoskrnl/mm/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/powerpc/page.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/powerpc/page.c [iso-8859-1] Sun Nov 24 16:18:50 2013 @@ -197,25 +197,6 @@ PVOID Address) { return((PFN_NUMBER)MmGetPhysicalAddressProcess(Process, Address) >> PAGE_SHIFT); -} - -VOID -NTAPI -MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOLEAN* WasDirty, PPFN_NUMBER Page) -/* - * FUNCTION: Delete a virtual mapping - */ -{ - ppc_map_info_t info = { 0 }; - info.proc = Process ? (int)Process->UniqueProcessId : 0; - info.addr = (vaddr_t)Address; - MmuUnmapPage(&info, 1); -} - -VOID -NTAPI -MmRawDeleteVirtualMapping(PVOID Address) -{ } VOID

10 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
35
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 November 2013