Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22718: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it.
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 20:42:21 2006 New Revision: 22718 URL: http://svn.reactos.org/svn/reactos?rev=22718&view=rev Log: Small clean up 1. Remove goto in the code, goto is slow and should be avoid. 2. reformat for adding {} around some code. 3. remove some NULL check after I did remove goto that is not longer need it. Modified: trunk/reactos/base/services/eventlog/eventlog.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 20:42:21 2006 @@ -61,7 +61,7 @@ DWORD MaxValueLen, ValueLen, Type, ExpandedLen; WCHAR *Buf = NULL, *Expanded = NULL; LONG Result; - BOOL ret = FALSE; + BOOL ret = TRUE; PLOGFILE pLogf; DPRINT("LoadLogFile: %S\n", LogName); @@ -88,12 +88,14 @@ if(Result != ERROR_SUCCESS) { DPRINT1("RegQueryValueEx failed: %d\n", GetLastError()); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } if(Type != REG_EXPAND_SZ && Type != REG_SZ) { DPRINT1("%S\\File - value of wrong type %x.\n", LogName, Type); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } ExpandedLen = ExpandEnvironmentStrings(Buf, NULL, 0); @@ -102,7 +104,8 @@ if(!Expanded) { DPRINT1("Can't allocate heap!\n"); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); @@ -114,14 +117,11 @@ if(pLogf == NULL) { DPRINT1("Failed to create %S!\n", Expanded); - goto cleanup; - } - - ret = TRUE; - -cleanup: + ret = FALSE; + } + HeapFree(MyHeap, 0, Buf); - if(Expanded) HeapFree(MyHeap, 0, Expanded); + HeapFree(MyHeap, 0, Expanded); return ret; } @@ -129,8 +129,7 @@ { LONG result; DWORD MaxLognameLen, LognameLen; - WCHAR *Buf = NULL; - BOOL ret = FALSE; + WCHAR *Buf = NULL; INT i; RegQueryInfoKey(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, @@ -143,7 +142,7 @@ if(!Buf) { DPRINT1("Error: can't allocate heap!\n"); - return ret; + return FALSE; } i = 0; @@ -159,7 +158,8 @@ if(result != ERROR_SUCCESS) { DPRINT1("Failed to open %S key.\n", Buf); - goto cleanup; + HeapFree(MyHeap, 0, Buf); + return FALSE; } if(!LoadLogFile(SubKey, Buf)) @@ -171,18 +171,14 @@ i++; } - ret = TRUE; - -cleanup: HeapFree(MyHeap, 0, Buf); - return ret; + return TRUE; } INT main() { WCHAR LogPath[MAX_PATH]; - PLOGFILE pLogf; - INT RetCode = 0; + PLOGFILE pLogf; LONG result; HKEY elogKey; @@ -193,8 +189,15 @@ if(MyHeap==NULL) { DPRINT1("FATAL ERROR, can't create heap.\n"); - RetCode = 1; - goto bye_bye; + + DeleteCriticalSection(&LogListCs); + // Close all log files. + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { + LogfClose(pLogf); + } + + return 1; } GetWindowsDirectory(LogPath, MAX_PATH); @@ -214,8 +217,17 @@ if(result != ERROR_SUCCESS) { DPRINT1("Fatal error: can't open eventlog registry key.\n"); - RetCode = 1; - goto bye_bye; + + DeleteCriticalSection(&LogListCs); + + // Close all log files. + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { + LogfClose(pLogf); + } + + HeapDestroy(MyHeap); + return 1; } LoadLogFiles(elogKey); @@ -223,16 +235,16 @@ StartServiceCtrlDispatcher(ServiceTable); -bye_bye: DeleteCriticalSection(&LogListCs); // Close all log files. for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + { LogfClose(pLogf); + } - if(MyHeap) HeapDestroy(MyHeap); - - return RetCode; + HeapDestroy(MyHeap); + return 0; } VOID EventTimeToSystemTime(DWORD EventTime,

1 0

[ion] 22717: - Fix IRP/Completion packet lookaside allocation. We weren't setting a zone size, and I/O Completion packets were also using the wrong size. - Rewrite I/O MDl support to use lookaside lists for allocations below 23 pages (same as on NT). This is is an incredible performance optimization because MDLs are often allocated and de-allocated during I/O operations, and using the lookaside list decreases pool fragmentation and slowdown. - Rewrite IoBuildPartialMdl. It did not work like docu
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 19:59:06 2006 New Revision: 22717 URL: http://svn.reactos.org/svn/reactos?rev=22717&view=rev Log: - Fix IRP/Completion packet lookaside allocation. We weren't setting a zone size, and I/O Completion packets were also using the wrong size. - Rewrite I/O MDl support to use lookaside lists for allocations below 23 pages (same as on NT). This is is an incredible performance optimization because MDLs are often allocated and de-allocated during I/O operations, and using the lookaside list decreases pool fragmentation and slowdown. - Rewrite IoBuildPartialMdl. It did not work like documented in the DDK and also had a bug documented by Microsoft as being in XP. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/mdl.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Fri Jun 30 19:59:06 2006 @@ -47,6 +47,14 @@ // Number of partition tables in the Boot Record // #define PARTITION_TBL_SIZE 4 + +// +// We can call the Ob Inlined API, it's the same thing +// +#define IopAllocateMdlFromLookaside \ + ObpAllocateCapturedAttributes +#define IopFreeMdlFromLookaside \ + ObpFreeCapturedAttributes // // Returns the size of a CM_RESOURCE_LIST @@ -830,4 +838,4 @@ extern POBJECT_TYPE IoCompletionType; extern PDEVICE_NODE IopRootDeviceNode; extern ULONG IopTraceLevel; - +extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Fri Jun 30 19:59:06 2006 @@ -41,6 +41,7 @@ extern POBJECT_TYPE IoAdapterObjectType; NPAGED_LOOKASIDE_LIST IoLargeIrpLookaside; NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; +NPAGED_LOOKASIDE_LIST IopMdlLookasideList; VOID INIT_FUNCTION IopInitLookasideLists(VOID); @@ -74,7 +75,7 @@ INIT_FUNCTION IopInitLookasideLists(VOID) { - ULONG LargeIrpSize, SmallIrpSize; + ULONG LargeIrpSize, SmallIrpSize, MdlSize; LONG i; PKPRCB Prcb; PNPAGED_LOOKASIDE_LIST CurrentList = NULL; @@ -82,6 +83,7 @@ /* Calculate the sizes */ LargeIrpSize = sizeof(IRP) + (8 * sizeof(IO_STACK_LOCATION)); SmallIrpSize = sizeof(IRP) + sizeof(IO_STACK_LOCATION); + MdlSize = sizeof(MDL) + (23 * sizeof(PFN_NUMBER)); /* Initialize the Lookaside List for Large IRPs */ ExInitializeNPagedLookasideList(&IoLargeIrpLookaside, @@ -90,7 +92,7 @@ 0, LargeIrpSize, IO_LARGEIRP, - 0); + 64); /* Initialize the Lookaside List for Small IRPs */ ExInitializeNPagedLookasideList(&IoSmallIrpLookaside, @@ -99,7 +101,7 @@ 0, SmallIrpSize, IO_SMALLIRP, - 0); + 32); /* Initialize the Lookaside List for I\O Completion */ ExInitializeNPagedLookasideList(&IoCompletionPacketLookaside, @@ -108,7 +110,16 @@ 0, sizeof(IO_COMPLETION_PACKET), IOC_TAG1, - 0); + 32); + + /* Initialize the Lookaside List for MDLs */ + ExInitializeNPagedLookasideList(&IopMdlLookasideList, + NULL, + NULL, + 0, + MdlSize, + TAG_MDL, + 128); /* Now allocate the per-processor lists */ for (i = 0; i < KeNumberProcessors; i++) @@ -131,7 +142,7 @@ 0, LargeIrpSize, IO_LARGEIRP_CPU, - 0); + 64); } else { @@ -146,14 +157,14 @@ IO_SMALLIRP_CPU); if (CurrentList) { - /* Initialize the Lookaside List for Large IRPs */ + /* Initialize the Lookaside List for Small IRPs */ ExInitializeNPagedLookasideList(CurrentList, NULL, NULL, 0, SmallIrpSize, IO_SMALLIRP_CPU, - 0); + 32); } else { @@ -173,15 +184,37 @@ NULL, NULL, 0, + sizeof(IO_COMPLETION_PACKET), + IO_SMALLIRP_CPU, + 32); + } + else + { + CurrentList = &IoCompletionPacketLookaside; + } + Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; + + /* Set the MDL Completion List */ + Prcb->PPLookasideList[LookasideMdlList].L = &IopMdlLookasideList.L; + CurrentList = ExAllocatePoolWithTag(NonPagedPool, + sizeof(NPAGED_LOOKASIDE_LIST), + TAG_MDL); + if (CurrentList) + { + /* Initialize the Lookaside List for MDLs */ + ExInitializeNPagedLookasideList(CurrentList, + NULL, + NULL, + 0, SmallIrpSize, - IOC_CPU, - 0); + TAG_MDL, + 128); } else { - CurrentList = &IoCompletionPacketLookaside; - } - Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; + CurrentList = &IopMdlLookasideList; + } + Prcb->PPLookasideList[LookasideMdlList].P = &CurrentList->L; } DPRINT("Done allocation\n"); Modified: trunk/reactos/ntoskrnl/io/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/mdl.c?rev=2271… ============================================================================== --- trunk/reactos/ntoskrnl/io/mdl.c (original) +++ trunk/reactos/ntoskrnl/io/mdl.c Fri Jun 30 19:59:06 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/mdl.c - * PURPOSE: Io manager mdl functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for MDL Allocation and Deallocation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -20,116 +18,143 @@ * @implemented */ PMDL -STDCALL -IoAllocateMdl(PVOID VirtualAddress, - ULONG Length, - BOOLEAN SecondaryBuffer, - BOOLEAN ChargeQuota, - PIRP Irp) +NTAPI +IoAllocateMdl(IN PVOID VirtualAddress, + IN ULONG Length, + IN BOOLEAN SecondaryBuffer, + IN BOOLEAN ChargeQuota, + IN PIRP Irp) { - PMDL Mdl; + PMDL Mdl = NULL, p; + ULONG Flags = 0; + ULONG Size; - if (ChargeQuota) - { -// Mdl = ExAllocatePoolWithQuota(NonPagedPool, -// MmSizeOfMdl(VirtualAddress,Length)); - Mdl = ExAllocatePoolWithTag(NonPagedPool, - MmSizeOfMdl(VirtualAddress,Length), - TAG_MDL); - } - else - { - Mdl = ExAllocatePoolWithTag(NonPagedPool, - MmSizeOfMdl(VirtualAddress,Length), - TAG_MDL); - } - MmInitializeMdl(Mdl, (char*)VirtualAddress, Length); + /* Fail if allocation is over 2GB */ + if (Length & 0x80000000) return NULL; - if (Irp) - { - if (SecondaryBuffer) - { - ASSERT(Irp->MdlAddress); + /* Calculate the number of pages for the allocation */ + Size = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress, Length); + if (Size > 23) + { + /* This is bigger then our fixed-size MDLs. Calculate real size */ + Size *= sizeof(PFN_NUMBER); + Size += sizeof(MDL); + if (Size > MAXUSHORT) return NULL; + } + else + { + /* Use an internal fixed MDL size */ + Size = (23 * sizeof(PFN_NUMBER)) + sizeof(MDL); + Flags |= MDL_ALLOCATED_FIXED_SIZE; - /* FIXME: add to end of list maybe?? */ - Mdl->Next = Irp->MdlAddress->Next; - Irp->MdlAddress->Next = Mdl; + /* Allocate one from the lookaside list */ + Mdl = IopAllocateMdlFromLookaside(LookasideMdlList); + } + + /* Check if we don't have an mdl yet */ + if (!Mdl) + { + /* Allocate one from pool */ + Mdl = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_MDL); + if (!Mdl) return NULL; + } + + /* Initialize it */ + MmInitializeMdl(Mdl, VirtualAddress, Length); + Mdl->MdlFlags |= Flags; + + /* Check if an IRP was given too */ + if (Irp) + { + /* Check if it came with a secondary buffer */ + if (SecondaryBuffer) + { + /* Insert the MDL at the end */ + p = Irp->MdlAddress; + while (p->Next) p = p->Next; + p->Next = Mdl; } else { - /* - * What if there's allready an mdl at Irp->MdlAddress? - * Is that bad and should we do something about it? - */ - Irp->MdlAddress = Mdl; + /* Otherwise, insert it directly */ + Irp->MdlAddress = Mdl; } } - return(Mdl); -} - -/* - * @implemented - * - * You must IoFreeMdl the slave before freeing the master. - * - * IoBuildPartialMdl is more similar to MmBuildMdlForNonPagedPool, the difference - * is that the former takes the physical addresses from the master MDL, while the - * latter - from the known location of the NPP. - */ -VOID -STDCALL -IoBuildPartialMdl(PMDL SourceMdl, - PMDL TargetMdl, - PVOID VirtualAddress, - ULONG Length) -{ - PPFN_TYPE TargetPages = (PPFN_TYPE)(TargetMdl + 1); - PPFN_TYPE SourcePages = (PPFN_TYPE)(SourceMdl + 1); - ULONG Count; - ULONG Delta; - - DPRINT("VirtualAddress 0x%p, SourceMdl->StartVa 0x%p, SourceMdl->MappedSystemVa 0x%p\n", - VirtualAddress, SourceMdl->StartVa, SourceMdl->MappedSystemVa); - - TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); - TargetMdl->ByteOffset = (ULONG_PTR)VirtualAddress - (ULONG_PTR)TargetMdl->StartVa; - TargetMdl->ByteCount = Length; - TargetMdl->Process = SourceMdl->Process; - Delta = (ULONG_PTR)VirtualAddress - ((ULONG_PTR)SourceMdl->StartVa + SourceMdl->ByteOffset); - TargetMdl->MappedSystemVa = (char*)SourceMdl->MappedSystemVa + Delta; - - TargetMdl->MdlFlags = SourceMdl->MdlFlags & (MDL_IO_PAGE_READ|MDL_SOURCE_IS_NONPAGED_POOL|MDL_MAPPED_TO_SYSTEM_VA); - TargetMdl->MdlFlags |= MDL_PARTIAL; - - Delta = ((ULONG_PTR)TargetMdl->StartVa - (ULONG_PTR)SourceMdl->StartVa) / PAGE_SIZE; - Count = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress,Length); - - SourcePages += Delta; - - DPRINT("Delta %d, Count %d\n", Delta, Count); - - memcpy(TargetPages, SourcePages, Count * sizeof(PFN_TYPE)); - + /* Return the allocated mdl */ + return Mdl; } /* * @implemented */ -VOID STDCALL +VOID +NTAPI +IoBuildPartialMdl(IN PMDL SourceMdl, + IN PMDL TargetMdl, + IN PVOID VirtualAddress, + IN ULONG Length) +{ + PPFN_TYPE TargetPages = (PPFN_TYPE)(TargetMdl + 1); + PPFN_TYPE SourcePages = (PPFN_TYPE)(SourceMdl + 1); + ULONG Offset; + + /* Calculate the offset */ + Offset = (ULONG)((ULONG_PTR)VirtualAddress - + (ULONG_PTR)SourceMdl->StartVa) - + SourceMdl->ByteOffset; + + /* Check if we don't have a length and calculate it */ + if (!Length) Length = SourceMdl->ByteCount - Offset; + + /* Write the process, start VA and byte data */ + TargetMdl->StartVa = (PVOID)PAGE_ROUND_DOWN(VirtualAddress); + TargetMdl->Process = SourceMdl->Process; + TargetMdl->ByteCount = Length; + TargetMdl->ByteOffset = BYTE_OFFSET(VirtualAddress); + + /* Recalculate the length in pages */ + Length = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddress, Length); + + /* Set the MDL Flags */ + TargetMdl->MdlFlags = (MDL_ALLOCATED_FIXED_SIZE | MDL_ALLOCATED_MUST_SUCCEED); + TargetMdl->MdlFlags |= (MDL_IO_PAGE_READ | + MDL_SOURCE_IS_NONPAGED_POOL | + MDL_MAPPED_TO_SYSTEM_VA | + MDL_IO_SPACE); + TargetMdl->MdlFlags |= MDL_PARTIAL; + + /* Set the mapped VA */ + TargetMdl->MappedSystemVa = (PCHAR)SourceMdl->MappedSystemVa + Offset; + + /* Now do the copy */ + Offset = ((ULONG_PTR)TargetMdl->StartVa - (ULONG_PTR)SourceMdl->StartVa) >> + PAGE_SHIFT; + SourcePages += Offset; + RtlMoveMemory(TargetPages, SourcePages, Length * sizeof(PFN_TYPE)); +} + +/* + * @implemented + */ +VOID +NTAPI IoFreeMdl(PMDL Mdl) { - /* - * This unmaps partial mdl's from kernel space but also asserts that non-partial - * mdl's isn't still mapped into kernel space. - */ - ASSERT(Mdl); - ASSERT_IRQL(DISPATCH_LEVEL); + /* Tell Mm to reuse the MDL */ + MmPrepareMdlForReuse(Mdl); - MmPrepareMdlForReuse(Mdl); - - ExFreePoolWithTag(Mdl, TAG_MDL); + /* Check if this was a pool allocation */ + if (!(Mdl->MdlFlags & MDL_ALLOCATED_FIXED_SIZE)) + { + /* Free it from the pool */ + ExFreePoolWithTag(Mdl, TAG_MDL); + } + else + { + /* Free it from the lookaside */ + IopFreeMdlFromLookaside(Mdl, LookasideMdlList); + } } - /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/mdl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 22716: sorry I did broke the comping some typo
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 19:53:57 2006 New Revision: 22716 URL: http://svn.reactos.org/svn/reactos?rev=22716&view=rev Log: sorry I did broke the comping some typo Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Jun 30 19:53:57 2006 @@ -1,4 +1,4 @@ - o/* +/* * Copyright (C) 2005 Casper S. Hornstrup * * This program is free software; you can redistribute it and/or modify

1 0

[greatlrd] 22715: fixing strip working right strip -sx does not working u must type strip -s -x not togther as -sx, I did add -X direcly after it will strip away local informations as well
by greatlrd＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: greatlrd Date: Fri Jun 30 19:38:30 2006 New Revision: 22715 URL: http://svn.reactos.org/svn/reactos?rev=22715&view=rev Log: fixing strip working right strip -sx does not working u must type strip -s -x not togther as -sx, I did add -X direcly after it will strip away local informations as well Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Jun 30 19:38:30 2006 @@ -1,4 +1,4 @@ -/* + o/* * Copyright (C) 2005 Casper S. Hornstrup * * This program is free software; you can redistribute it and/or modify @@ -1517,7 +1517,7 @@ fprintf ( fMakefile, "\t$(ECHO_STRIP)\n" ); fprintf ( fMakefile, - "\t${strip} -sx $@\n\n" ); + "\t${strip} -s -x -X $@\n\n" ); fprintf ( fMakefile, "endif\n" ); }

1 0

[tretiakov] 22714: Alex Ionescu said that check for Expanded==NULL must stay...
by tretiakov＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: tretiakov Date: Fri Jun 30 19:12:55 2006 New Revision: 22714 URL: http://svn.reactos.org/svn/reactos?rev=22714&view=rev Log: Alex Ionescu said that check for Expanded==NULL must stay... Modified: trunk/reactos/base/services/eventlog/eventlog.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 19:12:55 2006 @@ -121,7 +121,7 @@ cleanup: HeapFree(MyHeap, 0, Buf); - HeapFree(MyHeap, 0, Expanded); + if(Expanded) HeapFree(MyHeap, 0, Expanded); return ret; }

1 0

[tretiakov] 22713: Silence debug messages. Check for Expanded==NULL is useless, because it's done in HeapFree (thx hpoussin).
by tretiakov＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: tretiakov Date: Fri Jun 30 19:07:23 2006 New Revision: 22713 URL: http://svn.reactos.org/svn/reactos?rev=22713&view=rev Log: Silence debug messages. Check for Expanded==NULL is useless, because it's done in HeapFree (thx hpoussin). Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 19:07:23 2006 @@ -121,7 +121,7 @@ cleanup: HeapFree(MyHeap, 0, Buf); - if(Expanded) HeapFree(MyHeap, 0, Expanded); + HeapFree(MyHeap, 0, Expanded); return ret; } Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h (original) +++ trunk/reactos/base/services/eventlog/eventlog.h Fri Jun 30 19:07:23 2006 @@ -10,6 +10,7 @@ #ifndef __EVENTLOG_H__ #define __EVENTLOG_H__ +#define NDEBUG #define WIN32_NO_STATUS #include <windows.h>

1 0

[tretiakov] 22712: Read configuration from registry
by tretiakov＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: tretiakov Date: Fri Jun 30 18:53:24 2006 New Revision: 22712 URL: http://svn.reactos.org/svn/reactos?rev=22712&view=rev Log: Read configuration from registry Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c (original) +++ trunk/reactos/base/services/eventlog/eventlog.c Fri Jun 30 18:53:24 2006 @@ -7,25 +7,25 @@ * Copyright 2005 Saveliy Tretiakov */ +/* INCLUDES *****************************************************************/ #include "eventlog.h" +/* GLOBALS ******************************************************************/ + VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv); - SERVICE_TABLE_ENTRY ServiceTable[2] = { {L"EventLog", (LPSERVICE_MAIN_FUNCTION)ServiceMain}, {NULL, NULL} }; -/* GLOBAL VARIABLES */ HANDLE MyHeap = NULL; -PLOGFILE SystemLog = NULL; -PLOGFILE ApplicationLog = NULL; -PLOGFILE SecurityLog = NULL; BOOL onLiveCD = FALSE; // On livecd events will go to debug output only - extern CRITICAL_SECTION LogListCs; +extern PLOGFILE LogListHead; + +/* FUNCTIONS ****************************************************************/ VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv) { @@ -56,23 +56,146 @@ #endif } - -int main(int argc, char *argv[]) +BOOL LoadLogFile(HKEY hKey, WCHAR *LogName) +{ + DWORD MaxValueLen, ValueLen, Type, ExpandedLen; + WCHAR *Buf = NULL, *Expanded = NULL; + LONG Result; + BOOL ret = FALSE; + PLOGFILE pLogf; + + DPRINT("LoadLogFile: %S\n", LogName); + + RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, &MaxValueLen, NULL, NULL); + + Buf = HeapAlloc(MyHeap, 0, MaxValueLen); + + if(!Buf) + { + DPRINT1("Can't allocate heap!\n"); + return FALSE; + } + + ValueLen = MaxValueLen; + + Result = RegQueryValueEx(hKey, L"File", + NULL, + &Type, + (LPBYTE)Buf, + &ValueLen); + + if(Result != ERROR_SUCCESS) + { + DPRINT1("RegQueryValueEx failed: %d\n", GetLastError()); + goto cleanup; + } + if(Type != REG_EXPAND_SZ && Type != REG_SZ) + { + DPRINT1("%S\\File - value of wrong type %x.\n", LogName, Type); + goto cleanup; + } + + ExpandedLen = ExpandEnvironmentStrings(Buf, NULL, 0); + Expanded = HeapAlloc(MyHeap, 0, ExpandedLen*sizeof(WCHAR)); + + if(!Expanded) + { + DPRINT1("Can't allocate heap!\n"); + goto cleanup; + } + + ExpandEnvironmentStrings(Buf, Expanded, ExpandedLen); + + DPRINT("%S -> %S\n", Buf, Expanded); + + pLogf = LogfCreate(LogName, Expanded); + + if(pLogf == NULL) + { + DPRINT1("Failed to create %S!\n", Expanded); + goto cleanup; + } + + ret = TRUE; + +cleanup: + HeapFree(MyHeap, 0, Buf); + if(Expanded) HeapFree(MyHeap, 0, Expanded); + return ret; +} + +BOOL LoadLogFiles(HKEY eventlogKey) +{ + LONG result; + DWORD MaxLognameLen, LognameLen; + WCHAR *Buf = NULL; + BOOL ret = FALSE; + INT i; + + RegQueryInfoKey(eventlogKey, NULL, NULL, NULL, NULL, &MaxLognameLen, + NULL, NULL, NULL, NULL, NULL, NULL); + + MaxLognameLen++; + + Buf = HeapAlloc(MyHeap, 0, MaxLognameLen*sizeof(WCHAR)); + + if(!Buf) + { + DPRINT1("Error: can't allocate heap!\n"); + return ret; + } + + i = 0; + LognameLen=MaxLognameLen; + + while(RegEnumKeyEx(eventlogKey, i, Buf, &LognameLen, NULL, NULL, + NULL, NULL) == ERROR_SUCCESS) + { + HKEY SubKey; + DPRINT("%S\n", Buf); + + result = RegOpenKeyEx(eventlogKey, Buf, 0, KEY_ALL_ACCESS, &SubKey); + if(result != ERROR_SUCCESS) + { + DPRINT1("Failed to open %S key.\n", Buf); + goto cleanup; + } + + if(!LoadLogFile(SubKey, Buf)) + DPRINT1("Failed to load %S\n", Buf); + else DPRINT("Loaded %S\n", Buf); + + RegCloseKey(SubKey); + LognameLen=MaxLognameLen; + i++; + } + + ret = TRUE; + +cleanup: + HeapFree(MyHeap, 0, Buf); + return ret; +} + +INT main() { WCHAR LogPath[MAX_PATH]; + PLOGFILE pLogf; + INT RetCode = 0; + LONG result; + HKEY elogKey; + + InitializeCriticalSection(&LogListCs); + MyHeap = HeapCreate(0, 1024*256, 0); if(MyHeap==NULL) { - DbgPrint("EventLog: FATAL ERROR, can't create heap.\n"); - return 1; - } - - InitializeCriticalSection(&LogListCs); - - /* - This will be fixed in near future - */ + DPRINT1("FATAL ERROR, can't create heap.\n"); + RetCode = 1; + goto bye_bye; + } GetWindowsDirectory(LogPath, MAX_PATH); if(GetDriveType(LogPath) == DRIVE_CDROM) @@ -82,38 +205,34 @@ } else { - lstrcat(LogPath, L"\\system32\\config\\SysEvent.evt"); - - SystemLog = LogfCreate(L"System", LogPath); - - if(SystemLog == NULL) + result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\EventLog", + 0, + KEY_ALL_ACCESS, + &elogKey); + + if(result != ERROR_SUCCESS) { - DbgPrint("EventLog: FATAL ERROR, can't create %S\n", LogPath); - HeapDestroy(MyHeap); - return 1; + DPRINT1("Fatal error: can't open eventlog registry key.\n"); + RetCode = 1; + goto bye_bye; } - - GetWindowsDirectory(LogPath, MAX_PATH); - lstrcat(LogPath, L"\\system32\\config\\AppEvent.evt"); - - ApplicationLog = LogfCreate(L"Application", LogPath); - - if(ApplicationLog == NULL) - { - DbgPrint("EventLog: FATAL ERROR, can't create %S\n", LogPath); - HeapDestroy(MyHeap); - return 1; - } + + LoadLogFiles(elogKey); } StartServiceCtrlDispatcher(ServiceTable); - - LogfClose(SystemLog); +bye_bye: DeleteCriticalSection(&LogListCs); - HeapDestroy(MyHeap); - - return 0; + + // Close all log files. + for(pLogf = LogListHead; pLogf; pLogf = ((PLOGFILE)pLogf)->Next) + LogfClose(pLogf); + + if(MyHeap) HeapDestroy(MyHeap); + + return RetCode; } VOID EventTimeToSystemTime(DWORD EventTime, @@ -238,6 +357,3 @@ DPRINT("Length2=%d\n", *(PDWORD)(((PBYTE)pRec)+pRec->Length-4)); } - - - Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h (original) +++ trunk/reactos/base/services/eventlog/eventlog.h Fri Jun 30 18:53:24 2006 @@ -11,6 +11,7 @@ #define __EVENTLOG_H__ #define WIN32_NO_STATUS + #include <windows.h> #include <lpctypes.h> #include <lpcfuncs.h> Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c (original) +++ trunk/reactos/base/services/eventlog/file.c Fri Jun 30 18:53:24 2006 @@ -300,7 +300,7 @@ EnterCriticalSection(&LogListCs); for(Item = LogListHead; Item; Item = (PLOGFILE)Item->Next) - if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) + if(Item->LogName && lstrcmpi(Item->LogName, Name)==0) { Ret = Item; break; @@ -319,7 +319,7 @@ EnterCriticalSection(&LogListCs); for(Item = LogListHead; Item; i++, Item = (PLOGFILE)Item->Next) - if(Item->LogName && lstrcmpW(Item->LogName, Name)==0) + if(Item->LogName && lstrcmpi(Item->LogName, Name)==0) { ret = i; break; Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… ============================================================================== --- trunk/reactos/base/services/eventlog/logport.c (original) +++ trunk/reactos/base/services/eventlog/logport.c Fri Jun 30 18:53:24 2006 @@ -15,7 +15,6 @@ HANDLE ConnectPortHandle = NULL; HANDLE MessagePortHandle = NULL; -extern PLOGFILE SystemLog; extern HANDLE MyHeap; extern BOOL onLiveCD; @@ -125,10 +124,10 @@ NTSTATUS Status; PLOGFILE SystemLog = NULL; - DPRINT1("ProcessPortMessage() called\n"); - - Status = STATUS_SUCCESS; - + DPRINT("ProcessPortMessage() called\n"); + + SystemLog = LogfListItemByName(L"System"); + while(TRUE) { Status = NtReplyWaitReceivePort( @@ -217,4 +216,3 @@ } return Status; } -

1 0

[tretiakov] 22711: Add some registry settings for eventlog
by tretiakov＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: tretiakov Date: Fri Jun 30 18:52:01 2006 New Revision: 22711 URL: http://svn.reactos.org/svn/reactos?rev=22711&view=rev Log: Add some registry settings for eventlog Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Fri Jun 30 18:52:01 2006 @@ -532,12 +532,20 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001 ; Event logging service +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Enables event log messages issued by Windows-based programs and components to be viewed in Event Viewer. This service cannot be stopped" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%SystemRoot%\system32\eventlog.exe" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00000010 + +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","File",0x00020000,"%SystemRoot%\system32\config\AppEvent.Evt" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","File",0x00020000,"%SystemRoot%\system32\config\SecEvent.Evt" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt" ; DHCP client service HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Manages network configuration by registering and updating IP addresses and DNS names"

1 0

[hpoussin] 22710: Add merge operation
by hpoussin＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: hpoussin Date: Fri Jun 30 16:28:36 2006 New Revision: 22710 URL: http://svn.reactos.org/svn/reactos?rev=22710&view=rev Log: Add merge operation Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=22710&r1=… ============================================================================== --- trunk/tools/wineimport.cmd (original) +++ trunk/tools/wineimport.cmd Fri Jun 30 16:28:36 2006 @@ -8,6 +8,7 @@ IF "%1" == "download" GOTO download IF "%1" == "process" GOTO process IF "%1" == "link" GOTO link +IF "%1" == "merge" GOTO merge IF "%1" == "fullprocessing" GOTO fullprocessing :help @@ -15,6 +16,7 @@ ECHO %0 download {wine_lib} [{wine_lib} ...] ECHO %0 process {wine_lib} [{wine_lib} ...] ECHO %0 link {path_to_reactos} {wine_lib} +ECHO %0 merge {path_to_reactos} {wine_lib} [{wine_lib} ...] ECHO %0 fullprocessing {path_to_reactos} {wine_lib} [{wine_lib} ...] GOTO :eof @@ -23,6 +25,11 @@ SET CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine ECHO *** Password is "cvs" *** cvs.exe login +IF ERRORLEVEL 2 ( + ECHO Error when executing cvs.exe. Try to download the lastest version at + ECHO http://ftp.gnu.org/non-gnu/cvs/binary/stable/x86-woe/ +) +IF ERRORLEVEL 1 GOTO :eof :startdownload ECHO Downloading %2 ... >NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 @@ -107,6 +114,54 @@ ) GOTO :eof +:merge +IF "%3" == "" GOTO help +IF NOT EXIST "%2\ReactOS.rbuild" ( + ECHO %2\ReactOS.rbuild doesn't exit. + GOTO :help +) +SET WINE_ROS_DIR=%2 +:mergenext +SHIFT +IF "%2" == "" GOTO :eof +IF NOT EXIST "wine\dlls\%2" GOTO :mergenext +COPY /Y "wine\dlls\%2\*.*" "%WINE_ROS_DIR%\dll\win32\%2" >NUL +FOR /F "delims=" %%f IN ('DIR /B "%WINE_ROS_DIR%\dll\win32\%2\*.*"') DO ( + IF "%%f" == ".cvsignore" ( + DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + ) ELSE IF "%%f" == "Makefile.in" ( + DEL "%WINE_ROS_DIR%\dll\win32\%2\%%f" + ) ELSE IF NOT EXIST "wine\dlls\%2\%%f" ( + SET WINE_FILE=%%f + IF NOT "%WINE_FILE:~-9" == "_ros.diff" ( + svn.exe delete "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + ) + ) ELSE ( + svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%%f" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%%f" >NUL 2>NUL + ) +) +IF EXIST "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" ( + svn.exe add "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" 2>NUL + IF ERRORLEVEL 2 GOTO :helpsvn + svn.exe propset svn:eol-style native "%WINE_ROS_DIR%\dll\win32\%2\%2_ros.diff" >NUL 2>NUL + PUSHD "%WINE_ROS_DIR%" + patch.exe -p0 -N < "dll\win32\%2\%2_ros.diff" + POPD + IF ERRORLEVEL 1 ( + ECHO Error when executing patch.exe. Try to download the lastest version at + ECHO http://unxutils.sourceforge.net/ + GOTO :eof + ) +) +GOTO :mergenext +:helpsvn +ECHO Error when executing svn.exe. Try to download the lastest version at +ECHO http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 +GOTO :eof + :fullprocessing SETLOCAL ENABLEEXTENSIONS IF "%3" == "" GOTO help @@ -119,10 +174,14 @@ GOTO fullprocessing_filllist :fullprocessing_download CALL :download download%WINE_LIST% +IF ERRORLEVEL 1 GOTO :eof FOR %%m IN (%WINE_LIST%) DO ( >wine\dlls\%%m\%%m.rbuild CALL :process process %%m CALL :link link "%WINE_ROS_DIR%" %%m -) + IF ERRORLEVEL 1 GOTO :eof +) +CALL :merge merge "%WINE_ROS_DIR%" %WINE_LIST% +IF ERRORLEVEL 1 GOTO :eof IF EXIST "%WINE_ROS_DIR%\makefile.auto" DEL "%WINE_ROS_DIR%\makefile.auto" PUSHD "%WINE_ROS_DIR%" make.exe %WINE_LIST%

1 0

[ion] 22709: - Name decorate and fix some formatting snafus.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 09:58:23 2006 New Revision: 22709 URL: http://svn.reactos.org/svn/reactos?rev=22709&view=rev Log: - Name decorate and fix some formatting snafus. Modified: trunk/reactos/ntoskrnl/io/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iofunc.c Fri Jun 30 09:58:23 2006 @@ -23,17 +23,13 @@ /* PRIVATE FUNCTIONS *********************************************************/ - static NTSTATUS NTAPI +NTSTATUS +NTAPI IopQueryDirectoryFileCompletion(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) + IN PIRP Irp, + IN PVOID Context) { - ASSERT (Context); - - DPRINT("IopQueryDirectoryFileCompletion was called for \'%wZ\'\n", Context); - ExFreePool(Context); - return STATUS_SUCCESS; } @@ -62,14 +58,6 @@ OBJECT_HANDLE_INFORMATION HandleInformation; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - DPRINT("IopDeviceFsIoControl(DeviceHandle 0x%p Event 0x%p UserApcRoutine 0x%p " - "UserApcContext 0x%p IoStatusBlock 0x%p IoControlCode %x " - "InputBuffer 0x%p InputBufferLength %x OutputBuffer 0x%p " - "OutputBufferLength 0x%p)\n", - DeviceHandle,Event,UserApcRoutine,UserApcContext,IoStatusBlock, - IoControlCode,InputBuffer,InputBufferLength,OutputBuffer, - OutputBufferLength); - AccessType = IO_METHOD_FROM_CTL_CODE(IoControlCode); if (PreviousMode != KernelMode) @@ -85,9 +73,7 @@ { if (OutputBuffer != NULL) { - ProbeForWrite(OutputBuffer, - OutputBufferLength, - 1); + ProbeForWrite(OutputBuffer, OutputBufferLength, 1); } else { @@ -100,9 +86,7 @@ { if (InputBuffer != NULL) { - ProbeForRead(InputBuffer, - InputBufferLength, - 1); + ProbeForRead(InputBuffer, InputBufferLength, 1); } else { @@ -117,11 +101,7 @@ } _SEH_END; - if (!NT_SUCCESS(Status)) - { - DPRINT("Probing the buffers failed!\n"); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; } /* Don't check for access rights right now, KernelMode can do anything */ @@ -141,8 +121,6 @@ !RtlAreAllAccessesGranted(HandleInformation.GrantedAccess, (ACCESS_MASK)((IoControlCode >> 14) & 3))) { - DPRINT1("Insufficient access rights! Granted: 0x%x Desired: 0x%x\n", - HandleInformation.GrantedAccess, (ACCESS_MASK)((IoControlCode >> 14) & 3)); ObDereferenceObject (FileObject); return STATUS_ACCESS_DENIED; } @@ -163,7 +141,7 @@ ObDereferenceObject (FileObject); return Status; } - + /* Clear it */ KeClearEvent(EventObject); } @@ -200,17 +178,10 @@ FALSE, EventObject, IoStatusBlock); - - if (Irp == NULL) - { - DPRINT1("IoBuildDeviceIoControlRequest failed!\n"); - - if (EventObject != NULL) - { - ObDereferenceObject (EventObject); - } - - ObDereferenceObject (FileObject); + if (!Irp) + { + if (EventObject) ObDereferenceObject(EventObject); + ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -221,9 +192,10 @@ Irp->Overlay.AsynchronousParameters.UserApcContext = UserApcContext; StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; - StackPtr->MajorFunction = IsDevIoCtl ? - IRP_MJ_DEVICE_CONTROL : IRP_MJ_FILE_SYSTEM_CONTROL; - + StackPtr->MajorFunction = IsDevIoCtl ? + IRP_MJ_DEVICE_CONTROL : + IRP_MJ_FILE_SYSTEM_CONTROL; + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) @@ -250,11 +222,11 @@ */ NTSTATUS NTAPI -IoSynchronousPageWrite(PFILE_OBJECT FileObject, - PMDL Mdl, - PLARGE_INTEGER Offset, - PKEVENT Event, - PIO_STATUS_BLOCK StatusBlock) +IoSynchronousPageWrite(IN PFILE_OBJECT FileObject, + IN PMDL Mdl, + IN PLARGE_INTEGER Offset, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK StatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; @@ -357,15 +329,11 @@ KEVENT Event; NTSTATUS Status; - ASSERT(FileInformation != NULL); - Status = ObReferenceObjectByPointer(FileObject, FILE_READ_ATTRIBUTES, IoFileObjectType, KernelMode); if (!NT_SUCCESS(Status)) return(Status); - - DPRINT("FileObject 0x%p\n", FileObject); /* Get the Device Object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -428,7 +396,6 @@ Status = FileObject->FinalStatus; } } - /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; @@ -459,127 +426,109 @@ NtCancelIoFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) { - PFILE_OBJECT FileObject; - PETHREAD Thread; - PIRP Irp; - KIRQL OldIrql; - BOOLEAN OurIrpsInList = FALSE; - LARGE_INTEGER Interval; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) return Status; - } - - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - return Status; - - /* IRP cancellations are synchronized at APC_LEVEL. */ - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* + PFILE_OBJECT FileObject; + PETHREAD Thread; + PIRP Irp; + KIRQL OldIrql; + BOOLEAN OurIrpsInList = FALSE; + LARGE_INTEGER Interval; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* IRP cancellations are synchronized at APC_LEVEL. */ + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* * Walk the list of active IRPs and cancel the ones that belong to * our file object. */ - Thread = PsGetCurrentThread(); - - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { - if (Irp->Tail.Overlay.OriginalFileObject == FileObject) - { - IoCancelIrp(Irp); - /* Don't break here, we want to cancel all IRPs for the file object. */ - OurIrpsInList = TRUE; - } - } - - KfLowerIrql(OldIrql); - - while (OurIrpsInList) - { - OurIrpsInList = FALSE; - - /* Wait a short while and then look if all our IRPs were completed. */ - Interval.QuadPart = -1000000; /* 100 milliseconds */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); - - OldIrql = KfRaiseIrql(APC_LEVEL); - - /* - * Look in the list if all IRPs for the specified file object - * are completed (or cancelled). If someone sends a new IRP - * for our file object while we're here we can happily loop - * forever. - */ - - LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) - { - if (Irp->Tail.Overlay.OriginalFileObject == FileObject) - { + Thread = PsGetCurrentThread(); + + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) + { + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + IoCancelIrp(Irp); + /* Don't break here, we want to cancel all IRPs for the file object. */ OurIrpsInList = TRUE; - break; - } - } - - KfLowerIrql(OldIrql); - } - - _SEH_TRY - { - IoStatusBlock->Status = STATUS_SUCCESS; - IoStatusBlock->Information = 0; - Status = STATUS_SUCCESS; - } - _SEH_HANDLE - { - Status = STATUS_UNSUCCESSFUL; - } - _SEH_END; - - ObDereferenceObject(FileObject); - - return Status; + } + } + + KfLowerIrql(OldIrql); + + while (OurIrpsInList) + { + OurIrpsInList = FALSE; + + /* Wait a short while and then look if all our IRPs were completed. */ + Interval.QuadPart = -1000000; /* 100 milliseconds */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); + + OldIrql = KfRaiseIrql(APC_LEVEL); + + /* + * Look in the list if all IRPs for the specified file object + * are completed (or cancelled). If someone sends a new IRP + * for our file object while we're here we can happily loop + * forever. + */ + + LIST_FOR_EACH(Irp, &Thread->IrpList, IRP, ThreadListEntry) + { + if (Irp->Tail.Overlay.OriginalFileObject == FileObject) + { + OurIrpsInList = TRUE; + break; + } + } + + KfLowerIrql(OldIrql); + } + + _SEH_TRY + { + IoStatusBlock->Status = STATUS_SUCCESS; + IoStatusBlock->Information = 0; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + + } + _SEH_END; + + ObDereferenceObject(FileObject); + return Status; } /* - * NAME EXPORTED - * NtDeleteFile@4 - * - * DESCRIPTION - * - * ARGUMENTS - * ObjectAttributes - * ? - * - * RETURN VALUE - * - * REVISIONS - * * @unimplemented */ NTSTATUS @@ -623,7 +572,7 @@ /* * @implemented */ -NTSTATUS +NTSTATUS NTAPI NtFsControlFile(IN HANDLE DeviceHandle, IN HANDLE Event OPTIONAL, @@ -649,19 +598,9 @@ FALSE); } -/* - * FUNCTION: Flushes cached file data to disk - * ARGUMENTS: - * FileHandle = Points to the file - * IoStatusBlock = Caller must supply storage to receive the result of - * the flush buffers operation. The information field is - * set to number of bytes flushed to disk. - * RETURNS: Status - * REMARKS: This function maps to the win32 FlushFileBuffers - */ NTSTATUS NTAPI -NtFlushBuffersFile(IN HANDLE FileHandle, +NtFlushBuffersFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) { PFILE_OBJECT FileObject = NULL; @@ -673,11 +612,8 @@ BOOLEAN LocalEvent = FALSE; ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; OBJECT_HANDLE_INFORMATION ObjectHandleInfo; - KPROCESSOR_MODE PreviousMode; - + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); if (PreviousMode != KernelMode) { @@ -804,44 +740,31 @@ IN ULONG CompletionFilter, IN BOOLEAN WatchTree) { - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - PIO_STACK_LOCATION IoStack; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("NtNotifyChangeDirectoryFile()\n"); - - PAGED_CODE(); - - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - if(BufferSize != 0) - { - ProbeForWrite(Buffer, - BufferSize, - sizeof(ULONG)); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION IoStack; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + if(BufferSize) ProbeForWrite(Buffer, BufferSize, sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) return Status; + } Status = ObReferenceObjectByHandle(FileHandle, FILE_LIST_DIRECTORY, @@ -851,55 +774,47 @@ NULL); if (Status != STATUS_SUCCESS) return(Status); - - DeviceObject = FileObject->DeviceObject; - - - Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (Irp==NULL) - { - ObDereferenceObject(FileObject); - return STATUS_UNSUCCESSFUL; - } - - if (Event == NULL) - { - Event = &FileObject->Event; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = Event; - KeResetEvent( Event ); - Irp->UserBuffer = Buffer; - Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - - IoStack = IoGetNextIrpStackLocation(Irp); - - IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; - IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY; - IoStack->Flags = 0; - IoStack->Control = 0; - IoStack->DeviceObject = DeviceObject; - IoStack->FileObject = FileObject; - - if (WatchTree) - { - IoStack->Flags = SL_WATCH_TREE; - } - - IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter; - IoStack->Parameters.NotifyDirectory.Length = BufferSize; - - Status = IoCallDriver(FileObject->DeviceObject,Irp); - - /* FIXME: Should we wait here or not for synchronously opened files? */ - - return Status; + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + ObDereferenceObject(FileObject); + return STATUS_UNSUCCESSFUL; + } + + if (!Event) Event = &FileObject->Event; + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserEvent = Event; + KeResetEvent( Event ); + Irp->UserBuffer = Buffer; + Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; + Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + + IoStack = IoGetNextIrpStackLocation(Irp); + + IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; + IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY; + IoStack->Flags = 0; + IoStack->Control = 0; + IoStack->DeviceObject = DeviceObject; + IoStack->FileObject = FileObject; + + if (WatchTree) IoStack->Flags = SL_WATCH_TREE; + + IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter; + IoStack->Parameters.NotifyDirectory.Length = BufferSize; + + Status = IoCallDriver(FileObject->DeviceObject,Irp); + + /* FIXME: Should we wait here or not for synchronously opened files? */ + + return Status; } /* @@ -925,14 +840,11 @@ PDEVICE_OBJECT DeviceObject; PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status = STATUS_SUCCESS; OBJECT_HANDLE_INFORMATION HandleInformation; - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -1018,13 +930,14 @@ } /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) { ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - /* Allocate local buffer */ + /* Allocate local buffer */ LocalLength = ExAllocatePoolWithTag(NonPagedPool, sizeof(LARGE_INTEGER), TAG_LOCK); @@ -1035,7 +948,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } *LocalLength = CapturedLength; - + /* Set up the IRP */ Irp->RequestorMode = PreviousMode; Irp->UserIosb = IoStatusBlock; @@ -1048,7 +961,7 @@ StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; StackPtr->MinorFunction = IRP_MN_LOCK; StackPtr->FileObject = FileObject; - + /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; @@ -1080,31 +993,6 @@ /* * @implemented - * - * FUNCTION: Queries a directory file. - * ARGUMENTS: - * FileHandle = Handle to a directory file - * EventHandle = Handle to the event signaled on completion - * ApcRoutine = Asynchroneous procedure callback, called on completion - * ApcContext = Argument to the apc. - * IoStatusBlock = Caller supplies storage for extended status information. - * FileInformation = Caller supplies storage for the resulting information. - * - * FileNameInformation FILE_NAMES_INFORMATION - * FileDirectoryInformation FILE_DIRECTORY_INFORMATION - * FileFullDirectoryInformation FILE_FULL_DIRECTORY_INFORMATION - * FileBothDirectoryInformation FILE_BOTH_DIR_INFORMATION - * - * Length = Size of the storage supplied - * FileInformationClass = Indicates the type of information requested. - * ReturnSingleEntry = Specify true if caller only requests the first - * directory found. - * FileName = Initial directory name to query, that may contain wild - * cards. - * RestartScan = Number of times the action should be repeated - * RETURNS: Status [ STATUS_SUCCESS, STATUS_ACCESS_DENIED, STATUS_INSUFFICIENT_RESOURCES, - * STATUS_INVALID_PARAMETER, STATUS_INVALID_DEVICE_REQUEST, STATUS_BUFFER_OVERFLOW, - * STATUS_INVALID_INFO_CLASS, STATUS_NO_SUCH_FILE, STATUS_NO_MORE_FILES ] */ NTSTATUS NTAPI @@ -1129,8 +1017,6 @@ BOOLEAN LocalEvent = FALSE; PKEVENT Event = NULL; PUNICODE_STRING SearchPattern = NULL; - - DPRINT("NtQueryDirectoryFile()\n"); PAGED_CODE(); /* Validate User-Mode Buffers */ @@ -1182,10 +1068,7 @@ PreviousMode, (PVOID *)&FileObject, NULL); - if (!NT_SUCCESS(Status)) - { - goto Cleanup; - } + if (!NT_SUCCESS(Status)) goto Cleanup; /* Get Event Object */ if (PEvent) @@ -1226,7 +1109,8 @@ } /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) { Status = STATUS_INSUFFICIENT_RESOURCES; goto Cleanup; @@ -1261,10 +1145,10 @@ { IoSetCompletionRoutine(Irp, IopQueryDirectoryFileCompletion, - SearchPattern, - TRUE, - TRUE, - TRUE); + SearchPattern, + TRUE, + TRUE, + TRUE); } /* Call the Driver */ @@ -1286,18 +1170,9 @@ return Status; Cleanup: - if (FileObject != NULL) - { - ObDereferenceObject(FileObject); - } - if (Event != NULL) - { - ObDereferenceObject(Event); - } - if (SearchPattern != NULL) - { - ExFreePool(SearchPattern); - } + if (FileObject) ObDereferenceObject(FileObject); + if (Event) ObDereferenceObject(Event); + if (SearchPattern) ExFreePool(SearchPattern); /* Return the Status */ return Status; @@ -1306,7 +1181,8 @@ /* * @unimplemented */ -NTSTATUS NTAPI +NTSTATUS +NTAPI NtQueryEaFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, @@ -1324,12 +1200,13 @@ /* * @implemented */ -NTSTATUS NTAPI -NtQueryInformationFile(HANDLE FileHandle, - PIO_STATUS_BLOCK IoStatusBlock, - PVOID FileInformation, - ULONG Length, - FILE_INFORMATION_CLASS FileInformationClass) +NTSTATUS +NTAPI +NtQueryInformationFile(IN HANDLE FileHandle, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass) { OBJECT_HANDLE_INFORMATION HandleInformation; PFILE_OBJECT FileObject; @@ -1342,13 +1219,6 @@ BOOLEAN LocalEvent = FALSE; BOOLEAN Failed = FALSE; - ASSERT(IoStatusBlock != NULL); - ASSERT(FileInformation != NULL); - - DPRINT("NtQueryInformationFile(Handle 0x%p StatBlk 0x%p FileInfo 0x%p Length %d " - "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, - Length, FileInformationClass); - /* Reference the Handle */ Status = ObReferenceObjectByHandle(FileHandle, 0, @@ -1378,7 +1248,6 @@ if (Failed) { - DPRINT1("NtQueryInformationFile() returns STATUS_ACCESS_DENIED!\n"); ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } @@ -1407,8 +1276,6 @@ return Status; } - DPRINT("FileObject 0x%p\n", FileObject); - /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -1464,9 +1331,10 @@ } /* Allocate the System Buffer */ - if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB))) + Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (!Irp->AssociatedIrp.SystemBuffer) { IoFreeIrp(Irp); ObDereferenceObject(FileObject); @@ -1540,17 +1408,6 @@ } /* - * NAME EXPORTED - * NtReadFile - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * * @implemented */ NTSTATUS @@ -1570,19 +1427,13 @@ PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; ULONG CapturedKey = 0; BOOLEAN Synchronous = FALSE; - - DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " - "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, - IoStatusBlock); - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); + CapturedByteOffset.QuadPart = 0; /* Validate User-Mode Buffers */ @@ -1596,14 +1447,14 @@ ProbeForWrite(Buffer, Length, 1); - if (ByteOffset != NULL) + + if (ByteOffset) { CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } - if (Key != NULL) - { - CapturedKey = ProbeForReadUlong(Key); - } + + if (Key) CapturedKey = ProbeForReadUlong(Key); + /* FIXME - probe other pointers and capture information */ } _SEH_HANDLE @@ -1616,14 +1467,8 @@ } else { - if (ByteOffset != NULL) - { - CapturedByteOffset = *ByteOffset; - } - if (Key != NULL) - { - CapturedKey = *Key; - } + if (ByteOffset) CapturedByteOffset = *ByteOffset; + if (Key) CapturedKey = *Key; } /* Get File Object */ @@ -1650,10 +1495,6 @@ } else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) { - /* a valid ByteOffset is required if asynch. op. */ - DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", - ByteOffset); - ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } @@ -1755,18 +1596,6 @@ return Status; } -/* - * NAME EXPORTED - * NtReadFileScatter - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ NTSTATUS NTAPI NtReadFileScatter(IN HANDLE FileHandle, @@ -1800,7 +1629,8 @@ /* * @implemented */ -NTSTATUS NTAPI +NTSTATUS +NTAPI NtSetInformationFile(HANDLE FileHandle, PIO_STATUS_BLOCK IoStatusBlock, PVOID FileInformation, @@ -1818,27 +1648,18 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); BOOLEAN Failed = FALSE; - DPRINT("NtSetInformationFile(Handle 0x%p StatBlk 0x%p FileInfo 0x%p Length %d " - "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, - Length, FileInformationClass); - if (PreviousMode != KernelMode) { _SEH_TRY { - if (IoStatusBlock != NULL) + if (IoStatusBlock) { ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); } - - if (Length != 0) - { - ProbeForRead(FileInformation, - Length, - 1); - } + + if (Length) ProbeForRead(FileInformation, Length, 1); } _SEH_HANDLE { @@ -1850,11 +1671,6 @@ { return Status; } - } - else - { - ASSERT(IoStatusBlock != NULL); - ASSERT(FileInformation != NULL); } /* Get the file object from the file handle */ @@ -1896,12 +1712,9 @@ if (Failed) { - DPRINT1("NtSetInformationFile() returns STATUS_ACCESS_DENIED!\n"); ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } - - DPRINT("FileObject 0x%p\n", FileObject); if (FileInformationClass == FilePositionInformation) { @@ -2024,9 +1837,10 @@ } /* Allocate the System Buffer */ - if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB))) + Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + if (!Irp->AssociatedIrp.SystemBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; goto failfreeirp; @@ -2147,11 +1961,11 @@ */ NTSTATUS NTAPI -NtUnlockFile(IN HANDLE FileHandle, +NtUnlockFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Length, - IN ULONG Key OPTIONAL) + IN PLARGE_INTEGER ByteOffset, + IN PLARGE_INTEGER Length, + IN ULONG Key OPTIONAL) { PFILE_OBJECT FileObject = NULL; PLARGE_INTEGER LocalLength = NULL; @@ -2160,14 +1974,11 @@ PDEVICE_OBJECT DeviceObject; KEVENT Event; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; LARGE_INTEGER CapturedByteOffset, CapturedLength; OBJECT_HANDLE_INFORMATION HandleInformation; - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); CapturedByteOffset.QuadPart = 0; CapturedLength.QuadPart = 0; @@ -2187,7 +1998,6 @@ in KernelMode! */ if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) { - DPRINT1("Invalid access rights\n"); ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } @@ -2242,13 +2052,14 @@ } /* Allocate the IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) { ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - /* Allocate local buffer */ + /* Allocate local buffer */ LocalLength = ExAllocatePoolWithTag(NonPagedPool, sizeof(LARGE_INTEGER), TAG_LOCK); @@ -2259,7 +2070,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } *LocalLength = CapturedLength; - + /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->RequestorMode = PreviousMode; @@ -2273,7 +2084,7 @@ StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE; StackPtr->FileObject = FileObject; - + /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; @@ -2308,17 +2119,6 @@ } /* - * NAME EXPORTED - * NtWriteFile - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * * @implemented */ NTSTATUS @@ -2330,7 +2130,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock, IN PVOID Buffer, IN ULONG Length, - IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ + IN PLARGE_INTEGER ByteOffset OPTIONAL, IN PULONG Key OPTIONAL) { OBJECT_HANDLE_INFORMATION ObjectHandleInfo; @@ -2339,20 +2139,14 @@ PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode; + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); BOOLEAN Synchronous = FALSE; PKEVENT EventObject = NULL; LARGE_INTEGER CapturedByteOffset; ULONG CapturedKey = 0; ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; - - DPRINT("NtWriteFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " - "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, - IoStatusBlock); - PAGED_CODE(); - PreviousMode = KeGetPreviousMode(); CapturedByteOffset.QuadPart = 0; /* Get File Object */ @@ -2386,19 +2180,14 @@ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - - ProbeForRead(Buffer, - Length, - 1); - if (ByteOffset != NULL) + ProbeForRead(Buffer, Length, 1); + + if (ByteOffset) { CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } - if (Key != NULL) - { - CapturedKey = ProbeForReadUlong(Key); - } + if (Key) CapturedKey = ProbeForReadUlong(Key); } _SEH_HANDLE { @@ -2410,14 +2199,8 @@ } else { - if (ByteOffset != NULL) - { - CapturedByteOffset = *ByteOffset; - } - if (Key != NULL) - { - CapturedKey = *Key; - } + if (ByteOffset) CapturedByteOffset = *ByteOffset; + if (Key) CapturedKey = *Key; } /* check if this is an append operation */ @@ -2443,10 +2226,6 @@ } else if (ByteOffset == NULL && !(FileObject->Flags & FO_NAMED_PIPE)) { - /* a valid ByteOffset is required if asynch. op. */ - DPRINT1("NtReadFile: missing ByteOffset for asynch. op (0x%p)\n", - ByteOffset); - ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } @@ -2505,10 +2284,7 @@ /* Cleanup on failure */ if (!NT_SUCCESS(Status)) { - if (Event) - { - ObDereferenceObject(&EventObject); - } + if (Event) ObDereferenceObject(&EventObject); ObDereferenceObject(FileObject); return Status; } @@ -2551,18 +2327,6 @@ return Status; } -/* - * NAME EXPORTED - * NtWriteFileGather - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - */ NTSTATUS NTAPI NtWriteFileGather(IN HANDLE FileHandle,

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