Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 71391: [NTOS/MM] - Implement MmProbeAndLockProcessPages
by jgardou＠svn.reactos.org 23 May '16

23 May '16

Author: jgardou Date: Mon May 23 20:33:03 2016 New Revision: 71391 URL: http://svn.reactos.org/svn/reactos?rev=71391&view=rev Log: [NTOS/MM] - Implement MmProbeAndLockProcessPages Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/mdlsup.c Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Mon May 23 20:33:03 2016 @@ -1326,16 +1326,56 @@ } /* - * @unimplemented + * @implemented */ VOID NTAPI -MmProbeAndLockProcessPages(IN OUT PMDL MemoryDescriptorList, +MmProbeAndLockProcessPages(IN OUT PMDL Mdl, IN PEPROCESS Process, IN KPROCESSOR_MODE AccessMode, IN LOCK_OPERATION Operation) { - UNIMPLEMENTED; + PVOID Address; + NTSTATUS Status = STATUS_SUCCESS; + + BOOLEAN Attach; + KAPC_STATE ApcState; + + DPRINT("Probing MDL: %p for process %p\n", Mdl, Process); + // + // Get address information, to see if we really need to attach + // + Address = (PVOID)((ULONG_PTR)Mdl->StartVa + Mdl->ByteOffset); + + Attach = ((Process != PsGetCurrentProcess()) && (Address <= (PVOID)MM_USER_PROBE_ADDRESS)); + if (Attach) + { + KeStackAttachProcess(&Process->Pcb, &ApcState); + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, AccessMode, Operation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + // + // Oops :( + // + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (Attach) + { + KeUnstackDetachProcess(&ApcState); + } + + if (!NT_SUCCESS(Status)) + { + /* If the operation failed while we were attached, forward it to the caller */ + ExRaiseStatus(Status); + } }

1 0

[jgardou] 71390: [CDFS_NEW] - The usual forgotten file
by jgardou＠svn.reactos.org 23 May '16

23 May '16

Author: jgardou Date: Mon May 23 20:18:20 2016 New Revision: 71390 URL: http://svn.reactos.org/svn/reactos?rev=71390&view=rev Log: [CDFS_NEW] - The usual forgotten file Added: branches/TransitionPte/drivers/filesystems/cdfs_new/CMakeLists.txt (with props) Added: branches/TransitionPte/drivers/filesystems/cdfs_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/CMakeLists.txt (added) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/CMakeLists.txt [iso-8859-1] Mon May 23 20:18:20 2016 @@ -0,0 +1,40 @@ + +# include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) + +list(APPEND SOURCE + allocsup.c + cachesup.c + cddata.c + cdinit.c + cleanup.c + close.c + create.c + devctrl.c + deviosup.c + dirctrl.c + dirsup.c +# fieldoff.c #useless + fileinfo.c + filobsup.c + fsctrl.c + fspdisp.c + lockctrl.c + namesup.c + pathsup.c + pnp.c + prefxsup.c + read.c + resrcsup.c + strucsup.c + verfysup.c + volinfo.c + workque.c + cdprocs.h) + +add_library(cdfs SHARED ${SOURCE} cdfs.rc) +set_module_type(cdfs kernelmodedriver) +target_link_libraries(cdfs memcmp ${PSEH_LIB}) +add_importlibs(cdfs ntoskrnl hal) +add_pch(cdfs cdprocs.h SOURCE) +add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(cdfs_reg.inf) Propchange: branches/TransitionPte/drivers/filesystems/cdfs_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jgardou] 71389: [NEWCC] - Create section object when creating the file shared cache map - Map the said section PsInitialSystemProcess address space and map it in kernel space using MmProbeAndLockP...
by jgardou＠svn.reactos.org 23 May '16

23 May '16

Author: jgardou Date: Mon May 23 20:15:54 2016 New Revision: 71389 URL: http://svn.reactos.org/svn/reactos?rev=71389&view=rev Log: [NEWCC] - Create section object when creating the file shared cache map - Map the said section PsInitialSystemProcess address space and map it in kernel space using MmProbeAndLockProcessPages - Implement CcSetFileSizes on top of MmExtendSection Modified: branches/TransitionPte/ntoskrnl/cache/cachesub.c branches/TransitionPte/ntoskrnl/cache/fssup.c branches/TransitionPte/ntoskrnl/cache/newcc.h branches/TransitionPte/ntoskrnl/cache/pinsup.c branches/TransitionPte/ntoskrnl/cache/section/data.c Modified: branches/TransitionPte/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/cache/ca… ============================================================================== --- branches/TransitionPte/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/cache/cachesub.c [iso-8859-1] Mon May 23 20:15:54 2016 @@ -64,6 +64,10 @@ PLIST_ENTRY ListEntry; volatile char *chptr; PNOCC_BCB Bcb; + KAPC_STATE ApcState; + + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + for (ListEntry = Map->AssociatedBcb.Flink; ListEntry != &Map->AssociatedBcb; ListEntry = ListEntry->Flink) @@ -81,6 +85,8 @@ *chptr ^= 0; } } + + KeUnstackDetachProcess(&ApcState); } ObDereferenceObject(WorkItem->FileObject); ExFreePool(WorkItem); @@ -306,13 +312,13 @@ for (i = 0; i < CACHE_NUM_SECTIONS; i++) { PNOCC_BCB Bcb = &CcCacheSections[i]; - if (Bcb->SectionObject) + if (Bcb->Map->SectionObject) { DPRINT1("Evicting #%02x %08x%08x %wZ\n", i, Bcb->FileOffset.u.HighPart, Bcb->FileOffset.u.LowPart, - &MmGetFileObjectForSection((PROS_SECTION_OBJECT)Bcb->SectionObject)->FileName); + &MmGetFileObjectForSection(Bcb->Map->SectionObject)->FileName); CcpFlushCache(Bcb->Map, NULL, 0, NULL, TRUE); Bcb->Dirty = FALSE; Modified: branches/TransitionPte/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/cache/fs… ============================================================================== --- branches/TransitionPte/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/cache/fssup.c [iso-8859-1] Mon May 23 20:15:54 2016 @@ -218,6 +218,9 @@ /* We still don't have a shared cache map. We need to create one. */ if (!Map) { + NTSTATUS Status; + LARGE_INTEGER MaxSize = FileSizes->AllocationSize; + DPRINT("Initializing file object for (%p) %wZ\n", FileObject, &FileObject->FileName); @@ -237,6 +240,20 @@ InitializeListHead(&Map->PrivateCacheMaps); InsertTailList(&CcpAllSharedCacheMaps, &Map->Entry); DPRINT("New Map %p\n", Map); + + Status = MmCreateSection(&Map->SectionObject, + STANDARD_RIGHTS_REQUIRED | SECTION_EXTEND_SIZE, + NULL, + &MaxSize, + PAGE_READWRITE, + SEC_RESERVE, // Use ARM3 implementation + NULL, + FileObject); + if (!NT_SUCCESS(Status)) + { + ExFreePool(Map); + RtlRaiseStatus(Status); + } } /* We don't have a private cache map. Link it with the shared cache map to serve as a held reference. When the list in the shared cache map @@ -325,6 +342,7 @@ CcpDereferenceCache(Bcb - CcCacheSections, TRUE); } RemoveEntryList(&PrivateCacheMap->Map->Entry); + ObDereferenceObject(PrivateCacheMap->Map->SectionObject); ExFreePool(PrivateCacheMap->Map); FileObject->SectionObjectPointer->SharedCacheMap = NULL; LastMap = TRUE; @@ -354,18 +372,36 @@ CcSetFileSizes(IN PFILE_OBJECT FileObject, IN PCC_FILE_SIZES FileSizes) { - PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; - PNOCC_BCB Bcb; - - if (!Map) return; + PNOCC_CACHE_MAP Map; + + CcpLock(); + + Map = FileObject->SectionObjectPointer->SharedCacheMap; + + if (!Map) + { + CcpUnlock(); + return; + } + + /* FS should have unmapped the whole thing. */ + //ASSERT(IsListEmpty(&Map->AssociatedBcb)); + + if (Map->FileSizes.AllocationSize.QuadPart != FileSizes->AllocationSize.QuadPart) + { + LARGE_INTEGER SectionSize = FileSizes->AllocationSize; + NTSTATUS Status = MmExtendSection(Map->SectionObject, &SectionSize); + + if (!NT_SUCCESS(Status)) + { + CcpUnlock(); + ExRaiseStatus(Status); + } + } + Map->FileSizes = *FileSizes; - Bcb = Map->AssociatedBcb.Flink == &Map->AssociatedBcb ? - NULL : CONTAINING_RECORD(Map->AssociatedBcb.Flink, NOCC_BCB, ThisFileList); - if (!Bcb) return; - MmExtendCacheSection(Bcb->SectionObject, &FileSizes->FileSize, FALSE); - DPRINT("FileSizes->FileSize %x\n", FileSizes->FileSize.LowPart); - DPRINT("FileSizes->AllocationSize %x\n", FileSizes->AllocationSize.LowPart); - DPRINT("FileSizes->ValidDataLength %x\n", FileSizes->ValidDataLength.LowPart); + + CcpUnlock(); } BOOLEAN @@ -612,7 +648,7 @@ NOCC_BCB, ThisFileList); - Result = MmGetFileObjectForSection((PROS_SECTION_OBJECT)Bcb->SectionObject); + Result = MmGetFileObjectForSection(Bcb->Map->SectionObject); } CcpUnlock(); return Result; @@ -624,7 +660,7 @@ { PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; DPRINT("BCB #%x\n", RealBcb - CcCacheSections); - return MmGetFileObjectForSection((PROS_SECTION_OBJECT)RealBcb->SectionObject); + return MmGetFileObjectForSection(RealBcb->Map->SectionObject); } /* EOF */ Modified: branches/TransitionPte/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/cache/ne… ============================================================================== --- branches/TransitionPte/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/cache/newcc.h [iso-8859-1] Mon May 23 20:15:54 2016 @@ -6,12 +6,14 @@ PUBLIC_BCB Bcb; struct _NOCC_CACHE_MAP *Map; - PROS_SECTION_OBJECT SectionObject; LARGE_INTEGER FileOffset; ULONG Length; PVOID BaseAddress; BOOLEAN Dirty; PVOID OwnerPointer; + + PMDL Mdl; + PVOID MdlAddress; /* Reference counts */ ULONG RefCount; @@ -36,6 +38,7 @@ PVOID LogHandle; PFLUSH_TO_LSN FlushToLsn; ULONG ReadAheadGranularity; + PVOID SectionObject; } NOCC_CACHE_MAP, *PNOCC_CACHE_MAP; VOID Modified: branches/TransitionPte/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/cache/pi… ============================================================================== --- branches/TransitionPte/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/cache/pinsup.c [iso-8859-1] Mon May 23 20:15:54 2016 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -#define NDEBUG +//#define NDEBUG #include <debug.h> /* The following is a test mode that only works with modified filesystems. @@ -128,47 +128,12 @@ NTAPI MmGetDeviceObjectForFile(IN PFILE_OBJECT FileObject); -/* - -Allocate an almost ordinary section object for use by the cache system. -The special internal SEC_CACHE flag is used to indicate that the section -should not count when determining whether the file can be resized. - -*/ - -NTSTATUS -CcpAllocateSection(PFILE_OBJECT FileObject, - ULONG Length, - ULONG Protect, - PROS_SECTION_OBJECT *Result) -{ - NTSTATUS Status; - LARGE_INTEGER MaxSize; - - MaxSize.QuadPart = Length; - - DPRINT("Making Section for File %x\n", FileObject); - DPRINT("File name %wZ\n", &FileObject->FileName); - - Status = MmCreateSection((PVOID*)Result, - STANDARD_RIGHTS_REQUIRED, - NULL, - &MaxSize, - Protect, - SEC_RESERVE | SEC_CACHE, - NULL, - FileObject); - - return Status; -} - typedef struct _WORK_QUEUE_WITH_CONTEXT { WORK_QUEUE_ITEM WorkItem; PVOID ToUnmap; LARGE_INTEGER FileOffset; LARGE_INTEGER MapSize; - PROS_SECTION_OBJECT ToDeref; PACQUIRE_FOR_LAZY_WRITE AcquireForLazyWrite; PRELEASE_FROM_LAZY_WRITE ReleaseFromLazyWrite; PVOID LazyContext; @@ -188,8 +153,7 @@ { PWORK_QUEUE_WITH_CONTEXT WorkItem = (PWORK_QUEUE_WITH_CONTEXT)Context; DPRINT("Unmapping (finally) %x\n", WorkItem->ToUnmap); - MmUnmapCacheViewInSystemSpace(WorkItem->ToUnmap); - ObDereferenceObject(WorkItem->ToDeref); + MmUnmapViewOfSection(PsInitialSystemProcess, WorkItem->ToUnmap); ExFreePool(WorkItem); DPRINT("Done\n"); } @@ -230,7 +194,7 @@ MappedSize = Bcb->Map->FileSizes.ValidDataLength; DPRINT("Dereference #%x (count %d)\n", Start, Bcb->RefCount); - ASSERT(Bcb->SectionObject); + ASSERT(Bcb->Map->SectionObject); ASSERT(Bcb->RefCount == 1); DPRINT("Firing work item for %x\n", Bcb->BaseAddress); @@ -245,9 +209,7 @@ if (Immediate) { - PROS_SECTION_OBJECT ToDeref = Bcb->SectionObject; Bcb->Map = NULL; - Bcb->SectionObject = NULL; Bcb->BaseAddress = NULL; Bcb->FileOffset.QuadPart = 0; Bcb->Length = 0; @@ -256,8 +218,7 @@ RemoveEntryList(&Bcb->ThisFileList); CcpUnlock(); - MmUnmapCacheViewInSystemSpace(ToUnmap); - ObDereferenceObject(ToDeref); + MmUnmapViewOfSection(PsInitialSystemProcess, ToUnmap); CcpLock(); } else @@ -268,7 +229,6 @@ WorkItem->FileOffset = Bcb->FileOffset; WorkItem->Dirty = Bcb->Dirty; WorkItem->MapSize = MappedSize; - WorkItem->ToDeref = Bcb->SectionObject; WorkItem->AcquireForLazyWrite = Bcb->Map->Callbacks.AcquireForLazyWrite; WorkItem->ReleaseFromLazyWrite = Bcb->Map->Callbacks.ReleaseFromLazyWrite; WorkItem->LazyContext = Bcb->Map->LazyContext; @@ -278,7 +238,6 @@ WorkItem); Bcb->Map = NULL; - Bcb->SectionObject = NULL; Bcb->BaseAddress = NULL; Bcb->FileOffset.QuadPart = 0; Bcb->Length = 0; @@ -308,7 +267,7 @@ /* Needs mutex */ ULONG CcpAllocateCacheSections(PFILE_OBJECT FileObject, - PROS_SECTION_OBJECT SectionObject) + PVOID SectionObject) { ULONG i = INVALID_CACHE; PNOCC_CACHE_MAP Map; @@ -369,7 +328,6 @@ { PNOCC_BCB Bcb; Bcb = &CcCacheSections[Start]; - ASSERT(Bcb->SectionObject); Bcb->RefCount++; RtlSetBit(CcCacheBitmap, Start); @@ -405,7 +363,6 @@ CcpLock(); ASSERT(Bcb->ExclusiveWaiter); - ASSERT(Bcb->SectionObject); Bcb->Exclusive = TRUE; Bcb->ExclusiveWaiter--; RtlSetBit(CcCacheBitmap, Start); @@ -469,13 +426,12 @@ OUT PVOID *BcbResult, OUT PVOID *Buffer) { - BOOLEAN Success = FALSE, FaultIn = FALSE; + BOOLEAN Success = FALSE; /* Note: windows 2000 drivers treat this as a bool */ //BOOLEAN Wait = (Flags & MAP_WAIT) || (Flags == TRUE); LARGE_INTEGER Target, EndInterval; ULONG BcbHead, SectionSize, ViewSize; PNOCC_BCB Bcb = NULL; - PROS_SECTION_OBJECT SectionObject = NULL; NTSTATUS Status; PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; ViewSize = CACHE_STRIPE; @@ -486,8 +442,9 @@ return FALSE; } - DPRINT("CcMapData(F->%x, %I64x:%d)\n", + DPRINT("CcMapData(F->%x, %S, %I64x:%d)\n", FileObject, + FileObject->FileName.Buffer, FileOffset->QuadPart, Length); @@ -506,8 +463,6 @@ { Bcb = &CcCacheSections[BcbHead]; Success = TRUE; - *BcbResult = Bcb; - *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%x) %wZ\n", Bcb - CcCacheSections, @@ -545,31 +500,10 @@ //ASSERT(SectionSize <= CACHE_STRIPE); - CcpUnlock(); - /* CcpAllocateSection doesn't need the lock, so we'll give other action - a chance in here. */ - Status = CcpAllocateSection(FileObject, - SectionSize, -#ifdef PIN_WRITE_ONLY - PAGE_READONLY, -#else - PAGE_READWRITE, -#endif - &SectionObject); - CcpLock(); - - if (!NT_SUCCESS(Status)) - { - *BcbResult = NULL; - *Buffer = NULL; - DPRINT1("End %08x\n", Status); - goto cleanup; - } - retry: /* Returns a reference */ DPRINT("Allocating cache sections: %wZ\n", &FileObject->FileName); - BcbHead = CcpAllocateCacheSections(FileObject, SectionObject); + BcbHead = CcpAllocateCacheSections(FileObject, Map->SectionObject); /* XXX todo: we should handle the immediate fail case here, but don't */ if (BcbHead == INVALID_CACHE) { @@ -603,24 +537,27 @@ } DPRINT("Selected BCB #%x\n", BcbHead); - ViewSize = CACHE_STRIPE; + ViewSize = SectionSize; Bcb = &CcCacheSections[BcbHead]; - /* MmMapCacheViewInSystemSpaceAtOffset is one of three methods of Mm - that are specific to NewCC. In this case, it's implementation - exactly mirrors MmMapViewInSystemSpace, but allows an offset to - be specified. */ - Status = MmMapCacheViewInSystemSpaceAtOffset(SectionObject->Segment, - &Bcb->BaseAddress, - &Target, - &ViewSize); + Status = MmMapViewOfSection(Map->SectionObject, + PsInitialSystemProcess, + &Bcb->BaseAddress, + 0, + ViewSize, + &Target, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + + DPRINT("MmMapViewOfSection, Status 0x%08x.\n", Status); /* Summary: Failure. Dereference our section and tell the user we failed */ if (!NT_SUCCESS(Status)) { *BcbResult = NULL; *Buffer = NULL; - ObDereferenceObject(SectionObject); RemoveEntryList(&Bcb->ThisFileList); RtlZeroMemory(Bcb, sizeof(*Bcb)); RtlClearBit(CcCacheBitmap, BcbHead); @@ -636,14 +573,9 @@ Bcb->Length = MIN(Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart, CACHE_STRIPE); - Bcb->SectionObject = SectionObject; Bcb->Map = Map; Bcb->FileOffset = Target; InsertTailList(&Map->AssociatedBcb, &Bcb->ThisFileList); - - *BcbResult = &CcCacheSections[BcbHead]; - *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); - FaultIn = TRUE; DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%lx) %wZ\n", Bcb - CcCacheSections, @@ -659,32 +591,48 @@ (Bcb->FileOffset.QuadPart & ~(CACHE_STRIPE - 1))); cleanup: - CcpUnlock(); if (Success) { - if (FaultIn) + if (!Bcb->Mdl) { - /* Fault in the pages. This forces reads to happen now. */ - ULONG i; - PCHAR FaultIn = Bcb->BaseAddress; - - DPRINT("Faulting in pages at this point: file %wZ %I64x:%x\n", - &FileObject->FileName, - Bcb->FileOffset.QuadPart, - Bcb->Length); - - for (i = 0; i < Bcb->Length; i += PAGE_SIZE) + PMDL Mdl; + PVOID MdlAddress; + CcpUnlock(); + + DPRINT("Allocating MDL for Bcb #%x.\n", Bcb - CcCacheSections); + + Mdl = IoAllocateMdl(Bcb->BaseAddress, Bcb->Length, FALSE, FALSE, NULL); + if (!Mdl) + RtlRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + + MmProbeAndLockProcessPages(Mdl, PsInitialSystemProcess, KernelMode, IoModifyAccess); + MdlAddress = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); + + CcpLock(); + if (Bcb->Mdl) { - FaultIn[i] ^= 0; + /* Someone beat us */ + MmUnlockPages(Mdl); + IoFreeMdl(Mdl); + } + else + { + Bcb->Mdl = Mdl; + Bcb->MdlAddress = MdlAddress; } } ASSERT(Bcb >= CcCacheSections && Bcb < (CcCacheSections + CACHE_NUM_SECTIONS)); + + *BcbResult = Bcb; + *Buffer = ((PCHAR)Bcb->MdlAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); } else { ASSERT(FALSE); } + + CcpUnlock(); return Success; } @@ -815,7 +763,7 @@ { CcpLock(); RealBcb = *Bcb; - *Buffer = ((PCHAR)RealBcb->BaseAddress) + (int)(FileOffset->QuadPart - RealBcb->FileOffset.QuadPart); + *Buffer = ((PCHAR)RealBcb->MdlAddress) + (int)(FileOffset->QuadPart - RealBcb->FileOffset.QuadPart); CcpUnlock(); } @@ -934,6 +882,14 @@ RtlClearBit(CcCacheBitmap, RealBcb - CcCacheSections); + if(RealBcb->Mdl) + { + MmUnlockPages(RealBcb->Mdl); + IoFreeMdl(RealBcb->Mdl); + RealBcb->Mdl = NULL; + RealBcb->MdlAddress = NULL; + } + #ifdef PIN_WRITE_ONLY PVOID BaseAddress = RealBcb->BaseAddress; SIZE_T NumberOfBytes = RealBcb->Length; Modified: branches/TransitionPte/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/cache/se… ============================================================================== --- branches/TransitionPte/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/cache/section/data.c [iso-8859-1] Mon May 23 20:15:54 2016 @@ -77,7 +77,7 @@ #include <ntoskrnl.h> #include "newmm.h" #include <cache/newcc.h> -#define NDEBUG +// #define NDEBUG #include <debug.h> #include <mm/ARM3/miarm.h> @@ -157,7 +157,7 @@ if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_CACHE || MemoryArea->DeleteInProgress) { MmUnlockAddressSpace(AddressSpace); - DPRINT("STATUS_NOT_MAPPED_DATA\n"); + DPRINT1("STATUS_NOT_MAPPED_DATA\n"); return STATUS_NOT_MAPPED_DATA; } BeginningAddress = PAGE_ROUND_DOWN(MA_GetStartingAddress(MemoryArea));

1 0

[jgardou] 71388: [CDFS_NEW] - "Convert" to PSEH2 + unix compilation friendliness - Use
by jgardou＠svn.reactos.org 23 May '16

23 May '16

Author: jgardou Date: Mon May 23 20:07:45 2016 New Revision: 71388 URL: http://svn.reactos.org/svn/reactos?rev=71388&view=rev Log: [CDFS_NEW] - "Convert" to PSEH2 + unix compilation friendliness - Use Modified: branches/TransitionPte/drivers/filesystems/CMakeLists.txt branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c branches/TransitionPte/drivers/filesystems/cdfs_new/close.c branches/TransitionPte/drivers/filesystems/cdfs_new/create.c branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/read.c branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c Modified: branches/TransitionPte/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/CMakeLists.txt [iso-8859-1] Mon May 23 20:07:45 2016 @@ -1,5 +1,6 @@ -add_subdirectory(cdfs) +#add_subdirectory(cdfs) +add_subdirectory(cdfs_new) add_subdirectory(ext2) add_subdirectory(fastfat) #add_subdirectory(fastfat_new) Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -44,7 +44,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -149,7 +149,7 @@ // Use a try finally to facilitate cleanup. // - try { + _SEH2_TRY { // // We use a loop to perform the lookup. If we don't find the mapping in the @@ -296,7 +296,7 @@ FirstPass = FALSE; } - } finally { + } _SEH2_FINALLY { if (CleanupParent) { @@ -311,7 +311,7 @@ } if (UnlockFcb) { CdUnlockFcb( IrpContext, Fcb ); } - } + } _SEH2_END return; } Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -94,7 +94,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Create the internal stream. The Vpb should be pointing at our volume @@ -272,7 +272,7 @@ } } - } finally { + } _SEH2_FINALLY { // // Cleanup any dirent structures we may have used. @@ -306,7 +306,7 @@ } CdUnlockFcb( IrpContext, Fcb ); - } + } _SEH2_END return; } Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -17,7 +17,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" #ifdef CD_SANITY BOOLEAN CdTestTopLevel = TRUE; @@ -259,7 +259,7 @@ // Use a try-except to handle the exception cases. // - try { + _SEH2_TRY { // // If the IrpContext is NULL then this is the first pass through @@ -398,10 +398,10 @@ CdCompleteRequest( IrpContext, Irp, Status ); } - } except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { - - Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) { + + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END } while (Status == STATUS_CANT_WAIT); @@ -653,7 +653,7 @@ // Note that (children of) CdFsdPostRequest can raise (Mdl allocation). // - try { + _SEH2_TRY { if (ExceptionCode == STATUS_CANT_WAIT) { @@ -670,10 +670,10 @@ } } } - except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { + _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) { - ExceptionCode = GetExceptionCode(); - } + ExceptionCode = _exception_code(); + } _SEH2_END // // If we posted the request or our caller will retry then just return here. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] Mon May 23 20:07:45 2016 @@ -28,9 +28,11 @@ #endif #include "nodetype.h" -#include "Cd.h" -#include "CdStruc.h" -#include "CdData.h" +#include "cd.h" +#include "cdstruc.h" +#include "cddata.h" + +#include <pseh/pseh2.h> //**** x86 compiler bug **** @@ -44,30 +46,28 @@ // Here are the different pool tags. // -/* ReactOS Change: GCC doesn't understand this, use TAG macro */ -#include <reactos/helper.h> -#define TAG_CCB TAG('c','c','d','C') // Ccb -#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC -#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent -#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration -#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb -#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb -#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb -#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry -#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer -#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name -#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer -#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads -#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context -#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite -#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array -#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry -#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry -#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name -#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table -#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name -#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor -#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem +#define TAG_CCB 'ccdC' // Ccb +#define TAG_CDROM_TOC 'ctdC' // TOC +#define TAG_DIRENT_NAME 'nddC' // CdName in dirent +#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration +#define TAG_FCB_DATA 'dfdC' // Data Fcb +#define TAG_FCB_INDEX 'ifdC' // Index Fcb +#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb +#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry +#define TAG_FILE_NAME 'nFdC' // Filename buffer +#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name +#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer +#define TAG_IO_CONTEXT 'oidC' // Io context for async reads +#define TAG_IRP_CONTEXT 'cidC' // Irp Context +#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite +#define TAG_MCB_ARRAY 'amdC' // Mcb array +#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry +#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry +#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name +#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table +#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name +#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor +#define TAG_VPB 'pvdC' // Vpb allocated in filesystem // // Tag all of our allocations if tagging is turned on @@ -1883,16 +1883,9 @@ // // #define try_return(S) { S; goto try_exit; } // -/* ReactOS Change: Remove SEH */ -#define try -#define leave goto exitLabel; -#define finally if (0) goto exitLabel; exitLabel: -#define except(x) while (0) -#define GetExceptionCode() 0 -#define AbnormalTermination() 0 - -#define try_return(S) { goto try_exit; } -#define try_leave(S) { leave; } + +#define try_return(S) {S; goto try_exit; } +#define try_leave(S) {S; _SEH2_LEAVE; } // Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -159,7 +159,7 @@ // Use a try-finally to facilitate cleanup. // - //try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + _SEH2_TRY { // // Case on the type of open that we are trying to cleanup. @@ -279,7 +279,7 @@ IoRemoveShareAccess( FileObject, &Fcb->ShareAccess ); - //} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + } _SEH2_FINALLY { CdReleaseFcb( IrpContext, Fcb ); @@ -287,7 +287,7 @@ FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } - //} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + } _SEH2_END // // If appropriate, try to spark teardown by purging the volume. Should @@ -305,19 +305,19 @@ CdAcquireCdData( IrpContext); - try { + _SEH2_TRY { CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); VcbAcquired = TRUE; CdPurgeVolume( IrpContext, Vcb, FALSE ); - } finally { + } _SEH2_FINALLY { if (VcbAcquired) { CdReleaseVcb( IrpContext, Vcb ); } CdReleaseCdData( IrpContext); - } + } _SEH2_END } // Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/close.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/close.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/close.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -42,7 +42,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/create.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/create.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/create.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -222,13 +222,15 @@ PAGED_CODE(); + DbgPrint("CdCommonCreate(%p)\n", IrpSp->FileObject); + // // If we were called with our file system device object instead of a // volume device object, just complete this request with STATUS_SUCCESS. // if (IrpContext->Vcb == NULL) { - + DbgPrint("IrpContext->Vcb == NULL\n"); CdCompleteRequest( IrpContext, Irp, STATUS_SUCCESS ); return STATUS_SUCCESS; } @@ -315,7 +317,7 @@ // in the IrpContext will indicate whether we removed the // backslash. // - + DbgPrint("Avant CdNormalizeFileNames.\n"); Status = CdNormalizeFileNames( IrpContext, Vcb, OpenByFileId, @@ -357,7 +359,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Verify that the Vcb is not in an unusable condition. This routine @@ -490,6 +492,7 @@ if (RemainingName.FileName.Length == 0) { + DbgPrint("RemainingName.FileName.Length == 0\n"); // // If this is a file so verify the user didn't want to open // a directory. @@ -499,7 +502,7 @@ if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_TRAIL_BACKSLASH ) || FlagOn( IrpSp->Parameters.Create.Options, FILE_DIRECTORY_FILE )) { - + DbgPrint("STATUS_NOT_A_DIRECTORY.\n"); try_return( Status = STATUS_NOT_A_DIRECTORY ); } @@ -574,7 +577,7 @@ // if (!FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT )) { - + DbgPrint("IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT\n"); CdRaiseStatus( IrpContext, STATUS_CANT_WAIT ); } @@ -584,6 +587,7 @@ FinalName.VersionString.Length = 0; + DbgPrint("Avant la boucle.\n"); while (TRUE) { ShortNameMatch = FALSE; @@ -761,7 +765,7 @@ try_return( Status = STATUS_ACCESS_DENIED ); } - + DbgPrint("CdOpenDirectoryFromPathEntry\n"); try_return( Status = CdOpenDirectoryFromPathEntry( IrpContext, IrpSp, Vcb, @@ -792,6 +796,7 @@ CdCleanupCompoundPathEntry( IrpContext, &CompoundPathEntry ); CleanupCompoundPathEntry = FALSE; } + DbgPrint("Apres la boucle.\n"); // // We need to scan the current directory for a matching file name @@ -890,6 +895,7 @@ // first and last dirents. // + DbgPrint("Avant CdOpenFileFromFileContext.\n"); try_return( Status = CdOpenFileFromFileContext( IrpContext, IrpSp, Vcb, @@ -901,7 +907,7 @@ RelatedCcb )); try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { // // Cleanup the PathEntry if initialized. @@ -926,7 +932,7 @@ // condition. // - if (AbnormalTermination()) { + if (_abnormal_termination()) { // @@ -985,7 +991,7 @@ // CdCompleteRequest( IrpContext, Irp, Status ); - } + } _SEH2_END return Status; } @@ -1508,11 +1514,13 @@ RtlCopyMemory( &FileId, IrpSp->FileObject->FileName.Buffer, sizeof( FILE_ID )); + DbgPrint("CdOpenByFileId (%p)", IrpSp->FileObject); + // // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Go ahead and figure out the TypeOfOpen and NodeType. We can @@ -1524,7 +1532,7 @@ TypeOfOpen = UserDirectoryOpen; NodeTypeCode = CDFS_NTC_FCB_INDEX; - // + //CdQueryFidDirentOffset // If the offset isn't zero then the file Id is bad. // @@ -1546,7 +1554,7 @@ // request can't wait. // - CdLockVcb( IrpContext, Vcb ); + CdLockVcb( CdQueryFidDirentOffsetIrpContext, Vcb ); UnlockVcb = TRUE; NextFcb = CdLookupFcbTable( IrpContext, Vcb, FileId ); @@ -1723,7 +1731,7 @@ // if (NextFcb->FileObject == NULL) { - + DbgPrint("NextFcb->FileObject == NULL\n"); CdCreateInternalStream( IrpContext, Vcb, NextFcb ); } @@ -1905,7 +1913,7 @@ } try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { if (UnlockVcb) { @@ -1921,7 +1929,7 @@ CdCleanupCompoundPathEntry( IrpContext, &CompoundPathEntry ); } - } + } _SEH2_END return Status; } @@ -1977,6 +1985,8 @@ NTSTATUS Status = STATUS_ACCESS_DENIED; PAGED_CODE(); + + DbgPrint("CdOpenExistingFcb(%p)", IrpSp->FileObject); // // Check that the desired access is legal. @@ -2110,6 +2120,8 @@ PAGED_CODE(); + DbgPrint("CdOpenDirectoryFromPathEntry(%p)", IrpSp->FileObject); + // // Check for illegal access to this file. // @@ -2126,7 +2138,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Check the related Ccb to see if this was an OpenByFileId. @@ -2281,7 +2293,7 @@ IrpSp->Parameters.Create.SecurityContext->DesiredAccess ); } - } finally { + } _SEH2_FINALLY { // // Unlock the Vcb if held. @@ -2300,7 +2312,7 @@ CdReleaseFcb( IrpContext, ParentFcb ); } - } + } _SEH2_END return Status; } @@ -2384,6 +2396,8 @@ PAGED_CODE(); + DbgPrint("CdOpenFileFromFileContext(%p)\n", IrpSp); + // // Check for illegal access to this file. // @@ -2399,7 +2413,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Check if a version number was used to open this file. @@ -2569,7 +2583,7 @@ CcbFlags, IrpSp->Parameters.Create.SecurityContext->DesiredAccess ); - } finally { + } _SEH2_FINALLY { // // Unlock the Vcb if held. @@ -2588,7 +2602,7 @@ CdReleaseFcb( IrpContext, ParentFcb ); } - } + } _SEH2_END return Status; } @@ -2652,6 +2666,8 @@ PCCB Ccb; PAGED_CODE(); + + DbgPrint("CdCompleteFcbOpen(%p).\n", IrpSp->FileObject); // // Expand maximum allowed to something sensible for share access checking Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -27,6 +27,7 @@ // NTSTATUS +NTAPI CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -165,12 +166,13 @@ return Status; } - + // // Local support routine // NTSTATUS +NTAPI CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -355,7 +355,7 @@ // Use a try-finally to perform the final cleanup. // - try { + _SEH2_TRY { // // Loop while there are more bytes to transfer. @@ -518,7 +518,7 @@ } try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { // // Perform final cleanup on the IoRuns if necessary. @@ -528,7 +528,7 @@ CdFinishBuffers( IrpContext, IoRuns, CleanupRunCount, TRUE, FALSE ); } - } + } _SEH2_END return Status; } @@ -624,7 +624,7 @@ // Use a try-finally to perform the final cleanup. // - try { + _SEH2_TRY { // // If the initial offset lies within the RIFF header then copy the @@ -960,7 +960,7 @@ KeFlushIoBuffers( IrpContext->Irp->MdlAddress, TRUE, FALSE ); try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { // // Perform final cleanup on the IoRuns if necessary. @@ -970,7 +970,7 @@ CdFinishBuffers( IrpContext, IoRuns, CleanupRunCount, TRUE, FALSE ); } - } + } _SEH2_END return Status; } @@ -1176,15 +1176,15 @@ // deallocate the Mdl and return the appropriate "expected" status. // - try { + _SEH2_TRY { MmProbeAndLockPages( Mdl, IrpContext->Irp->RequestorMode, IoWriteAccess ); Status = STATUS_SUCCESS; - } except(EXCEPTION_EXECUTE_HANDLER) { - - Status = GetExceptionCode(); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + + Status = _exception_code(); IoFreeMdl( Mdl ); IrpContext->Irp->MdlAddress = NULL; @@ -1193,7 +1193,7 @@ Status = STATUS_INVALID_USER_BUFFER; } - } + } _SEH2_END } // Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -287,7 +287,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Verify the Fcb is still good. @@ -499,7 +499,7 @@ // such trickery. // - try { + _SEH2_TRY { // // Zero and initialize the base part of the current entry. @@ -715,7 +715,7 @@ LastEntry = NextEntry; NextEntry = QuadAlign( Information ); - } except (EXCEPTION_EXECUTE_HANDLER) { + } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) { // // We had a problem filling in the user's buffer, so stop and @@ -724,13 +724,13 @@ // Information = 0; - try_leave( Status = GetExceptionCode()); - } + try_leave( Status = _exception_code()); + } _SEH2_END } DoCcbUpdate = TRUE; - } finally { + } _SEH2_FINALLY { // // Cleanup our search context - *before* aquiring the FCB mutex exclusive, @@ -769,7 +769,7 @@ // CdReleaseFile( IrpContext, Fcb ); - } + } _SEH2_END // // Complete the request here. @@ -837,7 +837,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Verify the Vcb. @@ -862,14 +862,14 @@ NULL, NULL ); - } finally { + } _SEH2_FINALLY { // // Release the Vcb. // CdReleaseVcb( IrpContext, IrpContext->Vcb ); - } + } _SEH2_END // // Cleanup the IrpContext. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -65,7 +65,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -1,4 +1,4 @@ -#include "CdProcs.h" +#include "cdprocs.h" #include <stdio.h> #define doit(a,b) { printf("%s %04lx %4lx %s\n", #a, FIELD_OFFSET(a,b), sizeof(d.b), #b); } Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -165,7 +165,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // We only support query on file and directory handles. @@ -325,7 +325,7 @@ Irp->IoStatus.Information = IrpSp->Parameters.QueryFile.Length - Length; - } finally { + } _SEH2_FINALLY { // // Release the file. @@ -335,7 +335,7 @@ CdReleaseFile( IrpContext, Fcb ); } - } + } _SEH2_END // // Complete the request if we didn't raise. @@ -406,7 +406,7 @@ CdAcquireFileShared( IrpContext, Fcb ); - try { + _SEH2_TRY { // // Make sure the Fcb is in a usable condition. This @@ -445,10 +445,10 @@ Status = STATUS_SUCCESS; try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { CdReleaseFile( IrpContext, Fcb ); - } + } _SEH2_END // // Complete the request if there was no raise. @@ -536,7 +536,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Only deal with 'good' Fcb's. @@ -566,12 +566,12 @@ Result = TRUE; } - } finally { + } _SEH2_FINALLY { ExReleaseResourceLite( Fcb->Resource ); FsRtlExitFileSystem(); - } + } _SEH2_END return Result; } @@ -654,7 +654,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Only deal with 'good' Fcb's. @@ -694,12 +694,12 @@ Result = TRUE; } - } finally { + } _SEH2_FINALLY { ExReleaseResourceLite( Fcb->Resource ); FsRtlExitFileSystem(); - } + } _SEH2_END return Result; } @@ -782,7 +782,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Only deal with 'good' Fcb's. @@ -827,12 +827,12 @@ Result = TRUE; } - } finally { + } _SEH2_FINALLY { ExReleaseResourceLite( Fcb->Resource ); FsRtlExitFileSystem(); - } + } _SEH2_END return Result; } @@ -1278,7 +1278,7 @@ // Use a try-finally to cleanup the structures. // - try { + _SEH2_TRY { ParentFcb = Fcb->ParentFcb; CdAcquireFileShared( IrpContext, ParentFcb ); @@ -1396,7 +1396,7 @@ RtlCopyMemory( Buffer->FileName, ShortNameBuffer, Buffer->FileNameLength ); try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { if (CleanupFileLookup) { @@ -1413,7 +1413,7 @@ CdReleaseFile( IrpContext, ParentFcb ); } - } + } _SEH2_END // // Reduce the available bytes by the amount stored into this buffer. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -702,7 +702,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Allocate a buffer to query the TOC. @@ -1019,7 +1019,7 @@ Status = STATUS_SUCCESS; - } finally { + } _SEH2_FINALLY { // // Free the TOC buffer if not in the Vcb. @@ -1043,7 +1043,7 @@ // If we are not mounting the device, then set the verify bit again. // - if ((AbnormalTermination() || (Status != STATUS_SUCCESS)) && + if ((_abnormal_termination() || (Status != STATUS_SUCCESS)) && SetDoVerifyOnFail) { CdMarkRealDevForVerify( IrpContext->RealDevice); @@ -1080,7 +1080,7 @@ // CdReleaseCdData( IrpContext ); - } + } _SEH2_END // // Now send mount notification. @@ -1182,7 +1182,7 @@ CdAcquireCdData( IrpContext ); - try { + _SEH2_TRY { CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); ReleaseVcb = TRUE; @@ -1506,7 +1506,7 @@ } } - } finally { + } _SEH2_FINALLY { // // Free the TOC buffer if allocated. @@ -1528,7 +1528,7 @@ } CdReleaseCdData( IrpContext ); - } + } _SEH2_END // // Now send mount notification. @@ -1653,7 +1653,7 @@ // Use a try finally to free the Fcb. // - try { + _SEH2_TRY { // // Verify the Fcb. @@ -1683,14 +1683,14 @@ Irp = NULL; - } finally { + } _SEH2_FINALLY { // // Release all of our resources // CdReleaseFcb( IrpContext, Fcb ); - } + } _SEH2_END // // Complete the request if there was no exception. @@ -1765,7 +1765,7 @@ Vcb = Fcb->Vcb; CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); - try { + _SEH2_TRY { // // Verify the Vcb. @@ -1775,7 +1775,7 @@ Status = CdLockVolumeInternal( IrpContext, Vcb, IrpSp->FileObject ); - } finally { + } _SEH2_FINALLY { // // Release the Vcb. @@ -1783,11 +1783,11 @@ CdReleaseVcb( IrpContext, Vcb ); - if (AbnormalTermination() || !NT_SUCCESS( Status )) { + if (_abnormal_termination() || !NT_SUCCESS( Status )) { FsRtlNotifyVolumeEvent( IrpSp->FileObject, FSRTL_VOLUME_LOCK_FAILED ); } - } + } _SEH2_END // // Complete the request if there haven't been any exceptions. @@ -2295,7 +2295,7 @@ Status = ObReferenceObjectByHandle( Handle, 0, - IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibily with exported kernel data */ + *IoFileObjectType, KernelMode, (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ NULL ); @@ -2591,7 +2591,7 @@ // Check for whether this device supports XA and multi-session. // - try { + _SEH2_TRY { // // Allocate a buffer for the last session information. @@ -2669,10 +2669,10 @@ ThisPass += 1; } - } finally { + } _SEH2_FINALLY { if (CdromToc != NULL) { CdFreePool( &CdromToc ); } - } + } _SEH2_END } // Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -94,7 +94,7 @@ while (TRUE) { - try { + _SEH2_TRY { // // Reinitialize for the next try at completing this @@ -184,10 +184,10 @@ CdCompleteRequest( IrpContext, Irp, Status ); } - } except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { - - Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) { + + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END // // Break out of the loop if we didn't get CANT_WAIT. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -224,7 +224,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // We check whether we can proceed based on the state of the file oplocks. @@ -275,10 +275,10 @@ } try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { FsRtlExitFileSystem(); - } + } _SEH2_END return Results; } @@ -366,7 +366,7 @@ FsRtlEnterFileSystem(); - try { + _SEH2_TRY { // // We check whether we can proceed based on the state of the file oplocks. @@ -416,10 +416,10 @@ } try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { FsRtlExitFileSystem(); - } + } _SEH2_END return Results; } @@ -498,7 +498,7 @@ FsRtlEnterFileSystem(); - try { + _SEH2_TRY { // // We check whether we can proceed based on the state of the file oplocks. @@ -539,10 +539,10 @@ CdUnlockFcb( IrpContext, Fcb ); try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { FsRtlExitFileSystem(); - } + } _SEH2_END return Results; } @@ -624,7 +624,7 @@ FsRtlEnterFileSystem(); - try { + _SEH2_TRY { // // We check whether we can proceed based on the state of the file oplocks. @@ -666,10 +666,10 @@ CdUnlockFcb( IrpContext, Fcb ); try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { FsRtlExitFileSystem(); - } + } _SEH2_END return Results; } Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] Mon May 23 20:07:45 2016 @@ -97,8 +97,6 @@ #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) #define CDFS_BUG_CHECK_WORKQUE (0x001c0000) -/* ReactOS Change: Need to add to reactos.mc */ -#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); } #endif // _NODETYPE_ Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -73,7 +73,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -51,6 +51,7 @@ ); NTSTATUS +NTAPI CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -774,6 +775,7 @@ // NTSTATUS +NTAPI CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/read.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/read.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/read.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -35,11 +35,11 @@ // #define SafeZeroMemory(IC,AT,BYTE_COUNT) { \ - try { \ + _SEH2_TRY { \ RtlZeroMemory( (AT), (BYTE_COUNT) ); \ - } except( EXCEPTION_EXECUTE_HANDLER ) { \ + } _SEH2_EXCEPT( EXCEPTION_EXECUTE_HANDLER ) { \ CdRaiseStatus( IC, STATUS_INVALID_USER_BUFFER ); \ - } \ + } _SEH2_END \ } // @@ -180,7 +180,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Verify the Fcb. Allow reads if this is a DASD handle that is @@ -515,7 +515,7 @@ } try_exit: NOTHING; - } finally { + } _SEH2_FINALLY { // // Release the Fcb. @@ -525,7 +525,7 @@ CdReleaseFile( IrpContext, Fcb ); } - } + } _SEH2_END // // Post the request if we got CANT_WAIT. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -298,19 +298,19 @@ // uninitialize the notify structures before returning. // - try { + _SEH2_TRY { Vcb->SwapVpb = FsRtlAllocatePoolWithTag( NonPagedPool, sizeof( VPB ), TAG_VPB ); } - finally { - - if (AbnormalTermination()) { + _SEH2_FINALLY { + + if (_abnormal_termination()) { FsRtlNotifyUninitializeSync( &Vcb->NotifySync ); } - } + } _SEH2_END // // Nothing beyond this point should raise. @@ -456,7 +456,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Copy the block size and compute the various block masks. @@ -843,10 +843,10 @@ SetFlag( Vcb->VcbState, VCB_STATE_ISO ); } - } finally { + } _SEH2_FINALLY { if (UnlockVcb) { CdUnlockVcb( IrpContext, Vcb ); } - } + } _SEH2_END } @@ -1238,7 +1238,7 @@ CdLockFcb( IrpContext, Fcb ); - try { + _SEH2_TRY { // // Initialize the common header in the Fcb. The node type is already @@ -1361,10 +1361,10 @@ CdInsertFcbTable( IrpContext, Fcb ); SetFlag( Fcb->FcbState, FCB_STATE_IN_FCB_TABLE ); - } finally { + } _SEH2_FINALLY { CdUnlockFcb( IrpContext, Fcb ); - } + } _SEH2_END return; } @@ -1927,7 +1927,7 @@ // Use a try-finally to safely clear the top-level field. // - try { + _SEH2_TRY { // // Loop until we find an Fcb we can't remove. @@ -2031,7 +2031,7 @@ } while (CurrentFcb != NULL); - } finally { + } _SEH2_FINALLY { // // Release the current Fcb if we have acquired it. @@ -2047,7 +2047,7 @@ // ClearFlag( IrpContext->TopLevel->Flags, IRP_CONTEXT_FLAG_IN_TEARDOWN ); - } + } _SEH2_END *RemovedStartingFcb = (CurrentFcb != StartingFcb); return; Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -92,7 +92,7 @@ Vcb = &CONTAINING_RECORD( IrpSp->DeviceObject, VOLUME_DEVICE_OBJECT, DeviceObject )->Vcb; - try { + _SEH2_TRY { // // Send down the verify FSCTL. Note that this is sent to the @@ -206,7 +206,7 @@ Status = CdFsdPostRequest( IrpContext, Irp ); } - } except(CdExceptionFilter( IrpContext, GetExceptionInformation() )) { + } _SEH2_EXCEPT(CdExceptionFilter( IrpContext, _exception_info() )) { // // We had some trouble trying to perform the verify or raised @@ -214,8 +214,8 @@ // the error status that we get back from the execption code. // - Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END return Status; } Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module @@ -130,7 +130,7 @@ // Use a try-finally to facilitate cleanup. // - try { + _SEH2_TRY { // // Verify the Vcb. @@ -177,14 +177,14 @@ Irp->IoStatus.Information = IrpSp->Parameters.QueryVolume.Length - Length; - } finally { + } _SEH2_FINALLY { // // Release the Vcb. // CdReleaseVcb( IrpContext, Fcb->Vcb ); - } + } _SEH2_END // // Complete the request if we didn't raise. Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@ --*/ -#include "CdProcs.h" +#include "cdprocs.h" // // The Bug check file id for this module

1 0

[pschweitzer] 71387: [NTOSKRNL] In Cc, replace the Vacb mutex by a Bcb resource. Note that the resource is still placed in the Vacb by it belongs to the Bcb. This is required to really implement Cc...
by pschweitzer＠svn.reactos.org 23 May '16

23 May '16

Author: pschweitzer Date: Mon May 23 19:47:39 2016 New Revision: 71387 URL: http://svn.reactos.org/svn/reactos?rev=71387&view=rev Log: [NTOSKRNL] In Cc, replace the Vacb mutex by a Bcb resource. Note that the resource is still placed in the Vacb by it belongs to the Bcb. This is required to really implement CcSetBcbOwnerPointer(). CORE-11310 Modified: trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=7138… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Mon May 23 19:47:39 2016 @@ -290,11 +290,7 @@ IoStatus->Information = 0; if (WriteThrough) { - KeWaitForSingleObject(&iBcb->Vacb->Mutex, - Executive, - KernelMode, - FALSE, - NULL); + ExAcquireResourceExclusiveLite(&iBcb->Vacb->Lock, TRUE); if (iBcb->Vacb->Dirty) { IoStatus->Status = CcRosFlushVacb(iBcb->Vacb); @@ -303,7 +299,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - KeReleaseMutex(&iBcb->Vacb->Mutex, FALSE); + ExReleaseResourceLite(&iBcb->Vacb->Lock); } else { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=713… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon May 23 19:47:39 2016 @@ -166,12 +166,10 @@ PROS_VACB current; BOOLEAN Locked; NTSTATUS Status; - LARGE_INTEGER ZeroTimeout; DPRINT("CcRosFlushDirtyPages(Target %lu)\n", Target); (*Count) = 0; - ZeroTimeout.QuadPart = 0; KeEnterCriticalRegion(); KeAcquireGuardedMutex(&ViewLock); @@ -199,12 +197,8 @@ continue; } - Status = KeWaitForSingleObject(&current->Mutex, - Executive, - KernelMode, - FALSE, - Wait ? NULL : &ZeroTimeout); - if (Status != STATUS_SUCCESS) + Locked = ExAcquireResourceExclusiveLite(&current->Lock, Wait); + if (!Locked) { current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); @@ -217,7 +211,7 @@ /* One reference is added above */ if (current->ReferenceCount > 2) { - KeReleaseMutex(&current->Mutex, FALSE); + ExReleaseResourceLite(&current->Lock); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); CcRosVacbDecRefCount(current); @@ -228,7 +222,7 @@ Status = CcRosFlushVacb(current); - KeReleaseMutex(&current->Mutex, FALSE); + ExReleaseResourceLite(&current->Lock); current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext); @@ -425,7 +419,7 @@ KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&Vacb->Mutex, FALSE); + ExReleaseResourceLite(&Vacb->Lock); return STATUS_SUCCESS; } @@ -462,11 +456,7 @@ CcRosVacbIncRefCount(current); KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeWaitForSingleObject(&current->Mutex, - Executive, - KernelMode, - FALSE, - NULL); + ExAcquireResourceExclusiveLite(&current->Lock, TRUE); return current; } if (current->FileOffset.QuadPart > FileOffset) @@ -521,7 +511,7 @@ KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&Vacb->Mutex, FALSE); + ExReleaseResourceLite(&Vacb->Lock); return STATUS_SUCCESS; } @@ -574,7 +564,7 @@ KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); KeReleaseGuardedMutex(&ViewLock); - KeReleaseMutex(&Vacb->Mutex, FALSE); + ExReleaseResourceLite(&Vacb->Lock); return STATUS_SUCCESS; } @@ -675,12 +665,8 @@ current->DirtyVacbListEntry.Flink = NULL; current->DirtyVacbListEntry.Blink = NULL; current->ReferenceCount = 1; - KeInitializeMutex(&current->Mutex, 0); - KeWaitForSingleObject(&current->Mutex, - Executive, - KernelMode, - FALSE, - NULL); + ExInitializeResourceLite(&current->Lock); + ExAcquireResourceExclusiveLite(&current->Lock, TRUE); KeAcquireGuardedMutex(&ViewLock); *Vacb = current; @@ -712,15 +698,11 @@ current); } #endif - KeReleaseMutex(&(*Vacb)->Mutex, FALSE); + ExReleaseResourceLite(&(*Vacb)->Lock); KeReleaseGuardedMutex(&ViewLock); ExFreeToNPagedLookasideList(&VacbLookasideList, *Vacb); *Vacb = current; - KeWaitForSingleObject(&current->Mutex, - Executive, - KernelMode, - FALSE, - NULL); + ExAcquireResourceExclusiveLite(&current->Lock, TRUE); return STATUS_SUCCESS; } if (current->FileOffset.QuadPart < FileOffset) @@ -886,6 +868,7 @@ CcFreeCachePage, NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); + ExDeleteResourceLite(&Vacb->Lock); ExFreeToNPagedLookasideList(&VacbLookasideList, Vacb); return STATUS_SUCCESS; @@ -949,7 +932,7 @@ IoStatus->Status = Status; } } - KeReleaseMutex(&current->Mutex, FALSE); + ExReleaseResourceLite(&current->Lock); KeAcquireGuardedMutex(&ViewLock); KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Mon May 23 19:47:39 2016 @@ -164,6 +164,8 @@ PVOID BaseAddress; /* Memory area representing the region where the view's data is mapped. */ struct _MEMORY_AREA* MemoryArea; + /* Lock */ + ERESOURCE Lock; /* Are the contents of the view valid. */ BOOLEAN Valid; /* Are the contents of the view newer than those on disk. */ @@ -179,8 +181,6 @@ LIST_ENTRY VacbLruListEntry; /* Offset in the file which this view maps. */ LARGE_INTEGER FileOffset; - /* Mutex */ - KMUTEX Mutex; /* Number of references. */ ULONG ReferenceCount; /* Pointer to the shared cache map for the file which this view maps data for. */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon May 23 19:47:39 2016 @@ -1110,6 +1110,7 @@ * filesystems do because it is safe for us to use an offset with an * alignment less than the file system block size. */ + KeEnterCriticalRegion(); Status = CcRosGetVacb(SharedCacheMap, FileOffset, &BaseOffset, @@ -1118,6 +1119,7 @@ &Vacb); if (!NT_SUCCESS(Status)) { + KeLeaveCriticalRegion(); return(Status); } if (!UptoDate) @@ -1130,6 +1132,7 @@ if (!NT_SUCCESS(Status)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); + KeLeaveCriticalRegion(); return Status; } } @@ -1144,6 +1147,7 @@ FileOffset - BaseOffset).LowPart >> PAGE_SHIFT; CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, TRUE); + KeLeaveCriticalRegion(); } else { @@ -1163,6 +1167,7 @@ { return(Status); } + KeEnterCriticalRegion(); Status = CcRosGetVacb(SharedCacheMap, FileOffset, &BaseOffset, @@ -1171,6 +1176,7 @@ &Vacb); if (!NT_SUCCESS(Status)) { + KeLeaveCriticalRegion(); return(Status); } if (!UptoDate) @@ -1183,6 +1189,7 @@ if (!NT_SUCCESS(Status)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); + KeLeaveCriticalRegion(); return Status; } } @@ -1212,6 +1219,7 @@ &Vacb); if (!NT_SUCCESS(Status)) { + KeLeaveCriticalRegion(); return(Status); } if (!UptoDate) @@ -1224,6 +1232,7 @@ if (!NT_SUCCESS(Status)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); + KeLeaveCriticalRegion(); return Status; } } @@ -1239,6 +1248,7 @@ } MiUnmapPageInHyperSpace(Process, PageAddr, Irql); CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); + KeLeaveCriticalRegion(); } return(STATUS_SUCCESS); } @@ -3232,10 +3242,12 @@ BufferSize = PAGE_ROUND_UP(BufferSize); /* Flush data since we're about to perform a non-cached read */ + KeEnterCriticalRegion(); CcFlushCache(FileObject->SectionObjectPointer, &FileOffset, BufferSize, &Iosb); + KeLeaveCriticalRegion(); /* * It's ok to use paged pool, because this is a temporary buffer only used in

1 0

[ekohl] 71386: [SERVICES] RCreateServiceW: Store a given password as a secret.
by ekohl＠svn.reactos.org 23 May '16

23 May '16

Author: ekohl Date: Mon May 23 15:02:37 2016 New Revision: 71386 URL: http://svn.reactos.org/svn/reactos?rev=71386&view=rev Log: [SERVICES] RCreateServiceW: Store a given password as a secret. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Mon May 23 15:02:37 2016 @@ -10,6 +10,7 @@ /* INCLUDES *****************************************************************/ #include "services.h" +#include <ntsecapi.h> #define NDEBUG #include <debug.h> @@ -443,4 +444,58 @@ return ERROR_SUCCESS; } + +DWORD +ScmSetServicePassword( + IN PCWSTR pszServiceName, + IN PCWSTR pszPassword) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + LSA_HANDLE PolicyHandle = NULL; + UNICODE_STRING ServiceName = {0, 0, NULL}; + UNICODE_STRING Password; + NTSTATUS Status; + DWORD dwError = ERROR_SUCCESS; + + RtlZeroMemory(&ObjectAttributes, sizeof(OBJECT_ATTRIBUTES)); + + Status = LsaOpenPolicy(NULL, + &ObjectAttributes, + POLICY_CREATE_SECRET, + &PolicyHandle); + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); + + ServiceName.Length = (wcslen(pszServiceName) + 4) * sizeof(WCHAR); + ServiceName.MaximumLength = ServiceName.Length + sizeof(WCHAR); + ServiceName.Buffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ServiceName.MaximumLength); + if (ServiceName.Buffer == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + wcscpy(ServiceName.Buffer, L"_SC_"); + wcscat(ServiceName.Buffer, pszServiceName); + + RtlInitUnicodeString(&Password, pszPassword); + + Status = LsaStorePrivateData(PolicyHandle, + &ServiceName, + &Password); + if (!NT_SUCCESS(Status)) + { + dwError = RtlNtStatusToDosError(Status); + goto done; + } + +done: + if (ServiceName.Buffer != NULL) + HeapFree(GetProcessHeap(), 0, ServiceName.Buffer); + + if (PolicyHandle != NULL) + LsaClose(PolicyHandle); + + return dwError; +} + /* EOF */ Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon May 23 15:02:37 2016 @@ -2323,6 +2323,7 @@ goto done; } + /* Set the service tag */ if (lpdwTagId != NULL) { dwError = RegSetValueExW(hServiceKey, @@ -2345,9 +2346,10 @@ goto done; } - /* Write service start name */ + /* Start name and password are only used by Win32 services */ if (dwServiceType & SERVICE_WIN32) { + /* Write service start name */ lpObjectName = (lpServiceStartName != NULL) ? (LPWSTR)lpServiceStartName : L"LocalSystem"; dwError = RegSetValueExW(hServiceKey, L"ObjectName", @@ -2357,11 +2359,17 @@ (DWORD)((wcslen(lpObjectName) + 1) * sizeof(WCHAR))); if (dwError != ERROR_SUCCESS) goto done; - } - - if (lpPassword != NULL) - { - /* FIXME: Decrypt and write password */ + + if (lpPassword != NULL && wcslen((LPWSTR)lpPassword) != 0) + { + /* FIXME: Decrypt the password */ + + /* Write the password */ + dwError = ScmSetServicePassword(lpServiceName, + (LPCWSTR)lpPassword); + if (dwError != ERROR_SUCCESS) + goto done; + } } dwError = ScmCreateServiceHandle(lpService, Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Mon May 23 15:02:37 2016 @@ -126,6 +126,10 @@ LPWSTR *lpDependencies, DWORD *lpdwDependenciesLength); +DWORD +ScmSetServicePassword( + IN PCWSTR pszServiceName, + IN PCWSTR pszPassword); /* controlset.c */

1 0

[ekohl] 71385: [ADVAPI32] Implement LogonUserEx[A/W].
by ekohl＠svn.reactos.org 23 May '16

23 May '16

Author: ekohl Date: Mon May 23 13:53:24 2016 New Revision: 71385 URL: http://svn.reactos.org/svn/reactos?rev=71385&view=rev Log: [ADVAPI32] Implement LogonUserEx[A/W]. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/sdk/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon May 23 13:53:24 2016 @@ -322,8 +322,8 @@ 322 stdcall IsWellKnownSid(ptr long) 323 stdcall LockServiceDatabase(ptr) 324 stdcall LogonUserA(str str str long long ptr) -325 stub LogonUserExA -326 stub LogonUserExW +325 stdcall LogonUserExA(str str str long long ptr ptr ptr ptr ptr) +326 stdcall LogonUserExW(wstr wstr wstr long long ptr ptr ptr ptr ptr) 327 stdcall LogonUserW(wstr wstr wstr long long ptr) 328 stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) 329 stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Mon May 23 13:53:24 2016 @@ -221,16 +221,49 @@ return TRUE; } + /* * @implemented */ -BOOL WINAPI -LogonUserA(LPSTR lpszUsername, - LPSTR lpszDomain, - LPSTR lpszPassword, - DWORD dwLogonType, - DWORD dwLogonProvider, - PHANDLE phToken) +BOOL +WINAPI +LogonUserA( + _In_ LPSTR lpszUsername, + _In_opt_ LPSTR lpszDomain, + _In_opt_ LPSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken) +{ + return LogonUserExA(lpszUsername, + lpszDomain, + lpszPassword, + dwLogonType, + dwLogonProvider, + phToken, + NULL, + NULL, + NULL, + NULL); +} + + +/* + * @implemented + */ +BOOL +WINAPI +LogonUserExA( + _In_ LPSTR lpszUsername, + _In_opt_ LPSTR lpszDomain, + _In_opt_ LPSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken, + _Out_opt_ PSID *ppLogonSid, + _Out_opt_ PVOID *ppProfileBuffer, + _Out_opt_ LPDWORD pdwProfileLength, + _Out_opt_ PQUOTA_LIMITS pQuotaLimits) { UNICODE_STRING UserName; UNICODE_STRING Domain; @@ -259,12 +292,16 @@ goto PasswordDone; } - ret = LogonUserW(UserName.Buffer, - Domain.Buffer, - Password.Buffer, - dwLogonType, - dwLogonProvider, - phToken); + ret = LogonUserExW(UserName.Buffer, + Domain.Buffer, + Password.Buffer, + dwLogonType, + dwLogonProvider, + phToken, + ppLogonSid, + ppProfileBuffer, + pdwProfileLength, + pQuotaLimits); if (Password.Buffer != NULL) RtlFreeUnicodeString(&Password); @@ -285,13 +322,45 @@ /* * @implemented */ -BOOL WINAPI -LogonUserW(LPWSTR lpszUsername, - LPWSTR lpszDomain, - LPWSTR lpszPassword, - DWORD dwLogonType, - DWORD dwLogonProvider, - PHANDLE phToken) +BOOL +WINAPI +LogonUserW( + _In_ LPWSTR lpszUsername, + _In_opt_ LPWSTR lpszDomain, + _In_opt_ LPWSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken) +{ + return LogonUserExW(lpszUsername, + lpszDomain, + lpszPassword, + dwLogonType, + dwLogonProvider, + phToken, + NULL, + NULL, + NULL, + NULL); +} + + +/* + * @implemented + */ +BOOL +WINAPI +LogonUserExW( + _In_ LPWSTR lpszUsername, + _In_opt_ LPWSTR lpszDomain, + _In_opt_ LPWSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken, + _Out_opt_ PSID *ppLogonSid, + _Out_opt_ PVOID *ppProfileBuffer, + _Out_opt_ LPDWORD pdwProfileLength, + _Out_opt_ PQUOTA_LIMITS pQuotaLimits) { SID_IDENTIFIER_AUTHORITY LocalAuthority = {SECURITY_LOCAL_SID_AUTHORITY}; SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; @@ -503,6 +572,8 @@ *phToken = TokenHandle; + /* FIXME: return ppLogonSid, ppProfileBuffer, pdwProfileLength and pQuotaLimits */ + done: if (ProfileBuffer != NULL) LsaFreeReturnBuffer(ProfileBuffer); Modified: trunk/reactos/sdk/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winbase.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winbase.h [iso-8859-1] Mon May 23 13:53:24 2016 @@ -2569,6 +2569,36 @@ _Success_(return != FALSE) BOOL WINAPI +LogonUserExA( + _In_ LPSTR lpszUsername, + _In_opt_ LPSTR lpszDomain, + _In_opt_ LPSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken, + _Out_opt_ PSID *ppLogonSid, + _Out_opt_ PVOID *ppProfileBuffer, + _Out_opt_ LPDWORD pdwProfileLength, + _Out_opt_ PQUOTA_LIMITS pQuotaLimits); + +_Success_(return != FALSE) +BOOL +WINAPI +LogonUserExW( + _In_ LPWSTR lpszUsername, + _In_opt_ LPWSTR lpszDomain, + _In_opt_ LPWSTR lpszPassword, + _In_ DWORD dwLogonType, + _In_ DWORD dwLogonProvider, + _Out_opt_ PHANDLE phToken, + _Out_opt_ PSID *ppLogonSid, + _Out_opt_ PVOID *ppProfileBuffer, + _Out_opt_ LPDWORD pdwProfileLength, + _Out_opt_ PQUOTA_LIMITS pQuotaLimits); + +_Success_(return != FALSE) +BOOL +WINAPI LookupAccountNameA( _In_opt_ LPCSTR lpSystemName, _In_ LPCSTR lpAccountName, @@ -3359,6 +3389,7 @@ #define LoadLibrary LoadLibraryW #define LoadLibraryEx LoadLibraryExW #define LogonUser LogonUserW +#define LogonUserEx LogonUserExW #define LookupAccountName LookupAccountNameW #define LookupAccountSid LookupAccountSidW #define LookupPrivilegeDisplayName LookupPrivilegeDisplayNameW @@ -3567,6 +3598,7 @@ #define LoadLibrary LoadLibraryA #define LoadLibraryEx LoadLibraryExA #define LogonUser LogonUserA +#define LogonUserEx LogonUserExA #define LookupAccountName LookupAccountNameA #define LookupAccountSid LookupAccountSidA #define LookupPrivilegeDisplayName LookupPrivilegeDisplayNameA

1 0

[hbelusca] 71384: [ADVAPI32]: Implement all the Elf*** event log APIs as wrappers around the corresponding RPC calls, and the Win32 APIs just become calls to the Elf*** APIs.
by hbelusca＠svn.reactos.org 23 May '16

23 May '16

Author: hbelusca Date: Mon May 23 02:03:49 2016 New Revision: 71384 URL: http://svn.reactos.org/svn/reactos?rev=71384&view=rev Log: [ADVAPI32]: Implement all the Elf*** event log APIs as wrappers around the corresponding RPC calls, and the Win32 APIs just become calls to the Elf*** APIs. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon May 23 02:03:49 2016 @@ -180,27 +180,27 @@ 180 stub DuplicateEncryptionInfoFile 181 stdcall DuplicateToken(long long ptr) 182 stdcall DuplicateTokenEx(long long ptr long long ptr) -183 stub ElfBackupEventLogFileA -184 stub ElfBackupEventLogFileW -185 stub ElfChangeNotify -186 stub ElfClearEventLogFileA -187 stub ElfClearEventLogFileW -188 stub ElfCloseEventLog +183 stdcall ElfBackupEventLogFileA(long ptr) +184 stdcall ElfBackupEventLogFileW(long ptr) +185 stdcall ElfChangeNotify(long long) +186 stdcall ElfClearEventLogFileA(long ptr) +187 stdcall ElfClearEventLogFileW(long ptr) +188 stdcall ElfCloseEventLog(long) 189 stdcall ElfDeregisterEventSource(long) -190 stub ElfFlushEventLog -191 stub ElfNumberOfRecords -192 stub ElfOldestRecord -193 stub ElfOpenBackupEventLogA -194 stub ElfOpenBackupEventLogW -195 stub ElfOpenEventLogA -196 stub ElfOpenEventLogW -197 stub ElfReadEventLogA -198 stub ElfReadEventLogW -199 stub ElfRegisterEventSourceA +190 stdcall ElfFlushEventLog(long) +191 stdcall ElfNumberOfRecords(long ptr) +192 stdcall ElfOldestRecord(long ptr) +193 stdcall ElfOpenBackupEventLogA(ptr ptr ptr) +194 stdcall ElfOpenBackupEventLogW(ptr ptr ptr) +195 stdcall ElfOpenEventLogA(ptr ptr ptr) +196 stdcall ElfOpenEventLogW(ptr ptr ptr) +197 stdcall ElfReadEventLogA(long long long ptr long ptr ptr) +198 stdcall ElfReadEventLogW(long long long ptr long ptr ptr) +199 stdcall ElfRegisterEventSourceA(ptr ptr ptr) 200 stdcall ElfRegisterEventSourceW(ptr ptr ptr) -201 stub ElfReportEventA -202 stub ElfReportEventAndSourceW -203 stdcall ElfReportEventW(long long long long ptr long long ptr ptr ptr ptr ptr) +201 stdcall ElfReportEventA(long long long long ptr long long ptr ptr long ptr ptr) +202 stdcall ElfReportEventAndSourceW(long long ptr long long long ptr ptr long long ptr ptr long ptr ptr) +203 stdcall ElfReportEventW(long long long long ptr long long ptr ptr long ptr ptr) 204 stdcall EnableTrace(long long long ptr double) ntdll.EtwEnableTrace 205 stdcall EncryptFileA(str) 206 stdcall EncryptFileW(wstr) Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Mon May 23 02:03:49 2016 @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* INCLUDES ******************************************************************/ + #include <advapi32.h> #include <ndk/kefuncs.h> @@ -31,6 +33,8 @@ static RPC_UNICODE_STRING EmptyStringU = { 0, 0, L"" }; static RPC_STRING EmptyStringA = { 0, 0, "" }; + +/* FUNCTIONS *****************************************************************/ handle_t __RPC_USER EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) @@ -56,13 +60,13 @@ /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeA(&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringFree returned 0x%x\n", status); } @@ -80,7 +84,7 @@ TRACE("EVENTLOG_HANDLE_A_unbind() called\n"); status = RpcBindingFree(&hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFree returned 0x%x\n", status); } @@ -98,11 +102,11 @@ status = RpcStringBindingComposeW(NULL, L"ncacn_np", - (LPWSTR)UNCServerName, + UNCServerName, L"\\pipe\\EventLog", NULL, &pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringBindingCompose returned 0x%x\n", status); return NULL; @@ -111,13 +115,13 @@ /* Set the binding handle that will be used to bind to the server. */ status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFromStringBinding returned 0x%x\n", status); } status = RpcStringFreeW(&pszStringBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcStringFree returned 0x%x\n", status); } @@ -135,7 +139,7 @@ TRACE("EVENTLOG_HANDLE_W_unbind() called\n"); status = RpcBindingFree(&hBinding); - if (status) + if (status != RPC_S_OK) { ERR("RpcBindingFree returned 0x%x\n", status); } @@ -145,14 +149,38 @@ /****************************************************************************** * BackupEventLogA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfBackupEventLogFileA(IN HANDLE hEventLog, + IN PANSI_STRING BackupFileNameA) +{ + NTSTATUS Status; + + if (!BackupFileNameA || (BackupFileNameA->Length == 0)) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = ElfrBackupELFA(hEventLog, + (PRPC_STRING)BackupFileNameA); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI BackupEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { + BOOL Success; + NTSTATUS Status; ANSI_STRING BackupFileNameA; UNICODE_STRING BackupFileNameW; - NTSTATUS Status; - BOOL Result; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -173,12 +201,12 @@ return FALSE; } - Result = BackupEventLogW(hEventLog, - BackupFileNameW.Buffer); + Success = BackupEventLogW(hEventLog, + BackupFileNameW.Buffer); RtlFreeUnicodeString(&BackupFileNameW); - return(Result); + return Success; } @@ -189,12 +217,36 @@ * hEventLog [] * lpBackupFileName [] */ +NTSTATUS +NTAPI +ElfBackupEventLogFileW(IN HANDLE hEventLog, + IN PUNICODE_STRING BackupFileNameU) +{ + NTSTATUS Status; + + if (!BackupFileNameU || (BackupFileNameU->Length == 0)) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = ElfrBackupELFW(hEventLog, + (PRPC_UNICODE_STRING)BackupFileNameU); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI BackupEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - UNICODE_STRING BackupFileNameW; - NTSTATUS Status; + NTSTATUS Status; + UNICODE_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); @@ -204,25 +256,16 @@ return FALSE; } - if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileNameW, + if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileName, NULL, NULL)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - RpcTryExcept - { - Status = ElfrBackupELFW(hEventLog, - (PRPC_UNICODE_STRING)&BackupFileNameW); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileNameW.Buffer); + Status = ElfBackupEventLogFileW(hEventLog, &BackupFileName); + + RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileName.Buffer); if (!NT_SUCCESS(Status)) { @@ -237,14 +280,35 @@ /****************************************************************************** * ClearEventLogA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfClearEventLogFileA(IN HANDLE hEventLog, + IN PANSI_STRING BackupFileNameA) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrClearELFA(hEventLog, + (PRPC_STRING)BackupFileNameA); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ClearEventLogA(IN HANDLE hEventLog, IN LPCSTR lpBackupFileName) { + BOOL Success; + NTSTATUS Status; ANSI_STRING BackupFileNameA; UNICODE_STRING BackupFileNameW; - NTSTATUS Status; - BOOL Result; TRACE("%p, %s\n", hEventLog, lpBackupFileName); @@ -266,34 +330,55 @@ } } - Result = ClearEventLogW(hEventLog, - BackupFileNameW.Buffer); + Success = ClearEventLogW(hEventLog, + BackupFileNameW.Buffer); RtlFreeUnicodeString(&BackupFileNameW); - return Result; + return Success; } /****************************************************************************** * ClearEventLogW [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfClearEventLogFileW(IN HANDLE hEventLog, + IN PUNICODE_STRING BackupFileNameU) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrClearELFW(hEventLog, + (PRPC_UNICODE_STRING)BackupFileNameU); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ClearEventLogW(IN HANDLE hEventLog, IN LPCWSTR lpBackupFileName) { - UNICODE_STRING BackupFileNameW; - NTSTATUS Status; + NTSTATUS Status; + UNICODE_STRING BackupFileName; TRACE("%p, %s\n", hEventLog, debugstr_w(lpBackupFileName)); if (lpBackupFileName == NULL) { - RtlInitUnicodeString(&BackupFileNameW, NULL); + RtlInitUnicodeString(&BackupFileName, NULL); } else { - if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileNameW, + if (!RtlDosPathNameToNtPathName_U(lpBackupFileName, &BackupFileName, NULL, NULL)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -301,19 +386,10 @@ } } - RpcTryExcept - { - Status = ElfrClearELFW(hEventLog, - (PRPC_UNICODE_STRING)&BackupFileNameW); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; + Status = ElfClearEventLogFileW(hEventLog, &BackupFileName); if (lpBackupFileName != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileNameW.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, BackupFileName.Buffer); if (!NT_SUCCESS(Status)) { @@ -328,6 +404,25 @@ /****************************************************************************** * CloseEventLog [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfCloseEventLog(IN HANDLE hEventLog) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrCloseEL(&hEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI CloseEventLog(IN HANDLE hEventLog) { @@ -335,16 +430,7 @@ TRACE("%p\n", hEventLog); - RpcTryExcept - { - Status = ElfrCloseEL(&hEventLog); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - + Status = ElfCloseEventLog(hEventLog); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -364,6 +450,25 @@ * * RETURNS STD */ +NTSTATUS +NTAPI +ElfDeregisterEventSource(IN HANDLE hEventLog) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrDeregisterEventSource(&hEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI DeregisterEventSource(IN HANDLE hEventLog) { @@ -371,16 +476,7 @@ TRACE("%p\n", hEventLog); - RpcTryExcept - { - Status = ElfrDeregisterEventSource(&hEventLog); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - + Status = ElfDeregisterEventSource(hEventLog); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -447,39 +543,43 @@ * hEventLog [] * NumberOfRecords [] */ +NTSTATUS +NTAPI +ElfNumberOfRecords(IN HANDLE hEventLog, + OUT PULONG NumberOfRecords) +{ + NTSTATUS Status; + + if (!NumberOfRecords) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = ElfrNumberOfRecords(hEventLog, NumberOfRecords); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI GetNumberOfEventLogRecords(IN HANDLE hEventLog, OUT PDWORD NumberOfRecords) { NTSTATUS Status; - DWORD Records; TRACE("%p, %p\n", hEventLog, NumberOfRecords); - if (NumberOfRecords == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RpcTryExcept - { - Status = ElfrNumberOfRecords(hEventLog, - &Records); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - *NumberOfRecords = Records; + Status = ElfNumberOfRecords(hEventLog, NumberOfRecords); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -492,39 +592,43 @@ * hEventLog [] * OldestRecord [] */ +NTSTATUS +NTAPI +ElfOldestRecord(IN HANDLE hEventLog, + OUT PULONG OldestRecordNumber) +{ + NTSTATUS Status; + + if (!OldestRecordNumber) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + Status = ElfrOldestRecord(hEventLog, OldestRecordNumber); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI GetOldestEventLogRecord(IN HANDLE hEventLog, OUT PDWORD OldestRecord) { NTSTATUS Status; - DWORD Oldest; TRACE("%p, %p\n", hEventLog, OldestRecord); - if (OldestRecord == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RpcTryExcept - { - Status = ElfrOldestRecord(hEventLog, - &Oldest); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - *OldestRecord = Oldest; + Status = ElfOldestRecord(hEventLog, OldestRecord); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } return TRUE; } @@ -537,30 +641,96 @@ * hEventLog [] * hEvent [] */ +NTSTATUS +NTAPI +ElfChangeNotify(IN HANDLE hEventLog, + IN HANDLE hEvent) +{ + NTSTATUS Status; + CLIENT_ID ClientId = NtCurrentTeb()->ClientId; + RPC_CLIENT_ID RpcClientId; + + RpcClientId.UniqueProcess = HandleToUlong(ClientId.UniqueProcess); + RpcClientId.UniqueThread = HandleToUlong(ClientId.UniqueThread); + + RpcTryExcept + { + Status = ElfrChangeNotify(hEventLog, RpcClientId, (DWORD)hEvent); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI NotifyChangeEventLog(IN HANDLE hEventLog, IN HANDLE hEvent) { - /* Use ElfrChangeNotify */ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS Status; + + TRACE("%p, %p\n", hEventLog, hEvent); + + Status = ElfChangeNotify(hEventLog, hEvent); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + return TRUE; } /****************************************************************************** * OpenBackupEventLogA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfOpenBackupEventLogA(IN PANSI_STRING UNCServerNameA, + IN PANSI_STRING BackupFileNameA, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PSTR pUNCServerName = NULL; + + if (!phEventLog || !BackupFileNameA || (BackupFileNameA->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameA && (UNCServerNameA->Length != 0)) + pUNCServerName = UNCServerNameA->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrOpenBELA(pUNCServerName, + (PRPC_STRING)BackupFileNameA, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI OpenBackupEventLogA(IN LPCSTR lpUNCServerName, IN LPCSTR lpFileName) { + NTSTATUS Status; + HANDLE LogHandle; ANSI_STRING UNCServerNameA; UNICODE_STRING UNCServerNameW; ANSI_STRING FileNameA; UNICODE_STRING FileNameW; - HANDLE LogHandle; - NTSTATUS Status; TRACE("%s, %s\n", lpUNCServerName, lpFileName); @@ -622,13 +792,46 @@ * lpUNCServerName [] * lpFileName [] */ +NTSTATUS +NTAPI +ElfOpenBackupEventLogW(IN PUNICODE_STRING UNCServerNameU, + IN PUNICODE_STRING BackupFileNameU, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PWSTR pUNCServerName = NULL; + + if (!phEventLog || !BackupFileNameU || (BackupFileNameU->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameU && (UNCServerNameU->Length != 0)) + pUNCServerName = UNCServerNameU->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrOpenBELW(pUNCServerName, + (PRPC_UNICODE_STRING)BackupFileNameU, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI OpenBackupEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpFileName) { - UNICODE_STRING FileNameW; - IELF_HANDLE LogHandle; - NTSTATUS Status; + NTSTATUS Status; + HANDLE hEventLog; + UNICODE_STRING UNCServerName, FileName; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpFileName)); @@ -638,29 +841,19 @@ return NULL; } - if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileNameW, + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - RpcTryExcept - { - Status = ElfrOpenBELW((LPWSTR)lpUNCServerName, - (PRPC_UNICODE_STRING)&FileNameW, - 1, - 1, - &LogHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (FileNameW.Buffer != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameW.Buffer); + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); + + Status = ElfOpenBackupEventLogW(&UNCServerName, &FileName, &hEventLog); + + if (FileName.Buffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, FileName.Buffer); if (!NT_SUCCESS(Status)) { @@ -668,7 +861,7 @@ return NULL; } - return (HANDLE)LogHandle; + return hEventLog; } @@ -686,52 +879,61 @@ * Success: Handle to an event log. * Failure: NULL */ +NTSTATUS +NTAPI +ElfOpenEventLogA(IN PANSI_STRING UNCServerNameA, + IN PANSI_STRING SourceNameA, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PSTR pUNCServerName = NULL; + + if (!phEventLog || !SourceNameA || (SourceNameA->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameA && (UNCServerNameA->Length != 0)) + pUNCServerName = UNCServerNameA->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrOpenELA(pUNCServerName, + (PRPC_STRING)SourceNameA, + &EmptyStringA, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI OpenEventLogA(IN LPCSTR lpUNCServerName, IN LPCSTR lpSourceName) { - LPSTR UNCServerName; - ANSI_STRING SourceName; - IELF_HANDLE LogHandle = NULL; - NTSTATUS Status; + NTSTATUS Status; + HANDLE hEventLog; + ANSI_STRING UNCServerName, SourceName; TRACE("%s, %s\n", lpUNCServerName, lpSourceName); - if (lpSourceName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); + RtlInitAnsiString(&UNCServerName, lpUNCServerName); + RtlInitAnsiString(&SourceName, lpSourceName); + + Status = ElfOpenEventLogA(&UNCServerName, &SourceName, &hEventLog); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); return NULL; } - if (lpUNCServerName == NULL || *lpUNCServerName == 0) - UNCServerName = NULL; - else - UNCServerName = (LPSTR)lpUNCServerName; - - RtlInitAnsiString(&SourceName, lpSourceName); - - RpcTryExcept - { - Status = ElfrOpenELA(UNCServerName, - (PRPC_STRING)&SourceName, - &EmptyStringA, - 1, - 1, - &LogHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return NULL; - } - - return (HANDLE)LogHandle; + return hEventLog; } @@ -742,58 +944,116 @@ * lpUNCServerName [] * lpSourceName [] */ +NTSTATUS +NTAPI +ElfOpenEventLogW(IN PUNICODE_STRING UNCServerNameU, + IN PUNICODE_STRING SourceNameU, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PWSTR pUNCServerName = NULL; + + if (!phEventLog || !SourceNameU || (SourceNameU->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameU && (UNCServerNameU->Length != 0)) + pUNCServerName = UNCServerNameU->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrOpenELW(pUNCServerName, + (PRPC_UNICODE_STRING)SourceNameU, + &EmptyStringU, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI OpenEventLogW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - LPWSTR UNCServerName; - UNICODE_STRING SourceName; - IELF_HANDLE LogHandle; - NTSTATUS Status; + NTSTATUS Status; + HANDLE hEventLog; + UNICODE_STRING UNCServerName, SourceName; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); - if (lpSourceName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); + RtlInitUnicodeString(&SourceName, lpSourceName); + + Status = ElfOpenEventLogW(&UNCServerName, &SourceName, &hEventLog); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); return NULL; } - if (lpUNCServerName == NULL || *lpUNCServerName == 0) - UNCServerName = NULL; - else - UNCServerName = (LPWSTR)lpUNCServerName; - - RtlInitUnicodeString(&SourceName, lpSourceName); - - RpcTryExcept - { - Status = ElfrOpenELW(UNCServerName, - (PRPC_UNICODE_STRING)&SourceName, - &EmptyStringU, - 1, - 1, - &LogHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - if (!NT_SUCCESS(Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return NULL; - } - - return (HANDLE)LogHandle; + return hEventLog; } /****************************************************************************** * ReadEventLogA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfReadEventLogA(IN HANDLE hEventLog, + IN ULONG ReadFlags, + IN ULONG RecordOffset, + OUT LPVOID Buffer, + IN ULONG NumberOfBytesToRead, + OUT PULONG NumberOfBytesRead, + OUT PULONG MinNumberOfBytesNeeded) +{ + NTSTATUS Status; + ULONG Flags; + + if (!Buffer || !NumberOfBytesRead || !MinNumberOfBytesNeeded) + { + return STATUS_INVALID_PARAMETER; + } + + Flags = ReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); + if (Flags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) + { + return STATUS_INVALID_PARAMETER; + } + + Flags = ReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); + if (Flags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) + { + return STATUS_INVALID_PARAMETER; + } + + RpcTryExcept + { + Status = ElfrReadELA(hEventLog, + ReadFlags, + RecordOffset, + NumberOfBytesToRead, + Buffer, + NumberOfBytesRead, + MinNumberOfBytesNeeded); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ReadEventLogA(IN HANDLE hEventLog, IN DWORD dwReadFlags, @@ -804,54 +1064,18 @@ OUT DWORD *pnMinNumberOfBytesNeeded) { NTSTATUS Status; - DWORD bytesRead, minNumberOfBytesNeeded; - DWORD dwFlags; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - if (lpBuffer == NULL || - pnBytesRead == NULL || - pnMinNumberOfBytesNeeded == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); - if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); - if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RpcTryExcept - { - Status = ElfrReadELA(hEventLog, - dwReadFlags, - dwRecordOffset, - nNumberOfBytesToRead, - lpBuffer, - &bytesRead, - &minNumberOfBytesNeeded); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - *pnBytesRead = (DWORD)bytesRead; - *pnMinNumberOfBytesNeeded = (DWORD)minNumberOfBytesNeeded; - + Status = ElfReadEventLogA(hEventLog, + dwReadFlags, + dwRecordOffset, + lpBuffer, + nNumberOfBytesToRead, + pnBytesRead, + pnMinNumberOfBytesNeeded); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -874,6 +1098,55 @@ * pnBytesRead [] * pnMinNumberOfBytesNeeded [] */ +NTSTATUS +NTAPI +ElfReadEventLogW(IN HANDLE hEventLog, + IN ULONG ReadFlags, + IN ULONG RecordOffset, + OUT LPVOID Buffer, + IN ULONG NumberOfBytesToRead, + OUT PULONG NumberOfBytesRead, + OUT PULONG MinNumberOfBytesNeeded) +{ + NTSTATUS Status; + ULONG Flags; + + if (!Buffer || !NumberOfBytesRead || !MinNumberOfBytesNeeded) + { + return STATUS_INVALID_PARAMETER; + } + + Flags = ReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); + if (Flags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) + { + return STATUS_INVALID_PARAMETER; + } + + Flags = ReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); + if (Flags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) + { + return STATUS_INVALID_PARAMETER; + } + + RpcTryExcept + { + Status = ElfrReadELW(hEventLog, + ReadFlags, + RecordOffset, + NumberOfBytesToRead, + Buffer, + NumberOfBytesRead, + MinNumberOfBytesNeeded); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ReadEventLogW(IN HANDLE hEventLog, IN DWORD dwReadFlags, @@ -884,54 +1157,18 @@ OUT DWORD *pnMinNumberOfBytesNeeded) { NTSTATUS Status; - DWORD bytesRead, minNumberOfBytesNeeded; - DWORD dwFlags; TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded); - if (lpBuffer == NULL || - pnBytesRead == NULL || - pnMinNumberOfBytesNeeded == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - dwFlags = dwReadFlags & (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ); - if (dwFlags == (EVENTLOG_SEQUENTIAL_READ | EVENTLOG_SEEK_READ)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - dwFlags = dwReadFlags & (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ); - if (dwFlags == (EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RpcTryExcept - { - Status = ElfrReadELW(hEventLog, - dwReadFlags, - dwRecordOffset, - nNumberOfBytesToRead, - lpBuffer, - &bytesRead, - &minNumberOfBytesNeeded); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - *pnBytesRead = (DWORD)bytesRead; - *pnMinNumberOfBytesNeeded = (DWORD)minNumberOfBytesNeeded; - + Status = ElfReadEventLogW(hEventLog, + dwReadFlags, + dwRecordOffset, + lpBuffer, + nNumberOfBytesToRead, + pnBytesRead, + pnMinNumberOfBytesNeeded); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -945,40 +1182,61 @@ /****************************************************************************** * RegisterEventSourceA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfRegisterEventSourceA(IN PANSI_STRING UNCServerNameA, + IN PANSI_STRING SourceNameA, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PSTR pUNCServerName = NULL; + + if (!phEventLog || !SourceNameA || (SourceNameA->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameA && (UNCServerNameA->Length != 0)) + pUNCServerName = UNCServerNameA->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrRegisterEventSourceA(pUNCServerName, + (PRPC_STRING)SourceNameA, + &EmptyStringA, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI RegisterEventSourceA(IN LPCSTR lpUNCServerName, IN LPCSTR lpSourceName) { - ANSI_STRING SourceName; - IELF_HANDLE LogHandle; - NTSTATUS Status; + NTSTATUS Status; + HANDLE hEventLog; + ANSI_STRING UNCServerName, SourceName; TRACE("%s, %s\n", lpUNCServerName, lpSourceName); + RtlInitAnsiString(&UNCServerName, lpUNCServerName); RtlInitAnsiString(&SourceName, lpSourceName); - RpcTryExcept - { - Status = ElfrRegisterEventSourceA((LPSTR)lpUNCServerName, - (PRPC_STRING)&SourceName, - &EmptyStringA, - 1, - 1, - &LogHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - + Status = ElfRegisterEventSourceA(&UNCServerName, &SourceName, &hEventLog); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return NULL; } - return (HANDLE)LogHandle; + return hEventLog; } @@ -994,46 +1252,122 @@ * Success: Handle * Failure: NULL */ +NTSTATUS +NTAPI +ElfRegisterEventSourceW(IN PUNICODE_STRING UNCServerNameU, + IN PUNICODE_STRING SourceNameU, + OUT PHANDLE phEventLog) +{ + NTSTATUS Status; + PWSTR pUNCServerName = NULL; + + if (!phEventLog || !SourceNameU || (SourceNameU->Length == 0)) + return STATUS_INVALID_PARAMETER; + + if (UNCServerNameU && (UNCServerNameU->Length != 0)) + pUNCServerName = UNCServerNameU->Buffer; + + *phEventLog = NULL; + + RpcTryExcept + { + Status = ElfrRegisterEventSourceW(pUNCServerName, + (PRPC_UNICODE_STRING)SourceNameU, + &EmptyStringU, + 1, 1, + (IELF_HANDLE*)phEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + HANDLE WINAPI RegisterEventSourceW(IN LPCWSTR lpUNCServerName, IN LPCWSTR lpSourceName) { - UNICODE_STRING SourceName; - IELF_HANDLE LogHandle; - NTSTATUS Status; + NTSTATUS Status; + HANDLE hEventLog; + UNICODE_STRING UNCServerName, SourceName; TRACE("%s, %s\n", debugstr_w(lpUNCServerName), debugstr_w(lpSourceName)); + RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&SourceName, lpSourceName); - RpcTryExcept - { - Status = ElfrRegisterEventSourceW((LPWSTR)lpUNCServerName, - (PRPC_UNICODE_STRING)&SourceName, - &EmptyStringU, - 1, - 1, - &LogHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - + Status = ElfRegisterEventSourceW(&UNCServerName, &SourceName, &hEventLog); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return NULL; } - return (HANDLE)LogHandle; + return hEventLog; } /****************************************************************************** * ReportEventA [ADVAPI32.@] */ +NTSTATUS +NTAPI +ElfReportEventA(IN HANDLE hEventLog, + IN USHORT EventType, + IN USHORT EventCategory, + IN ULONG EventID, + IN PSID UserSID, + IN USHORT NumStrings, + IN ULONG DataSize, + IN PANSI_STRING* Strings, + IN PVOID Data, + IN USHORT Flags, + IN OUT PULONG RecordNumber, + IN OUT PULONG TimeWritten) +{ + NTSTATUS Status; + LARGE_INTEGER SystemTime; + ULONG Time; + ULONG dwSize; + ANSI_STRING ComputerName; + CHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + + dwSize = ARRAYSIZE(szComputerName); + GetComputerNameA(szComputerName, &dwSize); + RtlInitAnsiString(&ComputerName, szComputerName); + + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &Time); + + RpcTryExcept + { + Status = ElfrReportEventA(hEventLog, + Time, + EventType, + EventCategory, + EventID, + NumStrings, + DataSize, + (PRPC_STRING)&ComputerName, + UserSID, + (PRPC_STRING*)Strings, + Data, + Flags, + RecordNumber, + TimeWritten); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ReportEventA(IN HANDLE hEventLog, IN WORD wType, @@ -1047,12 +1381,7 @@ { NTSTATUS Status; PANSI_STRING *Strings; - ANSI_STRING ComputerName; WORD i; - CHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD dwSize; - LARGE_INTEGER SystemTime; - ULONG Seconds; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, @@ -1078,35 +1407,18 @@ } } - dwSize = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameA(szComputerName, &dwSize); - RtlInitAnsiString(&ComputerName, szComputerName); - - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &Seconds); - - RpcTryExcept - { - Status = ElfrReportEventA(hEventLog, - Seconds, - wType, - wCategory, - dwEventID, - wNumStrings, - dwDataSize, - (PRPC_STRING)&ComputerName, - lpUserSid, - (PRPC_STRING*)Strings, - lpRawData, - 0, - NULL, - NULL); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; + Status = ElfReportEventA(hEventLog, + wType, + wCategory, + dwEventID, + lpUserSid, + wNumStrings, + dwDataSize, + Strings, + lpRawData, + 0, + NULL, + NULL); for (i = 0; i < wNumStrings; i++) { @@ -1140,6 +1452,61 @@ * lpStrings [] * lpRawData [] */ +NTSTATUS +NTAPI +ElfReportEventW(IN HANDLE hEventLog, + IN USHORT EventType, + IN USHORT EventCategory, + IN ULONG EventID, + IN PSID UserSID, + IN USHORT NumStrings, + IN ULONG DataSize, + IN PUNICODE_STRING* Strings, + IN PVOID Data, + IN USHORT Flags, + IN OUT PULONG RecordNumber, + IN OUT PULONG TimeWritten) +{ + NTSTATUS Status; + LARGE_INTEGER SystemTime; + ULONG Time; + ULONG dwSize; + UNICODE_STRING ComputerName; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + + dwSize = ARRAYSIZE(szComputerName); + GetComputerNameW(szComputerName, &dwSize); + RtlInitUnicodeString(&ComputerName, szComputerName); + + NtQuerySystemTime(&SystemTime); + RtlTimeToSecondsSince1970(&SystemTime, &Time); + + RpcTryExcept + { + Status = ElfrReportEventW(hEventLog, + Time, + EventType, + EventCategory, + EventID, + NumStrings, + DataSize, + (PRPC_UNICODE_STRING)&ComputerName, + UserSID, + (PRPC_UNICODE_STRING*)Strings, + Data, + Flags, + RecordNumber, + TimeWritten); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + BOOL WINAPI ReportEventW(IN HANDLE hEventLog, IN WORD wType, @@ -1153,19 +1520,14 @@ { NTSTATUS Status; PUNICODE_STRING *Strings; - UNICODE_STRING ComputerName; WORD i; - WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD dwSize; - LARGE_INTEGER SystemTime; - ULONG Seconds; TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData); Strings = HeapAlloc(GetProcessHeap(), - 0, + HEAP_ZERO_MEMORY, wNumStrings * sizeof(PUNICODE_STRING)); if (!Strings) { @@ -1177,42 +1539,25 @@ { Strings[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(ANSI_STRING)); + sizeof(UNICODE_STRING)); if (Strings[i]) { RtlInitUnicodeString(Strings[i], lpStrings[i]); } } - dwSize = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(szComputerName, &dwSize); - RtlInitUnicodeString(&ComputerName, szComputerName); - - NtQuerySystemTime(&SystemTime); - RtlTimeToSecondsSince1970(&SystemTime, &Seconds); - - RpcTryExcept - { - Status = ElfrReportEventW(hEventLog, - Seconds, - wType, - wCategory, - dwEventID, - wNumStrings, - dwDataSize, - (PRPC_UNICODE_STRING)&ComputerName, - lpUserSid, - (PRPC_UNICODE_STRING*)Strings, - lpRawData, - 0, - NULL, - NULL); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; + Status = ElfReportEventW(hEventLog, + wType, + wCategory, + dwEventID, + lpUserSid, + wNumStrings, + dwDataSize, + Strings, + lpRawData, + 0, + NULL, + NULL); for (i = 0; i < wNumStrings; i++) { @@ -1231,33 +1576,68 @@ return TRUE; } -BOOL WINAPI -ElfReportEventW(DWORD param1, - DWORD param2, - DWORD param3, - DWORD param4, - DWORD param5, - DWORD param6, - DWORD param7, - DWORD param8, - DWORD param9, - DWORD param10, - DWORD param11, - DWORD param12) -{ - return TRUE; -} - -HANDLE WINAPI -ElfRegisterEventSourceW(DWORD param1, - DWORD param2, - DWORD param3) -{ - return (HANDLE)1; -} - -BOOL WINAPI -ElfDeregisterEventSource(IN HANDLE hEventLog) -{ - return TRUE; -} +NTSTATUS +NTAPI +ElfReportEventAndSourceW(IN HANDLE hEventLog, + IN ULONG Time, + IN PUNICODE_STRING ComputerName, + IN USHORT EventType, + IN USHORT EventCategory, + IN ULONG EventID, + IN PSID UserSID, + IN PUNICODE_STRING SourceName, + IN USHORT NumStrings, + IN ULONG DataSize, + IN PUNICODE_STRING* Strings, + IN PVOID Data, + IN USHORT Flags, + IN OUT PULONG RecordNumber, + IN OUT PULONG TimeWritten) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrReportEventAndSourceW(hEventLog, + Time, + EventType, + EventCategory, + EventID, + (PRPC_UNICODE_STRING)SourceName, + NumStrings, + DataSize, + (PRPC_UNICODE_STRING)ComputerName, + (PRPC_SID)UserSID, + (PRPC_UNICODE_STRING*)Strings, + (PBYTE)Data, + Flags, + RecordNumber, + TimeWritten); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + +NTSTATUS +NTAPI +ElfFlushEventLog(IN HANDLE hEventLog) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = ElfrFlushEL(hEventLog); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +}

1 0

[hbelusca] 71383: [IDL]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 22 May '16

22 May '16

Author: hbelusca Date: Sun May 22 22:20:25 2016 New Revision: 71383 URL: http://svn.reactos.org/svn/reactos?rev=71383&view=rev Log: [IDL]: Whitespace fixes only. Modified: trunk/reactos/sdk/include/reactos/idl/eventlogrpc.acf trunk/reactos/sdk/include/reactos/idl/lsa.acf trunk/reactos/sdk/include/reactos/idl/pnp.acf trunk/reactos/sdk/include/reactos/idl/sam.acf trunk/reactos/sdk/include/reactos/idl/svcctl.acf trunk/reactos/sdk/include/reactos/idl/winreg.acf Modified: trunk/reactos/sdk/include/reactos/idl/eventlogrpc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/ev… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/eventlogrpc.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/eventlogrpc.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - implicit_handle(handle_t bindhandle), strict_context_handle + implicit_handle(handle_t bindhandle), strict_context_handle ] interface eventlog { Modified: trunk/reactos/sdk/include/reactos/idl/lsa.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/ls… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/lsa.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/lsa.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - explicit_handle + explicit_handle ] interface lsarpc { Modified: trunk/reactos/sdk/include/reactos/idl/pnp.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/pn… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/pnp.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/pnp.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - explicit_handle + explicit_handle ] interface pnp { Modified: trunk/reactos/sdk/include/reactos/idl/sam.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/sa… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/sam.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/sam.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - explicit_handle + explicit_handle ] interface samr { Modified: trunk/reactos/sdk/include/reactos/idl/svcctl.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/sv… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/svcctl.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/svcctl.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - explicit_handle + explicit_handle ] interface svcctl { Modified: trunk/reactos/sdk/include/reactos/idl/winreg.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/wi… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/winreg.acf [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/winreg.acf [iso-8859-1] Sun May 22 22:20:25 2016 @@ -1,5 +1,5 @@ [ - explicit_handle + explicit_handle ] interface winreg {

1 0

[tfaber] 71382: [RTL] - Return the ACE pointer from RtlFirstFreeAce also if it is at the end of the ACL buffer. CORE-11304 #resolve
by tfaber＠svn.reactos.org 22 May '16

22 May '16

Author: tfaber Date: Sun May 22 22:11:54 2016 New Revision: 71382 URL: http://svn.reactos.org/svn/reactos?rev=71382&view=rev Log: [RTL] - Return the ACE pointer from RtlFirstFreeAce also if it is at the end of the ACL buffer. CORE-11304 #resolve Added: trunk/rostests/apitests/ntdll/RtlDeleteAce.c (with props) trunk/rostests/apitests/ntdll/RtlFirstFreeAce.c (with props) Modified: trunk/reactos/sdk/lib/rtl/acl.c trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/reactos/sdk/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/acl.c?rev=7138… ============================================================================== --- trunk/reactos/sdk/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/acl.c [iso-8859-1] Sun May 22 22:11:54 2016 @@ -41,7 +41,7 @@ } /* If the last spot is empty and still valid, return it */ - if ((ULONG_PTR)Current < AclEnd) *FirstFreeAce = Current; + if ((ULONG_PTR)Current <= AclEnd) *FirstFreeAce = Current; return TRUE; } Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun May 22 22:11:54 2016 @@ -22,11 +22,13 @@ RtlAllocateHeap.c RtlBitmap.c RtlCopyMappedMemory.c + RtlDeleteAce.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c RtlDosPathNameToNtPathName_U.c RtlDosSearchPath_U.c RtlDosSearchPath_Ustr.c + RtlFirstFreeAce.c RtlGenerate8dot3Name.c RtlGetFullPathName_U.c RtlGetFullPathName_Ustr.c Added: trunk/rostests/apitests/ntdll/RtlDeleteAce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDeleteA… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDeleteAce.c (added) +++ trunk/rostests/apitests/ntdll/RtlDeleteAce.c [iso-8859-1] Sun May 22 22:11:54 2016 @@ -0,0 +1,260 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlDeleteAce + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +static +PVOID +AllocateGuarded( + _In_ SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); + PVOID VirtualMemory = NULL; + PCHAR StartOfBuffer; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); + + if (!NT_SUCCESS(Status)) + return NULL; + + Size -= PAGE_SIZE; + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + return NULL; + } + } + + StartOfBuffer = VirtualMemory; + StartOfBuffer += Size - SizeRequested; + + return StartOfBuffer; +} + +static +VOID +FreeGuarded( + _In_ PVOID Pointer) +{ + NTSTATUS Status; + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +PACL +MakeAcl( + _In_ ULONG AceCount, + ...) +{ + PACL Acl; + PACE_HEADER AceHeader; + ULONG AclSize; + ULONG AceSizes[10]; + ULONG i; + va_list Args; + + ASSERT(AceCount <= RTL_NUMBER_OF(AceSizes)); + AclSize = sizeof(ACL); + va_start(Args, AceCount); + for (i = 0; i < AceCount; i++) + { + AceSizes[i] = va_arg(Args, int); + AclSize += AceSizes[i]; + } + va_end(Args); + + Acl = AllocateGuarded(AclSize); + if (!Acl) + { + skip("Failed to allocate %lu bytes\n", AclSize); + return NULL; + } + + Acl->AclRevision = ACL_REVISION; + Acl->Sbz1 = 0; + Acl->AclSize = AclSize; + Acl->AceCount = AceCount; + Acl->Sbz2 = 0; + + AceHeader = (PACE_HEADER)(Acl + 1); + for (i = 0; i < AceCount; i++) + { + AceHeader->AceType = 0; + AceHeader->AceFlags = 0; + AceHeader->AceSize = AceSizes[i]; + AceHeader = (PACE_HEADER)((PCHAR)AceHeader + AceHeader->AceSize); + } + + return Acl; +} + +START_TEST(RtlDeleteAce) +{ + PACL Acl; + PACCESS_ALLOWED_ACE Ace; + ULONG AceSize; + PISID Sid; + NTSTATUS Status; + int i; + + Acl = MakeAcl(0); + if (Acl) + { + ok(RtlValidAcl(Acl), "Acl is invalid\n"); + + /* There is no first ACE -- should stay untouched */ + Status = RtlDeleteAce(Acl, 0); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL), "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 0, "AceCount = %u\n", Acl->AceCount); + + /* Index -1 -- should stay untouched */ + Status = RtlDeleteAce(Acl, 0xFFFFFFFF); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + FreeGuarded(Acl); + } + + AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority); + Acl = MakeAcl(1, (int)AceSize); + if (Acl) + { + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + Ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + Sid = (PISID)&Ace->SidStart; + Sid->Revision = SID_REVISION; + Sid->SubAuthorityCount = 0; + RtlZeroMemory(&Sid->IdentifierAuthority, sizeof(Sid->IdentifierAuthority)); + + ok(RtlValidAcl(Acl), "Acl is invalid\n"); + + /* Out of bounds delete -- should stay untouched */ + Status = RtlDeleteAce(Acl, 1); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + AceSize, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 1, "AceCount = %u\n", Acl->AceCount); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + + /* Index -1 -- should stay untouched */ + Status = RtlDeleteAce(Acl, 0xFFFFFFFF); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + AceSize, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 1, "AceCount = %u\n", Acl->AceCount); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + + /* Delete the first (and only) ACE */ + Status = RtlDeleteAce(Acl, 0); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + AceSize, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 0, "AceCount = %u\n", Acl->AceCount); + ok(Ace->Header.AceSize == 0, "AceSize = %u\n", Ace->Header.AceSize); + FreeGuarded(Acl); + } + + AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + FIELD_OFFSET(SID, SubAuthority[1]); + Acl = MakeAcl(4, (int)AceSize, (int)AceSize + 4, (int)AceSize + 8, (int)AceSize + 12); + if (Acl) + { + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + for (i = 0; i < 4; i++) + { + Ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + Sid = (PISID)&Ace->SidStart; + Sid->Revision = SID_REVISION; + Sid->SubAuthorityCount = 0; + RtlZeroMemory(&Sid->IdentifierAuthority, sizeof(Sid->IdentifierAuthority)); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + } + + ok(RtlValidAcl(Acl), "Acl is invalid\n"); + + /* Out of bounds delete -- should stay untouched */ + Status = RtlDeleteAce(Acl, 4); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 4, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 4, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 8, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 12, "AceSize = %u\n", Ace->Header.AceSize); + + /* Index -1 -- should stay untouched */ + Status = RtlDeleteAce(Acl, 0xFFFFFFFF); + ok(Status == STATUS_INVALID_PARAMETER, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 4, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 4, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 8, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 12, "AceSize = %u\n", Ace->Header.AceSize); + + /* Delete the last ACE */ + Status = RtlDeleteAce(Acl, 3); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 3, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 4, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 8, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == 0, "AceSize = %u\n", Ace->Header.AceSize); + + /* Delete the second ACE */ + Status = RtlDeleteAce(Acl, 1); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 2, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == AceSize, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == AceSize + 8, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == 0, "AceSize = %u\n", Ace->Header.AceSize); + + /* Delete the first ACE */ + Status = RtlDeleteAce(Acl, 0); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 1, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == AceSize + 8, "AceSize = %u\n", Ace->Header.AceSize); + Ace = (PACCESS_ALLOWED_ACE)((PCHAR)Ace + Ace->Header.AceSize); + ok(Ace->Header.AceSize == 0, "AceSize = %u\n", Ace->Header.AceSize); + + /* Delete the remaining ACE */ + Status = RtlDeleteAce(Acl, 0); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + ok(Acl->AclSize == sizeof(ACL) + 4 * AceSize + 24, "AclSize = %u\n", Acl->AclSize); + ok(Acl->AceCount == 0, "AceCount = %u\n", Acl->AceCount); + Ace = (PACCESS_ALLOWED_ACE)(Acl + 1); + ok(Ace->Header.AceSize == 0, "AceSize = %u\n", Ace->Header.AceSize); + + FreeGuarded(Acl); + } +} Propchange: trunk/rostests/apitests/ntdll/RtlDeleteAce.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/ntdll/RtlFirstFreeAce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlFirstFr… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlFirstFreeAce.c (added) +++ trunk/rostests/apitests/ntdll/RtlFirstFreeAce.c [iso-8859-1] Sun May 22 22:11:54 2016 @@ -0,0 +1,234 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for RtlFirstFreeAce + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +static +PVOID +AllocateGuarded( + _In_ SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); + PVOID VirtualMemory = NULL; + PCHAR StartOfBuffer; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); + + if (!NT_SUCCESS(Status)) + return NULL; + + Size -= PAGE_SIZE; + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + return NULL; + } + } + + StartOfBuffer = VirtualMemory; + StartOfBuffer += Size - SizeRequested; + + return StartOfBuffer; +} + +static +VOID +FreeGuarded( + _In_ PVOID Pointer) +{ + NTSTATUS Status; + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +PACL +MakeAcl( + _In_ ULONG AceCount, + ...) +{ + PACL Acl; + PACE_HEADER AceHeader; + ULONG AclSize; + ULONG AceSizes[10]; + ULONG i; + va_list Args; + + ASSERT(AceCount <= RTL_NUMBER_OF(AceSizes)); + AclSize = sizeof(ACL); + va_start(Args, AceCount); + for (i = 0; i < AceCount; i++) + { + AceSizes[i] = va_arg(Args, int); + AclSize += AceSizes[i]; + } + va_end(Args); + + Acl = AllocateGuarded(AclSize); + if (!Acl) + { + skip("Failed to allocate %lu bytes\n", AclSize); + return NULL; + } + + Acl->AclRevision = ACL_REVISION; + Acl->Sbz1 = 0; + Acl->AclSize = AclSize; + Acl->AceCount = AceCount; + Acl->Sbz2 = 0; + + AceHeader = (PACE_HEADER)(Acl + 1); + for (i = 0; i < AceCount; i++) + { + AceHeader->AceType = 0; + AceHeader->AceFlags = 0; + AceHeader->AceSize = AceSizes[i]; + AceHeader = (PACE_HEADER)((PCHAR)AceHeader + AceHeader->AceSize); + } + + return Acl; +} + +START_TEST(RtlFirstFreeAce) +{ + PACL Acl; + PACE FirstAce; + BOOLEAN Found; + + Acl = MakeAcl(0); + if (Acl) + { + /* Simple empty ACL */ + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == (PACE)(Acl + 1), "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Not enough space */ + Acl->AclSize = sizeof(ACL) - 1; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Invalid values for all the other fields */ + Acl->AclRevision = 76; + Acl->Sbz1 = 0x55; + Acl->AclSize = sizeof(ACL); + Acl->Sbz2 = 0x55; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == (PACE)(Acl + 1), "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + FreeGuarded(Acl); + } + + Acl = MakeAcl(1, (int)sizeof(ACE_HEADER)); + if (Acl) + { + /* ACL with one ACE */ + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == (PACE)((PACE_HEADER)(Acl + 1) + 1), "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* The one ACE doesn't actually fit */ + Acl->AclSize = sizeof(ACL); + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == FALSE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Only the first byte fits */ + Acl->AclSize = sizeof(ACL) + 1; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Until we cover the whole size we get NULL */ + Acl->AclSize = sizeof(ACL) + sizeof(ACE_HEADER) - 1; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + FreeGuarded(Acl); + } + + /* Same but bigger */ + Acl = MakeAcl(1, (int)sizeof(ACE_HEADER) + 4); + if (Acl) + { + /* ACL with one ACE */ + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == (PACE)((PCHAR)(Acl + 1) + sizeof(ACE_HEADER) + 4), "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* The one ACE doesn't actually fit */ + Acl->AclSize = sizeof(ACL); + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == FALSE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Only the first byte fits */ + Acl->AclSize = sizeof(ACL) + 1; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* Until we cover the whole size we get NULL */ + Acl->AclSize = sizeof(ACL) + sizeof(ACE_HEADER) - 3; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + FreeGuarded(Acl); + } + + Acl = MakeAcl(4, (int)sizeof(ACE_HEADER), (int)sizeof(ACE_HEADER), (int)sizeof(ACCESS_ALLOWED_ACE), (int)sizeof(ACCESS_ALLOWED_ACE)); + if (Acl) + { + /* ACL with one ACE */ + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == (PACE)((PCHAR)(Acl + 1) + 2 * sizeof(ACE_HEADER) + 2 * sizeof(ACCESS_ALLOWED_ACE)), "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* One less gives us NULL */ + Acl->AclSize = sizeof(ACL) + 2 * sizeof(ACE_HEADER) + 2 * sizeof(ACCESS_ALLOWED_ACE) - 1; + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == TRUE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + /* One ACE less also gives us FALSE */ + Acl->AclSize = sizeof(ACL) + 2 * sizeof(ACE_HEADER) + sizeof(ACCESS_ALLOWED_ACE); + FirstAce = InvalidPointer; + Found = RtlFirstFreeAce(Acl, &FirstAce); + ok(Found == FALSE, "Found = %u\n", Found); + ok(FirstAce == NULL, "FirstAce = %p (Acl was %p)\n", FirstAce, Acl); + + FreeGuarded(Acl); + } +} Propchange: trunk/rostests/apitests/ntdll/RtlFirstFreeAce.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun May 22 22:11:54 2016 @@ -26,11 +26,13 @@ extern void func_RtlAllocateHeap(void); extern void func_RtlBitmap(void); extern void func_RtlCopyMappedMemory(void); +extern void func_RtlDeleteAce(void); extern void func_RtlDetermineDosPathNameType(void); extern void func_RtlDoesFileExists(void); extern void func_RtlDosPathNameToNtPathName_U(void); extern void func_RtlDosSearchPath_U(void); extern void func_RtlDosSearchPath_Ustr(void); +extern void func_RtlFirstFreeAce(void); extern void func_RtlGenerate8dot3Name(void); extern void func_RtlGetFullPathName_U(void); extern void func_RtlGetFullPathName_Ustr(void); @@ -69,11 +71,13 @@ { "RtlAllocateHeap", func_RtlAllocateHeap }, { "RtlBitmapApi", func_RtlBitmap }, { "RtlCopyMappedMemory", func_RtlCopyMappedMemory }, + { "RtlDeleteAce", func_RtlDeleteAce }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType }, { "RtlDoesFileExists", func_RtlDoesFileExists }, { "RtlDosPathNameToNtPathName_U", func_RtlDosPathNameToNtPathName_U }, { "RtlDosSearchPath_U", func_RtlDosSearchPath_U }, { "RtlDosSearchPath_Ustr", func_RtlDosSearchPath_Ustr }, + { "RtlFirstFreeAce", func_RtlFirstFreeAce }, { "RtlGenerate8dot3Name", func_RtlGenerate8dot3Name }, { "RtlGetFullPathName_U", func_RtlGetFullPathName_U }, { "RtlGetFullPathName_Ustr", func_RtlGetFullPathName_Ustr },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs