Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[akhaldi] 57038: [UNIATA] * Fix the debug build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Aug 3 23:08:55 2012 New Revision: 57038 URL: http://svn.reactos.org/svn/reactos?rev=57038&view=rev Log: [UNIATA] * Fix the debug build. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Fri Aug 3 23:08:55 2012 @@ -9170,7 +9170,7 @@ return status; } #endif // USE_REACTOS_DDK - KdPrint(("UniATA Init: OS ver %x.%x (%d), %d CPU(s)\n", MajorVersion, MinorVersion, BuildNumber, *KeNumberProcessors)); + KdPrint(("UniATA Init: OS ver %x.%x (%d), %d CPU(s)\n", MajorVersion, MinorVersion, BuildNumber, KeNumberProcessors)); KeQuerySystemTime(&t0); do {

12 years, 1 month

[ion] 57037: [HIVEFILES]: Add the .NET Install Dir key, which fixes tons of MSI problems where it failed to load/initalize/find assemblies.

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 3 19:38:25 2012 New Revision: 57037 URL: http://svn.reactos.org/svn/reactos?rev=57037&view=rev Log: [HIVEFILES]: Add the .NET Install Dir key, which fixes tons of MSI problems where it failed to load/initalize/find assemblies. Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_amd64.inf [iso-8859-1] Fri Aug 3 19:38:25 2012 @@ -28,6 +28,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","18",2,"secur32.dll" HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","68",2,"netlogon.dll" HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll" + +; .NET +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Fri Aug 3 19:38:25 2012 @@ -17,6 +17,9 @@ HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" + +; .NET +HKLM,"SOFTWARE\Microsoft\.NETFramework\","InstallDir",0x00020000,"%SystemRoot%\Microsoft .NET\Framework\" ; HTML Help HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== Binary files - no diff available.

12 years, 1 month

[iut2011] 57036: MMc dll file

by iut2011＠svn.reactos.org

Author: iut2011 Date: Fri Aug 3 16:17:20 2012 New Revision: 57036 URL: http://svn.reactos.org/svn/reactos?rev=57036&view=rev Log: MMc dll file Added: branches/iut-mmc/dll/win32/Mmcndmgr/ (with props) Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 3 16:17:20 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/iut-mmc/dll/win32/Mmcndmgr/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

12 years, 1 month

[iut2011] 57035: MMC application files

by iut2011＠svn.reactos.org

Author: iut2011 Date: Fri Aug 3 16:04:21 2012 New Revision: 57035 URL: http://svn.reactos.org/svn/reactos?rev=57035&view=rev Log: MMC application files Modified: branches/iut-mmc/base/applications/mmc/CMakeLists.txt branches/iut-mmc/base/applications/mmc/mmc.rbuild Modified: branches/iut-mmc/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/base/applications/mmc/C… ============================================================================== --- branches/iut-mmc/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/iut-mmc/base/applications/mmc/CMakeLists.txt [iso-8859-1] Fri Aug 3 16:04:21 2012 @@ -1,14 +1,20 @@ set_rc_compiler() +set_cpp() -list(APPEND SOURCE - console.c - misc.c - mmc.c - mmc.rc) +add_executable(mmcclient + main.cpp + register_functions.cpp + snapin.cpp + fonction.cpp + MainWindow.cpp + MMC_Parser.cpp + ressource.rc) -add_executable(mmcclient ${SOURCE}) +target_link_libraries(mmcclient uuid libxml2 mmclib) +allow_warnings(mmcclient) set_module_type(mmcclient win32gui UNICODE) -add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) +add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 Mmcndmgr shell32 ws2_32 comctl32 msvcrt kernel32 ole32) add_pch(mmcclient precomp.h) +add_cd_file(TARGET mmcclient DESTINATION reactos/system32 FOR all) Modified: branches/iut-mmc/base/applications/mmc/mmc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/iut-mmc/base/applications/mmc/m… ============================================================================== --- branches/iut-mmc/base/applications/mmc/mmc.rbuild [iso-8859-1] (original) +++ branches/iut-mmc/base/applications/mmc/mmc.rbuild [iso-8859-1] Fri Aug 3 16:04:21 2012 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes"> +<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes" allowwarnings="true"> <include base="mmcclient">.</include> <library>user32</library> <library>gdi32</library> @@ -8,9 +8,15 @@ <library>advapi32</library> <library>shell32</library> <library>comctl32</library> - <file>console.c</file> - <file>misc.c</file> - <file>mmc.c</file> - <file>mmc.rc</file> - <pch>precomp.h</pch> + <library>ole32</library> + <library>mmclib</library> + <library>kernel32</library> + <library>ws2_32</library> + <library>uuid</library> + <file>main.cpp</file> + <file>register_functions.cpp</file> + <file>snapin.cpp</file> + <file>fonction.cpp</file> + <file>MainWindow.cpp</file> + <file>ressource.rc</file> </module>

12 years, 1 month

[ion] 57034: [NTOSKRNL]: Fix typo.

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 3 11:36:43 2012 New Revision: 57034 URL: http://svn.reactos.org/svn/reactos?rev=57034&view=rev Log: [NTOSKRNL]: Fix typo. 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] Fri Aug 3 11:36:43 2012 @@ -1742,7 +1742,7 @@ { /* Get the protection code and check if this is a proto PTE */ ProtectionCode = TempPte.u.Soft.Protection; - DPRINT1("Code: %lx\n", ProtecitonCode); + DPRINT1("Code: %lx\n", ProtectionCode); if (TempPte.u.Soft.Prototype) { /* Do we need to go find the real PTE? */

12 years, 1 month

[ion] 57033: [NTOSKRNL]: Support a few more "unsupported" paths that were hitting ASSERTs before. [NTOSKRNL]: Massively cleanup triplicated code that is just a series of macros/inlines. [NTOSKRNL]:...

by ion＠svn.reactos.org

Author: ion Date: Fri Aug 3 11:34:35 2012 New Revision: 57033 URL: http://svn.reactos.org/svn/reactos?rev=57033&view=rev Log: [NTOSKRNL]: Support a few more "unsupported" paths that were hitting ASSERTs before. [NTOSKRNL]: Massively cleanup triplicated code that is just a series of macros/inlines. [NTOSKRNL]: Handle more complex prototype PTE faults that are not just demand-zero. In my private branch, I can now run ReactOS with *all* pagefile-backed sections running under ARM3 mode. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c 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/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Fri Aug 3 11:34:35 2012 @@ -602,7 +602,6 @@ PFN_NUMBER PageFrameIndex; BOOLEAN UsePfnLock; KIRQL OldIrql; - USHORT OldRefCount, RefCount; PMMPFN Pfn1; DPRINT("Probing MDL: %p\n", Mdl); @@ -998,45 +997,7 @@ if (CurrentProcess) ASSERT(CurrentProcess->PhysicalVadRoot == NULL); /* This address should already exist and be fully valid */ - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); - if (MI_IS_ROS_PFN(Pfn1)) - { - /* ReactOS Mm doesn't track share count */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - } - else - { - /* On ARM3 pages, we should see a valid share count */ - ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); - - /* We don't support mapping a prototype page yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - } - - /* More locked pages! */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, 1); - - /* Loop trying to update the reference count */ - do - { - /* Get the current reference count, make sure it's valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - ASSERT(OldRefCount < 2500); - - /* Bump it up by one */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount + 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - - /* Was this the first lock attempt? */ - if (OldRefCount != 1) - { - /* Someone else came through */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } + MiReferenceProbedPageAndBumpLockCount(Pfn1); } else { @@ -1131,7 +1092,6 @@ PVOID Base; ULONG Flags, PageCount; KIRQL OldIrql; - USHORT RefCount, OldRefCount; PMMPFN Pfn1; DPRINT("Unlocking MDL: %p\n", Mdl); @@ -1198,66 +1158,7 @@ // Check if this page is in the PFN database // Pfn1 = MiGetPfnEntry(*MdlPages); - if (Pfn1) - { - /* Get the current entry and reference count */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Is this already the last dereference */ - if (OldRefCount == 1) - { - /* It should be on a free list waiting for us */ - ASSERT(Pfn1->u3.e2.ReferenceCount == 1); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Not supported yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - - /* One less page */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - - /* Do the last dereference, we're done here */ - MiDecrementReferenceCount(Pfn1, *MdlPages); - } - else - { - /* Loop decrementing one reference */ - do - { - /* Make sure it's still valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Take off one reference */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount - 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - ASSERT(RefCount > 1); - - /* Are there only lock references left? */ - if (RefCount == 2) - { - /* And does the page still have users? */ - if (Pfn1->u2.ShareCount >= 1) - { - /* Then it should still be valid */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - - /* Not supported yet */ - ASSERT((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0)); - - /* But there is one less "locked" page though */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } - } - } - } + if (Pfn1) MiDereferencePfnAndDropLockCount(Pfn1); } while (++MdlPages < LastPage); // @@ -1347,62 +1248,7 @@ { /* Get the current entry and reference count */ Pfn1 = (PMMPFN)*MdlPages; - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Is this already the last dereference */ - if (OldRefCount == 1) - { - /* It should be on a free list waiting for us */ - ASSERT(Pfn1->u3.e2.ReferenceCount == 1); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Not supported yet */ - ASSERT(((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0))); - - /* One less page */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - - /* Do the last dereference, we're done here */ - MiDecrementReferenceCount(Pfn1, MiGetPfnEntryIndex(Pfn1)); - } - else - { - /* Loop decrementing one reference */ - do - { - /* Make sure it's still valid */ - OldRefCount = Pfn1->u3.e2.ReferenceCount; - ASSERT(OldRefCount != 0); - - /* Take off one reference */ - RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, - OldRefCount - 1, - OldRefCount); - ASSERT(RefCount != 0); - } while (OldRefCount != RefCount); - ASSERT(RefCount > 1); - - /* Are there only lock references left? */ - if (RefCount == 2) - { - /* And does the page still have users? */ - if (Pfn1->u2.ShareCount >= 1) - { - /* Then it should still be valid */ - ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); - - /* Not supported yet */ - ASSERT(((Pfn1->u3.e1.PrototypePte == 0) && - (Pfn1->OriginalPte.u.Soft.Prototype == 0))); - - /* But there is one less "locked" page though */ - InterlockedExchangeAddSizeT(&MmSystemLockPagesCount, -1); - } - } - } + MiDereferencePfnAndDropLockCount(Pfn1); } while (++MdlPages < LastPage); // 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] Fri Aug 3 11:34:35 2012 @@ -693,6 +693,7 @@ extern MM_AVL_TABLE MmSectionBasedRoot; extern KGUARDED_MUTEX MmSectionBasedMutex; extern PVOID MmHighSectionBase; +extern SIZE_T MmSystemLockPagesCount; BOOLEAN FORCEINLINE @@ -984,6 +985,43 @@ } // +// New ARM3<->RosMM PAGE Architecture +// +BOOLEAN +FORCEINLINE +MiIsRosSectionObject(IN PVOID Section) +{ + PROS_SECTION_OBJECT RosSection = Section; + if ((RosSection->Type == 'SC') && (RosSection->Size == 'TN')) return TRUE; + return FALSE; +} + +#ifdef _WIN64 +// HACK ON TOP OF HACK ALERT!!! +#define MI_GET_ROS_DATA(x) \ + (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ + ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) +#else +#define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) +#endif +#define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) +#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); +typedef struct _MMROSPFN +{ + PMM_RMAP_ENTRY RmapListHead; + SWAPENTRY SwapEntry; +} MMROSPFN, *PMMROSPFN; + +#define RosMmData AweReferenceCount + +VOID +NTAPI +MiDecrementReferenceCount( + IN PMMPFN Pfn1, + IN PFN_NUMBER PageFrameIndex +); + +// // Locks the working set for the given process // FORCEINLINE @@ -1063,7 +1101,7 @@ /* Own the session working set */ ASSERT((Thread->OwnsSessionWorkingSetExclusive == FALSE) && (Thread->OwnsSessionWorkingSetShared == FALSE)); - Thread->OwnsSessionWorkingSetExclusive = TRUE; + Thread->OwnsSessionWorkingSetExclusive = TRUE; } else { @@ -1142,6 +1180,237 @@ return &MmPfnDatabase[Pfn]; }; +// +// Drops a locked page without dereferencing it +// +FORCEINLINE +VOID +MiDropLockCount(IN PMMPFN Pfn1) +{ + /* This page shouldn't be locked, but it should be valid */ + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + ASSERT(Pfn1->u2.ShareCount == 0); + + /* Is this the last reference to the page */ + if (Pfn1->u3.e2.ReferenceCount == 1) + { + /* It better not be valid */ + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* Update the counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + +// +// Drops a locked page and dereferences it +// +FORCEINLINE +VOID +MiDereferencePfnAndDropLockCount(IN PMMPFN Pfn1) +{ + USHORT RefCount, OldRefCount; + PFN_NUMBER PageFrameIndex; + + /* Loop while we decrement the page successfully */ + do + { + /* There should be at least one reference */ + OldRefCount = Pfn1->u3.e2.ReferenceCount; + ASSERT(OldRefCount != 0); + + /* Are we the last one */ + if (OldRefCount == 1) + { + /* The page shoudln't be shared not active at this point */ + ASSERT(Pfn1->u3.e2.ReferenceCount == 1); + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + ASSERT(Pfn1->u2.ShareCount == 0); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* Update the counter, and drop a reference the long way */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + PageFrameIndex = MiGetPfnEntryIndex(Pfn1); + MiDecrementReferenceCount(Pfn1, PageFrameIndex); + return; + } + + /* Drop a reference the short way, and that's it */ + RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, + OldRefCount - 1, + OldRefCount); + ASSERT(RefCount != 0); + } while (OldRefCount != RefCount); + + /* If we got here, there should be more than one reference */ + ASSERT(RefCount > 1); + if (RefCount == 2) + { + /* Is it still being shared? */ + if (Pfn1->u2.ShareCount >= 1) + { + /* Then it should be valid */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle ethis */ + ASSERT(FALSE); + } + + /* Update the counter */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } + } +} + +// +// References a locked page and updates the counter +// Used in MmProbeAndLockPages to handle different edge cases +// +FORCEINLINE +VOID +MiReferenceProbedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT RefCount, OldRefCount; + + /* Sanity check */ + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + + /* Does ARM3 own the page? */ + if (MI_IS_ROS_PFN(Pfn1)) + { + /* ReactOS Mm doesn't track share count */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + } + else + { + /* On ARM3 pages, we should see a valid share count */ + ASSERT((Pfn1->u2.ShareCount != 0) && (Pfn1->u3.e1.PageLocation == ActiveAndValid)); + + /* We don't support mapping a prototype page yet */ + ASSERT((Pfn1->u3.e1.PrototypePte == 0) && (Pfn1->OriginalPte.u.Soft.Prototype == 0)); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Loop trying to update the reference count */ + do + { + /* Get the current reference count, make sure it's valid */ + OldRefCount = Pfn1->u3.e2.ReferenceCount; + ASSERT(OldRefCount != 0); + ASSERT(OldRefCount < 2500); + + /* Bump it up by one */ + RefCount = InterlockedCompareExchange16((PSHORT)&Pfn1->u3.e2.ReferenceCount, + OldRefCount + 1, + OldRefCount); + ASSERT(RefCount != 0); + } while (OldRefCount != RefCount); + + /* Was this the first lock attempt? If not, undo our bump */ + if (OldRefCount != 1) InterlockedDecrementSizeT(&MmSystemLockPagesCount); +} + +// +// References a locked page and updates the counter +// Used in all other cases except MmProbeAndLockPages +// +FORCEINLINE +VOID +MiReferenceUsedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT NewRefCount; + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Update the reference count */ + NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); + if (NewRefCount == 2) + { + /* Is it locked or shared? */ + if (Pfn1->u2.ShareCount) + { + /* It's shared, so make sure it's active */ + ASSERT(Pfn1->u3.e1.PageLocation == ActiveAndValid); + } + else + { + /* It's locked, so we shouldn't lock again */ + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } + } + else + { + /* Someone had already locked the page, so undo our bump */ + ASSERT(NewRefCount < 2500); + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + +// +// References a locked page and updates the counter +// Used in all other cases except MmProbeAndLockPages +// +FORCEINLINE +VOID +MiReferenceUnusedPageAndBumpLockCount(IN PMMPFN Pfn1) +{ + USHORT NewRefCount; + + /* Make sure the page isn't used yet */ + ASSERT(Pfn1->u2.ShareCount == 0); + ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); + + /* Is it a prototype PTE? */ + if ((Pfn1->u3.e1.PrototypePte == 1) && + (Pfn1->OriginalPte.u.Soft.Prototype == 1)) + { + /* We don't handle this */ + ASSERT(FALSE); + } + + /* More locked pages! */ + InterlockedIncrementSizeT(&MmSystemLockPagesCount); + + /* Update the reference count */ + NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); + if (NewRefCount != 1) + { + /* Someone had already locked the page, so undo our bump */ + ASSERT(NewRefCount < 2500); + InterlockedDecrementSizeT(&MmSystemLockPagesCount); + } +} + BOOLEAN NTAPI MmArmInitSystem( @@ -1425,13 +1694,6 @@ VOID NTAPI MiDecrementShareCount( - IN PMMPFN Pfn1, - IN PFN_NUMBER PageFrameIndex -); - -VOID -NTAPI -MiDecrementReferenceCount( IN PMMPFN Pfn1, IN PFN_NUMBER PageFrameIndex ); @@ -1739,34 +2001,4 @@ return 0; } -// -// New ARM3<->RosMM PAGE Architecture -// -BOOLEAN -FORCEINLINE -MiIsRosSectionObject(IN PVOID Section) -{ - PROS_SECTION_OBJECT RosSection = Section; - if ((RosSection->Type == 'SC') && (RosSection->Size == 'TN')) return TRUE; - return FALSE; -} - -#ifdef _WIN64 -// HACK ON TOP OF HACK ALERT!!! -#define MI_GET_ROS_DATA(x) \ - (((x)->RosMmData == 0) ? NULL : ((PMMROSPFN)((ULONG64)(ULONG)((x)->RosMmData) | \ - ((ULONG64)MmNonPagedPoolStart & 0xffffffff00000000ULL)))) -#else -#define MI_GET_ROS_DATA(x) ((PMMROSPFN)(x->RosMmData)) -#endif -#define MI_IS_ROS_PFN(x) (((x)->u4.AweAllocation == TRUE) && (MI_GET_ROS_DATA(x) != NULL)) -#define ASSERT_IS_ROS_PFN(x) ASSERT(MI_IS_ROS_PFN(x) == TRUE); -typedef struct _MMROSPFN -{ - PMM_RMAP_ENTRY RmapListHead; - SWAPENTRY SwapEntry; -} MMROSPFN, *PMMROSPFN; - -#define RosMmData AweReferenceCount - /* EOF */ 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] Fri Aug 3 11:34:35 2012 @@ -21,8 +21,6 @@ #if MI_TRACE_PFNS BOOLEAN UserPdeFault = FALSE; #endif - -LONG MmSystemLockPagesCount; /* PRIVATE FUNCTIONS **********************************************************/ @@ -505,7 +503,7 @@ IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, IN KIRQL OldIrql, - IN PMMPFN* LockedPfn) + IN PMMPFN* LockedProtoPfn) { MMPTE TempPte; PMMPTE OriginalPte, PageTablePte; @@ -569,8 +567,14 @@ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype != 0); } - /* Not yet handled by ReactOS */ - ASSERT(LockedPfn == NULL); + /* Did we get a locked incoming PFN? */ + if (*LockedProtoPfn) + { + /* Drop a reference */ + ASSERT((*LockedProtoPfn)->u3.e2.ReferenceCount >= 1); + MiDereferencePfnAndDropLockCount(*LockedProtoPfn); + *LockedProtoPfn = NULL; + } /* Release the PFN lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -630,7 +634,6 @@ PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - USHORT NewRefCount; DPRINT1("Transition fault on 0x%p with PTE 0x%lx in process %s\n", FaultingAddress, PointerPte, CurrentProcess->ImageFileName); /* Windowss does this check */ @@ -681,57 +684,14 @@ /* Otherwise, the page is removed from its list */ DPRINT1("Transition page in free/zero list\n"); MiUnlinkPageFromList(Pfn1); - - /* Windows does these checks -- perhaps a macro? */ - ASSERT(Pfn1->u2.ShareCount == 0); - ASSERT(Pfn1->u2.ShareCount == 0); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - - /* Check if this was a prototype PTE */ - if ((Pfn1->u3.e1.PrototypePte == 1) && - (Pfn1->OriginalPte.u.Soft.Prototype == 1)) - { - DPRINT1("Prototype floating page not yet supported\n"); - ASSERT(FALSE); - } - - /* Update counter */ - InterlockedIncrementSizeT(&MmSystemLockPagesCount); - - /* We must be the first reference */ - NewRefCount = InterlockedIncrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); - ASSERT(NewRefCount == 1); + MiReferenceUnusedPageAndBumpLockCount(Pfn1); } /* At this point, there should no longer be any in-page errors */ ASSERT(Pfn1->u4.InPageError == 0); /* Check if this was a PFN with no more share references */ - if (Pfn1->u2.ShareCount == 0) - { - /* Windows checks for these... maybe a macro? */ - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); - ASSERT(Pfn1->u2.ShareCount == 0); - - /* Was this the last active reference to it */ - DPRINT1("Page share count is zero\n"); - if (Pfn1->u3.e2.ReferenceCount == 1) - { - /* The page should be leaking somewhere on the free/zero list */ - DPRINT1("Page reference count is one\n"); - ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); - if ((Pfn1->u3.e1.PrototypePte == 1) && - (Pfn1->OriginalPte.u.Soft.Prototype == 1)) - { - /* Do extra processing if it was a prototype page */ - DPRINT1("Prototype floating page not yet supported\n"); - ASSERT(FALSE); - } - - /* Update counter */ - InterlockedDecrementSizeT(&MmSystemLockPagesCount); - } - } + if (Pfn1->u2.ShareCount == 0) MiDropLockCount(Pfn1); /* Bump the share count and make the page valid */ Pfn1->u2.ShareCount++; @@ -821,7 +781,7 @@ PointerPte, PointerProtoPte, OldIrql, - NULL); + OutPfn); } /* Make sure there's some protection mask */ @@ -897,7 +857,7 @@ PointerPte, PointerProtoPte, OldIrql, - NULL); + OutPfn); } NTSTATUS @@ -915,7 +875,7 @@ KIRQL OldIrql, LockIrql; NTSTATUS Status; PMMPTE SuperProtoPte; - PMMPFN Pfn1; + PMMPFN Pfn1, OutPfn = NULL; PFN_NUMBER PageFrameIndex, PteCount, ProcessedPtes; DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", Address, @@ -964,7 +924,7 @@ Address, PointerPte, PointerProtoPte, - NULL, + &OutPfn, NULL, NULL, Process, @@ -1010,14 +970,24 @@ while (TRUE) { /* For our current usage, this should be true */ - ASSERT(TempPte.u.Hard.Valid == 1); - ASSERT(TempPte.u.Soft.Prototype == 0); - ASSERT(TempPte.u.Soft.Transition == 0); - - /* Bump the share count on the PTE */ - PageFrameIndex = PFN_FROM_PTE(&TempPte); - Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); - Pfn1->u2.ShareCount++; + if (TempPte.u.Hard.Valid == 1) + { + /* Bump the share count on the PTE */ + PageFrameIndex = PFN_FROM_PTE(&TempPte); + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + Pfn1->u2.ShareCount++; + } + else if ((TempPte.u.Soft.Prototype == 0) && + (TempPte.u.Soft.Transition == 1)) + { + /* No standby support yet */ + ASSERT(FALSE); + } + else + { + /* Page is invalid, get out of the loop */ + break; + } /* One more done, was it the last? */ if (++ProcessedPtes == PteCount) @@ -1028,7 +998,7 @@ PointerPte, PointerProtoPte, LockIrql, - NULL); + &OutPfn); /* THIS RELEASES THE PFN LOCK! */ break; @@ -1038,21 +1008,62 @@ ASSERT(FALSE); } - /* Only path that we support for now */ - ASSERT(ProcessedPtes != 0); - - /* Bump the transition count */ - InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); - ProcessedPtes--; - - /* Loop all the processing we did */ - ASSERT(ProcessedPtes == 0); + /* Did we resolve the fault? */ + if (ProcessedPtes) + { + /* Bump the transition count */ + InterlockedExchangeAdd(&KeGetCurrentPrcb()->MmTransitionCount, ProcessedPtes); + ProcessedPtes--; + + /* Loop all the processing we did */ + ASSERT(ProcessedPtes == 0); + + /* Complete this as a transition fault */ + ASSERT(OldIrql == KeGetCurrentIrql()); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled() == TRUE); + return STATUS_PAGE_FAULT_TRANSITION; + } + + /* We did not -- PFN lock is still held, prepare to resolve prototype PTE fault */ + OutPfn = MI_PFN_ELEMENT(SuperProtoPte->u.Hard.PageFrameNumber); + MiReferenceUsedPageAndBumpLockCount(OutPfn); + ASSERT(OutPfn->u3.e2.ReferenceCount > 1); + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* Resolve the fault -- this will release the PFN lock */ + Status = MiResolveProtoPteFault(StoreInstruction, + Address, + PointerPte, + PointerProtoPte, + &OutPfn, + NULL, + NULL, + Process, + LockIrql, + TrapInformation); + ASSERT(Status == STATUS_SUCCESS); + + /* Did the routine clean out the PFN or should we? */ + if (OutPfn) + { + /* We had a locked PFN, so acquire the PFN lock to dereference it */ + ASSERT(PointerProtoPte != NULL); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Dereference the locked PFN */ + MiDereferencePfnAndDropLockCount(OutPfn); + ASSERT(OutPfn->u3.e2.ReferenceCount >= 1); + + /* And now release the lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } /* Complete this as a transition fault */ ASSERT(OldIrql == KeGetCurrentIrql()); ASSERT(OldIrql <= APC_LEVEL); ASSERT(KeAreAllApcsDisabled() == TRUE); - return STATUS_PAGE_FAULT_TRANSITION; + return Status; } } @@ -1729,8 +1740,46 @@ } else { - /* This path is not yet supported */ - ASSERT(FALSE); + /* Get the protection code and check if this is a proto PTE */ + ProtectionCode = TempPte.u.Soft.Protection; + DPRINT1("Code: %lx\n", ProtecitonCode); + if (TempPte.u.Soft.Prototype) + { + /* Do we need to go find the real PTE? */ + DPRINT1("Soft: %lx\n", TempPte.u.Soft.PageFileHigh); + if (TempPte.u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) + { + /* Get the prototype pte and VAD for it */ + ProtoPte = MiCheckVirtualAddress(Address, + &ProtectionCode, + &Vad); + DPRINT1("Address: %p ProtoP %p Code: %lx Vad: %p\n", Address, ProtoPte, ProtectionCode, Vad); + if (!ProtoPte) + { + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_ACCESS_VIOLATION; + } + } + else + { + /* Get the prototype PTE! */ + ProtoPte = MiProtoPteToPte(&TempPte); + + /* Is it read-only */ + if (TempPte.u.Proto.ReadOnly) + { + /* Set read-only code */ + ProtectionCode = MM_READONLY; + } + else + { + /* Set unknown protection */ + ProtectionCode = 0x100; + ASSERT(CurrentProcess->CloneRoot != NULL); + } + } + } } /* FIXME: Run MiAccessCheck */ 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] Fri Aug 3 11:34:35 2012 @@ -806,7 +806,6 @@ return Status; } - NTSTATUS NTAPI MiSessionCommitPageTables(IN PVOID StartVa, 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] Fri Aug 3 11:34:35 2012 @@ -1313,9 +1313,9 @@ OUT PVOID *NextVa) { - PMMPTE PointerPte; + PMMPTE PointerPte, ProtoPte; PMMPDE PointerPde; - MMPTE TempPte; + MMPTE TempPte, TempProtoPte; BOOLEAN DemandZeroPte = TRUE, ValidPte = FALSE; ULONG State = MEM_RESERVE, Protect = 0; ASSERT((Vad->StartingVpn <= ((ULONG_PTR)Va >> PAGE_SHIFT)) && @@ -1353,6 +1353,7 @@ if (ValidPte) { /* FIXME: watch out for large pages */ + ASSERT(PointerPde->u.Hard.LargePage == FALSE); /* Capture the PTE */ TempPte = *PointerPte; @@ -1375,6 +1376,11 @@ { /* This means it's committed */ State = MEM_COMMIT; + + /* We don't support these */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + ASSERT(Vad->u.VadFlags.VadType != VadRotatePhysical); + ASSERT(Vad->u.VadFlags.VadType != VadAwe); /* Get protection state of this page */ Protect = MiGetPageProtection(PointerPte); @@ -1395,11 +1401,35 @@ /* Check if this was a demand-zero PTE, since we need to find the state */ if (DemandZeroPte) { - /* Check if this is private commited memory, or an image-backed VAD */ + /* Not yet handled */ + ASSERT(Vad->u.VadFlags.VadType != VadDevicePhysicalMemory); + ASSERT(Vad->u.VadFlags.VadType != VadAwe); + + /* Check if this is private commited memory, or an section-backed VAD */ if ((Vad->u.VadFlags.PrivateMemory == 0) && (Vad->ControlArea)) { - DPRINT1("Not supported\n"); - ASSERT(FALSE); + /* Tell caller about the next range */ + *NextVa = (PVOID)((ULONG_PTR)Va + PAGE_SIZE); + + /* Get the prototype PTE for this VAD */ + ProtoPte = MI_GET_PROTOTYPE_PTE_FOR_VPN(Vad, + (ULONG_PTR)Va >> PAGE_SHIFT); + if (ProtoPte) + { + /* We should unlock the working set, but it's not being held! */ + + /* Is the prototype PTE actually valid (committed)? */ + TempProtoPte = *ProtoPte; + if (TempProtoPte.u.Long) + { + /* Unless this is a memory-mapped file, handle it like private VAD */ + State = MEM_COMMIT; + ASSERT(Vad->u.VadFlags.VadType != VadImageMap); + Protect = MmProtectToValue[Vad->u.VadFlags.Protection]; + } + + /* We should re-lock the working set */ + } } else if (Vad->u.VadFlags.MemCommit) {

12 years, 1 month

[cgutman] 57032: [NDIS] - Fix driver object dispatch table corruption in NdisMRegisterDevice See issue #7191 for more details.

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 3 08:23:02 2012 New Revision: 57032 URL: http://svn.reactos.org/svn/reactos?rev=57032&view=rev Log: [NDIS] - Fix driver object dispatch table corruption in NdisMRegisterDevice See issue #7191 for more details. Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Aug 3 08:23:02 2012 @@ -37,6 +37,7 @@ typedef struct _NDIS_M_DEVICE_BLOCK { PDEVICE_OBJECT DeviceObject; PNDIS_STRING SymbolicName; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION+1]; } NDIS_M_DEVICE_BLOCK, *PNDIS_M_DEVICE_BLOCK; /* resources allocated on behalf on the miniport */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 3 08:23:02 2012 @@ -2503,7 +2503,59 @@ return STATUS_SUCCESS; } - +NTSTATUS +NTAPI +NdisGenericIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Use the characteristics to classify the device */ + if (DeviceObject->DeviceType == FILE_DEVICE_PHYSICAL_NETCARD) + { + if ((IrpSp->MajorFunction == IRP_MJ_CREATE) || + (IrpSp->MajorFunction == IRP_MJ_CLOSE)) + { + return NdisICreateClose(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_PNP) + { + return NdisIDispatchPnp(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_SHUTDOWN) + { + return NdisIShutdown(DeviceObject, Irp); + } + else if (IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL) + { + return NdisIDeviceIoControl(DeviceObject, Irp); + } + } + else if (DeviceObject->DeviceType == FILE_DEVICE_NETWORK) + { + PNDIS_M_DEVICE_BLOCK DeviceBlock = DeviceObject->DeviceExtension; + + ASSERT(DeviceBlock->DeviceObject == DeviceObject); + + if (DeviceBlock->MajorFunction[IrpSp->MajorFunction] != NULL) + { + return DeviceBlock->MajorFunction[IrpSp->MajorFunction](DeviceObject, Irp); + } + } + else + { + ASSERT(FALSE); + } + + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_DEVICE_REQUEST; +} + /* * @implemented */ @@ -2527,6 +2579,7 @@ PNDIS_M_DRIVER_BLOCK Miniport = GET_MINIPORT_DRIVER(NdisWrapperHandle); PNDIS_M_DRIVER_BLOCK *MiniportPtr; NTSTATUS Status; + ULONG i; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -2649,11 +2702,12 @@ *MiniportPtr = Miniport; - Miniport->DriverObject->MajorFunction[IRP_MJ_CREATE] = NdisICreateClose; - Miniport->DriverObject->MajorFunction[IRP_MJ_CLOSE] = NdisICreateClose; - Miniport->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; - Miniport->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; - Miniport->DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NdisIDeviceIoControl; + /* We have to register for all of these so handler registered in NdisMRegisterDevice work */ + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + { + Miniport->DriverObject->MajorFunction[i] = NdisGenericIrpHandler; + } + Miniport->DriverObject->DriverExtension->AddDevice = NdisIAddDevice; return NDIS_STATUS_SUCCESS; @@ -3076,7 +3130,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); Status = IoCreateDevice(DriverBlock->DriverObject, - 0, /* This space is reserved for us. Should we use it? */ + sizeof(NDIS_M_DEVICE_BLOCK), DeviceName, FILE_DEVICE_NETWORK, 0, @@ -3098,7 +3152,7 @@ return Status; } - DeviceBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DEVICE_BLOCK)); + DeviceBlock = DeviceObject->DeviceExtension; if (!DeviceBlock) { @@ -3109,15 +3163,7 @@ } for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; - - DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; - - if (!DriverBlock->DriverObject->MajorFunction[IRP_MJ_CREATE]) - DriverBlock->DriverObject->MajorFunction[IRP_MJ_CREATE] = NdisICreateClose; - - if (!DriverBlock->DriverObject->MajorFunction[IRP_MJ_CLOSE]) - DriverBlock->DriverObject->MajorFunction[IRP_MJ_CLOSE] = NdisICreateClose; + DeviceBlock->MajorFunction[i] = MajorFunctions[i]; DeviceBlock->DeviceObject = DeviceObject; DeviceBlock->SymbolicName = SymbolicName; @@ -3147,8 +3193,6 @@ IoDeleteDevice(DeviceBlock->DeviceObject); IoDeleteSymbolicLink(DeviceBlock->SymbolicName); - - ExFreePool(DeviceBlock); return NDIS_STATUS_SUCCESS; }

12 years, 1 month

[tfaber] 57031: [KERNEL32] - Sync FormatMessage implementation to Wine 1.5.4. Fixes crash in kernel32_winetest:format_msg. See issue #7217 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Aug 3 06:38:44 2012 New Revision: 57031 URL: http://svn.reactos.org/svn/reactos?rev=57031&view=rev Log: [KERNEL32] - Sync FormatMessage implementation to Wine 1.5.4. Fixes crash in kernel32_winetest:format_msg. See issue #7217 for more details. Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c [iso-8859-1] Fri Aug 3 06:38:44 2012 @@ -70,7 +70,6 @@ * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 }; static const WCHAR FMTWSTR[] = { '%','s',0 }; /********************************************************************** @@ -138,15 +137,18 @@ if (*format != '!') /* simple string */ { arg = get_arg( insert, flags, args ); - if (unicode_caller) - { - WCHAR *str = (WCHAR *)arg; + if (unicode_caller || !arg) + { + static const WCHAR nullW[] = {'(','n','u','l','l',')',0}; + const WCHAR *str = (const WCHAR *)arg; + + if (!str) str = nullW; *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); strcpyW( *result, str ); } else { - char *str = (char *)arg; + const char *str = (const char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Aug 3 06:38:44 2012 @@ -233,10 +233,19 @@ reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 kernel32 - - reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync - reactos/dll/win32/kernel32/misc/profile.c # Out of sync - reactos/dll/win32/kernel32/misc/lcformat.c # Synced to Wine-1_3 - reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23 + reactos/dll/win32/kernel32/wine/actctx.c # Partly synced + reactos/dll/win32/kernel32/wine/comm.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/lzexpand.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/profile.c # Synced in r52754 + reactos/dll/win32/kernel32/wine/res.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/casemap.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/chartype.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/collation.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/format_msg.c # Synced to Wine-1.5.4 + reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 + reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced in r52754 msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528

12 years, 1 month

[fireball] 57030: [NTOS/MM] - Implement ProtectionMask validation in MiFlushTbAndCapture for cached and non-cached PFNs.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 2 22:34:51 2012 New Revision: 57030 URL: http://svn.reactos.org/svn/reactos?rev=57030&view=rev Log: [NTOS/MM] - Implement ProtectionMask validation in MiFlushTbAndCapture for cached and non-cached PFNs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c 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] Thu Aug 2 22:34:51 2012 @@ -1602,6 +1602,7 @@ { MMPTE TempPte, PreviousPte; KIRQL OldIrql; + BOOLEAN RebuildPte = FALSE; // // User for sanity checking later on @@ -1618,11 +1619,45 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); // - // We don't support I/O mappings in this path yet, and only cached memory + // We don't support I/O mappings in this path yet // ASSERT(Pfn1 != NULL); - ASSERT(Pfn1->u3.e1.CacheAttribute == MiCached); - ASSERT((ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) == 0); + ASSERT(Pfn1->u3.e1.CacheAttribute != MiWriteCombined); + + // + // Make sure new protection mask doesn't get in conflict and fix it if it does + // + if (Pfn1->u3.e1.CacheAttribute == MiCached) + { + // + // This is a cached PFN + // + if (ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) + { + RebuildPte = TRUE; + ProtectionMask &= ~(MM_NOCACHE | MM_NOACCESS); + } + } + else if (Pfn1->u3.e1.CacheAttribute == MiNonCached) + { + // + // This is a non-cached PFN + // + if ((ProtectionMask & (MM_NOCACHE | MM_NOACCESS)) != MM_NOCACHE) + { + RebuildPte = TRUE; + ProtectionMask &= ~MM_NOACCESS; + ProtectionMask |= MM_NOCACHE; + } + } + + if (RebuildPte) + { + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + ProtectionMask, + PreviousPte.u.Hard.PageFrameNumber); + } // // Write the new PTE, making sure we are only changing the bits

12 years, 1 month

[ekohl] 57029: [SAMLIB/SAMSRV] - Implement SamEnumerateGroupsInDomain and SamEnumerateUsersInDomain (ignore UserAccountControl). - Simplify SamrEnumerateAliasesInDomain.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Aug 2 20:09:24 2012 New Revision: 57029 URL: http://svn.reactos.org/svn/reactos?rev=57029&view=rev Log: [SAMLIB/SAMSRV] - Implement SamEnumerateGroupsInDomain and SamEnumerateUsersInDomain (ignore UserAccountControl). - Simplify SamrEnumerateAliasesInDomain. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Thu Aug 2 20:09:24 2012 @@ -159,7 +159,7 @@ { NTSTATUS Status; - TRACE("SamConnect(%p,%p,0x%08x,%p)\n", + TRACE("SamConnect(%p %p 0x%08x %p)\n", ServerName, ServerHandle, DesiredAccess, ObjectAttributes); RpcTryExcept @@ -188,7 +188,7 @@ { NTSTATUS Status; - TRACE("SamCreateAliasInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateAliasInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); RpcTryExcept @@ -219,7 +219,7 @@ { NTSTATUS Status; - TRACE("SamCreateGroupInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateGroupInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, GroupHandle, RelativeId); RpcTryExcept @@ -250,7 +250,7 @@ { NTSTATUS Status; - TRACE("SamCreateUserInDomain(%p,%p,0x%08x,%p,%p)\n", + TRACE("SamCreateUserInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, UserHandle, RelativeId); RpcTryExcept @@ -282,7 +282,7 @@ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; NTSTATUS Status; - TRACE("SamEnumerateAliasesInDomain(%p,%p,%p,%lu,%p)\n", + TRACE("SamEnumerateAliasesInDomain(%p %p %p %lu %p)\n", DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); @@ -332,7 +332,7 @@ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; NTSTATUS Status; - TRACE("SamEnumerateDomainsInSamServer(%p,%p,%p,%lu,%p)\n", + TRACE("SamEnumerateDomainsInSamServer(%p %p %p %lu %p)\n", ServerHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); @@ -360,6 +360,101 @@ midl_user_free(EnumBuffer); } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamEnumerateGroupsInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateGroupsInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + if (EnumerationContext == NULL || Buffer == NULL || CountReturned == NULL) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateGroupsInDomain((SAMPR_HANDLE)DomainHandle, + EnumerationContext, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + *Buffer = EnumBuffer->Buffer; + + midl_user_free(EnumBuffer); + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI +SamEnumerateUsersInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN ULONG UserAccountControl, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + NTSTATUS Status; + + TRACE("SamEnumerateUsersInDomain(%p %p %lx %p %lu %p)\n", + DomainHandle, EnumerationContext, UserAccountControl, Buffer, + PreferedMaximumLength, CountReturned); + + if (EnumerationContext == NULL || Buffer == NULL || CountReturned == NULL) + return STATUS_INVALID_PARAMETER; + + *Buffer = NULL; + + RpcTryExcept + { + Status = SamrEnumerateUsersInDomain((SAMPR_HANDLE)DomainHandle, + EnumerationContext, + UserAccountControl, + (PSAMPR_ENUMERATION_BUFFER *)&EnumBuffer, + PreferedMaximumLength, + CountReturned); + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + *Buffer = EnumBuffer->Buffer; + } + + midl_user_free(EnumBuffer); + } + } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -483,7 +578,7 @@ { NTSTATUS Status; - TRACE("SamLookupDomainInSamServer(%p,%p,%p)\n", + TRACE("SamLookupDomainInSamServer(%p %p %p)\n", ServerHandle, Name, DomainId); RpcTryExcept @@ -553,7 +648,7 @@ { NTSTATUS Status; - TRACE("SamOpenDomain(%p,0x%08x,%p,%p)\n", + TRACE("SamOpenDomain(%p 0x%08x %p %p)\n", ServerHandle, DesiredAccess, DomainId, DomainHandle); RpcTryExcept @@ -582,7 +677,7 @@ { NTSTATUS Status; - TRACE("SamOpenGroup(%p,0x%08x,%p,%p)\n", + TRACE("SamOpenGroup(%p 0x%08x %p %p)\n", DomainHandle, DesiredAccess, GroupId, GroupHandle); RpcTryExcept @@ -611,7 +706,7 @@ { NTSTATUS Status; - TRACE("SamOpenUser(%p,0x%08x,%lx,%p)\n", + TRACE("SamOpenUser(%p 0x%08x %lx %p)\n", DomainHandle, DesiredAccess, UserId, UserHandle); RpcTryExcept @@ -770,18 +865,18 @@ NTAPI SamSetInformationDomain(IN SAM_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, - IN PVOID DomainInformation) + IN PVOID Buffer) { NTSTATUS Status; TRACE("SamSetInformationDomain(%p %lu %p)\n", - DomainHandle, DomainInformationClass, DomainInformation); + DomainHandle, DomainInformationClass, Buffer); RpcTryExcept { Status = SamrSetInformationDomain((SAMPR_HANDLE)DomainHandle, DomainInformationClass, - DomainInformation); + Buffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Thu Aug 2 20:09:24 2012 @@ -16,8 +16,8 @@ @ stub SamDeleteUser @ stdcall SamEnumerateAliasesInDomain(ptr ptr ptr long ptr) @ stdcall SamEnumerateDomainsInSamServer(ptr ptr ptr long ptr) -@ stub SamEnumerateGroupsInDomain -@ stub SamEnumerateUsersInDomain +@ stdcall SamEnumerateGroupsInDomain(ptr ptr ptr long ptr) +@ stdcall SamEnumerateUsersInDomain(ptr ptr long ptr long ptr) @ stdcall SamFreeMemory(ptr) @ stdcall SamGetAliasMembership(ptr long ptr ptr ptr) @ stub SamGetCompatibilityMode Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Thu Aug 2 20:09:24 2012 @@ -1696,8 +1696,197 @@ IN unsigned long PreferedMaximumLength, OUT unsigned long *CountReturned) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + PSAM_DB_OBJECT DomainObject; + HANDLE GroupsKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR GroupName[64]; + ULONG EnumIndex; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; + ULONG DataLength; + ULONG Rid; + ULONG i; + BOOLEAN MoreEntries = FALSE; + NTSTATUS Status; + + TRACE("SamrEnumerateUsersInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LIST_ACCOUNTS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &GroupsKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(GroupsKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; + + TRACE("Part 1\n"); + + EnumIndex = *EnumerationContext; + + while (TRUE) + { + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + GroupName, + &NameLength, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Group name: %S\n", GroupName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + if (!NT_SUCCESS(Status)) + goto done; + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + if (EnumCount == 0) + goto done; + + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Part 2\n"); + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + GroupName, + &NameLength, + NULL, + &Rid, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Group name: %S\n", GroupName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + GroupName, + EnumBuffer->Buffer[i].Name.Length); +#endif + } + +done: + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + else + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (GroupsKeyHandle != NULL) + SampRegCloseKey(GroupsKeyHandle); + + if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) + Status = STATUS_MORE_ENTRIES; + + return Status; } @@ -1968,171 +2157,24 @@ IN unsigned long PreferedMaximumLength, OUT unsigned long *CountReturned) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* Function 14 */ -NTSTATUS -NTAPI -SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, - IN PRPC_UNICODE_STRING AccountName, - IN ACCESS_MASK DesiredAccess, - OUT SAMPR_HANDLE *AliasHandle, - OUT unsigned long *RelativeId) -{ - SAM_DOMAIN_FIXED_DATA FixedDomainData; - PSAM_DB_OBJECT DomainObject; - PSAM_DB_OBJECT AliasObject; - UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); - ULONG ulSize; - ULONG ulRid; - WCHAR szRid[9]; - NTSTATUS Status; - - TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", - DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); - - /* Validate the domain handle */ - Status = SampValidateDbObject(DomainHandle, - SamDbDomainObject, - DOMAIN_CREATE_ALIAS, - &DomainObject); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Check if the alias name already exists in the domain */ - Status = SampCheckAccountNameInDomain(DomainObject, - AccountName->Buffer); - if (!NT_SUCCESS(Status)) - { - TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", - AccountName->Buffer, Status); - return Status; - } - - /* Get the fixed domain attributes */ - ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); - Status = SampGetObjectAttribute(DomainObject, - L"F", - NULL, - (PVOID)&FixedDomainData, - &ulSize); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Increment the NextRid attribute */ - ulRid = FixedDomainData.NextRid; - FixedDomainData.NextRid++; - - /* Store the fixed domain attributes */ - Status = SampSetObjectAttribute(DomainObject, - L"F", - REG_BINARY, - &FixedDomainData, - ulSize); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - TRACE("RID: %lx\n", ulRid); - - /* Convert the RID into a string (hex) */ - swprintf(szRid, L"%08lX", ulRid); - - /* Create the alias object */ - Status = SampCreateDbObject(DomainObject, - L"Aliases", - szRid, - SamDbAliasObject, - DesiredAccess, - &AliasObject); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Add the account name for the alias object */ - Status = SampSetAccountNameInDomain(DomainObject, - L"Aliases", - AccountName->Buffer, - ulRid); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Set the Name attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Name", - REG_SZ, - (LPVOID)AccountName->Buffer, - AccountName->MaximumLength); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - /* Set the Description attribute */ - Status = SampSetObjectAttribute(AliasObject, - L"Description", - REG_SZ, - EmptyString.Buffer, - EmptyString.MaximumLength); - if (!NT_SUCCESS(Status)) - { - TRACE("failed with status 0x%08lx\n", Status); - return Status; - } - - if (NT_SUCCESS(Status)) - { - *AliasHandle = (SAMPR_HANDLE)AliasObject; - *RelativeId = ulRid; - } - - TRACE("returns with status 0x%08lx\n", Status); - - return Status; -} - -/* Function 15 */ -NTSTATUS -NTAPI -SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, - IN OUT unsigned long *EnumerationContext, - OUT PSAMPR_ENUMERATION_BUFFER *Buffer, - IN unsigned long PreferedMaximumLength, - OUT unsigned long *CountReturned) -{ PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; PSAM_DB_OBJECT DomainObject; - HANDLE AliasesKeyHandle; - WCHAR AliasKeyName[64]; - HANDLE AliasKeyHandle; + HANDLE UsersKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR UserName[64]; ULONG EnumIndex; - ULONG EnumCount; - ULONG RequiredLength; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; ULONG DataLength; + ULONG Rid; ULONG i; BOOLEAN MoreEntries = FALSE; NTSTATUS Status; - TRACE("SamrEnumerateAliasesInDomain(%p %p %p %lu %p)\n", - DomainHandle, EnumerationContext, Buffer, PreferedMaximumLength, - CountReturned); + TRACE("SamrEnumerateUsersInDomain(%p %p %lx %p %lu %p)\n", + DomainHandle, EnumerationContext, UserAccountControl, Buffer, + PreferedMaximumLength, CountReturned); /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, @@ -2143,24 +2185,33 @@ return Status; Status = SampRegOpenKey(DomainObject->KeyHandle, - L"Aliases", + L"Users", KEY_READ, - &AliasesKeyHandle); - if (!NT_SUCCESS(Status)) - return Status; + &UsersKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(UsersKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; TRACE("Part 1\n"); EnumIndex = *EnumerationContext; - EnumCount = 0; - RequiredLength = 0; while (TRUE) { - Status = SampRegEnumerateSubKey(AliasesKeyHandle, - EnumIndex, - 64 * sizeof(WCHAR), - AliasKeyName); + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + UserName, + &NameLength, + NULL, + NULL, + NULL); if (!NT_SUCCESS(Status)) { if (Status == STATUS_NO_MORE_ENTRIES) @@ -2169,40 +2220,17 @@ } TRACE("EnumIndex: %lu\n", EnumIndex); - TRACE("Alias key name: %S\n", AliasKeyName); - - Status = SampRegOpenKey(AliasesKeyHandle, - AliasKeyName, - KEY_READ, - &AliasKeyHandle); - TRACE("SampRegOpenKey returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - DataLength = 0; - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - NULL, - &DataLength); - - NtClose(AliasKeyHandle); - - TRACE("SampRegQueryValue returned %08lX\n", Status); - - if (NT_SUCCESS(Status)) - { - TRACE("Data length: %lu\n", DataLength); - - if ((RequiredLength + DataLength + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) - { - MoreEntries = TRUE; - break; - } - - RequiredLength += (DataLength + sizeof(SAMPR_RID_ENUMERATION)); - EnumCount++; - } - } + TRACE("User name: %S\n", UserName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; EnumIndex++; } @@ -2210,6 +2238,9 @@ TRACE("EnumCount: %lu\n", EnumCount); TRACE("RequiredLength: %lu\n", RequiredLength); + if (!NT_SUCCESS(Status)) + goto done; + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); if (EnumBuffer == NULL) { @@ -2233,10 +2264,15 @@ EnumIndex = *EnumerationContext; for (i = 0; i < EnumCount; i++, EnumIndex++) { - Status = SampRegEnumerateSubKey(AliasesKeyHandle, - EnumIndex, - 64 * sizeof(WCHAR), - AliasKeyName); + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + UserName, + &NameLength, + NULL, + &Rid, + &DataLength); if (!NT_SUCCESS(Status)) { if (Status == STATUS_NO_MORE_ENTRIES) @@ -2245,53 +2281,28 @@ } TRACE("EnumIndex: %lu\n", EnumIndex); - TRACE("Alias key name: %S\n", AliasKeyName); - - Status = SampRegOpenKey(AliasesKeyHandle, - AliasKeyName, - KEY_READ, - &AliasKeyHandle); - TRACE("SampRegOpenKey returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - DataLength = 0; - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - NULL, - &DataLength); - TRACE("SampRegQueryValue returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - EnumBuffer->Buffer[i].RelativeId = wcstoul(AliasKeyName, NULL, 16); - - EnumBuffer->Buffer[i].Name.Length = (USHORT)DataLength - sizeof(WCHAR); - EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)DataLength; - EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(DataLength); - if (EnumBuffer->Buffer[i].Name.Buffer == NULL) - { - NtClose(AliasKeyHandle); - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - Status = SampRegQueryValue(AliasKeyHandle, - L"Name", - NULL, - EnumBuffer->Buffer[i].Name.Buffer, - &DataLength); - TRACE("SampRegQueryValue returned %08lX\n", Status); - if (NT_SUCCESS(Status)) - { - TRACE("Alias name: %S\n", EnumBuffer->Buffer[i].Name.Buffer); - } - } - - NtClose(AliasKeyHandle); - - if (!NT_SUCCESS(Status)) - goto done; - } + TRACE("User name: %S\n", UserName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + UserName, + EnumBuffer->Buffer[i].Name.Length); +#endif } done: @@ -2301,8 +2312,7 @@ *Buffer = EnumBuffer; *CountReturned = EnumCount; } - - if (!NT_SUCCESS(Status)) + else { *EnumerationContext = 0; *Buffer = NULL; @@ -2328,13 +2338,357 @@ } } - NtClose(AliasesKeyHandle); + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (UsersKeyHandle != NULL) + SampRegCloseKey(UsersKeyHandle); if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) Status = STATUS_MORE_ENTRIES; return Status; } + + +/* Function 14 */ +NTSTATUS +NTAPI +SamrCreateAliasInDomain(IN SAMPR_HANDLE DomainHandle, + IN PRPC_UNICODE_STRING AccountName, + IN ACCESS_MASK DesiredAccess, + OUT SAMPR_HANDLE *AliasHandle, + OUT unsigned long *RelativeId) +{ + SAM_DOMAIN_FIXED_DATA FixedDomainData; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT AliasObject; + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrCreateAliasInDomain(%p %p %lx %p %p)\n", + DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_ALIAS, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Check if the alias name already exists in the domain */ + Status = SampCheckAccountNameInDomain(DomainObject, + AccountName->Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", + AccountName->Buffer, Status); + return Status; + } + + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedDomainData, + &ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* Create the alias object */ + Status = SampCreateDbObject(DomainObject, + L"Aliases", + szRid, + SamDbAliasObject, + DesiredAccess, + &AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the account name for the alias object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Aliases", + AccountName->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Name attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Name", + REG_SZ, + (LPVOID)AccountName->Buffer, + AccountName->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Description attribute */ + Status = SampSetObjectAttribute(AliasObject, + L"Description", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + if (NT_SUCCESS(Status)) + { + *AliasHandle = (SAMPR_HANDLE)AliasObject; + *RelativeId = ulRid; + } + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; +} + + +/* Function 15 */ +NTSTATUS +NTAPI +SamrEnumerateAliasesInDomain(IN SAMPR_HANDLE DomainHandle, + IN OUT unsigned long *EnumerationContext, + OUT PSAMPR_ENUMERATION_BUFFER *Buffer, + IN unsigned long PreferedMaximumLength, + OUT unsigned long *CountReturned) +{ + PSAMPR_ENUMERATION_BUFFER EnumBuffer = NULL; + PSAM_DB_OBJECT DomainObject; + HANDLE AliasesKeyHandle = NULL; + HANDLE NamesKeyHandle = NULL; + WCHAR AliasName[64]; + ULONG EnumIndex; + ULONG EnumCount = 0; + ULONG RequiredLength = 0; + ULONG NameLength; + ULONG DataLength; + ULONG Rid; + ULONG i; + BOOLEAN MoreEntries = FALSE; + NTSTATUS Status; + + TRACE("SamrEnumerateAliasesInDomain(%p %p %p %lu %p)\n", + DomainHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LIST_ACCOUNTS, + &DomainObject); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AliasesKeyHandle); + if (!NT_SUCCESS(Status)) + return Status; + + Status = SampRegOpenKey(AliasesKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (!NT_SUCCESS(Status)) + goto done; + + TRACE("Part 1\n"); + + EnumIndex = *EnumerationContext; + + while (TRUE) + { + NameLength = 64 * sizeof(WCHAR); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + AliasName, + &NameLength, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Alias name: %S\n", AliasName); + TRACE("Name length: %lu\n", NameLength); + + if ((RequiredLength + NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)) > PreferedMaximumLength) + { + MoreEntries = TRUE; + break; + } + + RequiredLength += (NameLength + sizeof(UNICODE_NULL) + sizeof(SAMPR_RID_ENUMERATION)); + EnumCount++; + + EnumIndex++; + } + + TRACE("EnumCount: %lu\n", EnumCount); + TRACE("RequiredLength: %lu\n", RequiredLength); + + if (!NT_SUCCESS(Status)) + goto done; + + EnumBuffer = midl_user_allocate(sizeof(SAMPR_ENUMERATION_BUFFER)); + if (EnumBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + EnumBuffer->EntriesRead = EnumCount; + if (EnumCount == 0) + goto done; + + EnumBuffer->Buffer = midl_user_allocate(EnumCount * sizeof(SAMPR_RID_ENUMERATION)); + if (EnumBuffer->Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + TRACE("Part 2\n"); + + EnumIndex = *EnumerationContext; + for (i = 0; i < EnumCount; i++, EnumIndex++) + { + NameLength = 64 * sizeof(WCHAR); + DataLength = sizeof(ULONG); + Status = SampRegEnumerateValue(NamesKeyHandle, + EnumIndex, + AliasName, + &NameLength, + NULL, + &Rid, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Alias name: %S\n", AliasName); + TRACE("Name length: %lu\n", NameLength); + TRACE("RID: %lu\n", Rid); + + EnumBuffer->Buffer[i].RelativeId = Rid; + + EnumBuffer->Buffer[i].Name.Length = (USHORT)NameLength; + EnumBuffer->Buffer[i].Name.MaximumLength = (USHORT)(DataLength + sizeof(UNICODE_NULL)); + +/* FIXME: Disabled because of bugs in widl and rpcrt4 */ +#if 0 + EnumBuffer->Buffer[i].Name.Buffer = midl_user_allocate(EnumBuffer->Buffer[i].Name.MaximumLength); + if (EnumBuffer->Buffer[i].Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + memcpy(EnumBuffer->Buffer[i].Name.Buffer, + AliasName, + EnumBuffer->Buffer[i].Name.Length); +#endif + } + +done: + if (NT_SUCCESS(Status)) + { + *EnumerationContext += EnumCount; + *Buffer = EnumBuffer; + *CountReturned = EnumCount; + } + else + { + *EnumerationContext = 0; + *Buffer = NULL; + *CountReturned = 0; + + if (EnumBuffer != NULL) + { + if (EnumBuffer->Buffer != NULL) + { + if (EnumBuffer->EntriesRead != 0) + { + for (i = 0; i < EnumBuffer->EntriesRead; i++) + { + if (EnumBuffer->Buffer[i].Name.Buffer != NULL) + midl_user_free(EnumBuffer->Buffer[i].Name.Buffer); + } + } + + midl_user_free(EnumBuffer->Buffer); + } + + midl_user_free(EnumBuffer); + } + } + + if (NamesKeyHandle != NULL) + SampRegCloseKey(NamesKeyHandle); + + if (AliasesKeyHandle != NULL) + SampRegCloseKey(AliasesKeyHandle); + + if ((Status == STATUS_SUCCESS) && (MoreEntries == TRUE)) + Status = STATUS_MORE_ENTRIES; + + return Status; +} + /* Function 16 */ NTSTATUS Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Thu Aug 2 20:09:24 2012 @@ -375,6 +375,23 @@ NTSTATUS NTAPI +SamEnumerateGroupsInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI +SamEnumerateUsersInDomain(IN SAM_HANDLE DomainHandle, + IN OUT PSAM_ENUMERATE_HANDLE EnumerationContext, + IN ULONG UserAccountControl, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned); + +NTSTATUS +NTAPI SamFreeMemory(IN PVOID Buffer); NTSTATUS

12 years, 1 month

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 August 2012