Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[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

[ion] 22708: - Create iofunc.c and put all functions that ultimately create a system IRP to send to a device in it, thus clearing up irp.c and file.c and making the code base more modular. - File.c now includes only functions dealing with the FILE_OBJECT itself.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 09:45:02 2006 New Revision: 22708 URL: http://svn.reactos.org/svn/reactos?rev=22708&view=rev Log: - Create iofunc.c and put all functions that ultimately create a system IRP to send to a device in it, thus clearing up irp.c and file.c and making the code base more modular. - File.c now includes only functions dealing with the FILE_OBJECT itself. Added: trunk/reactos/ntoskrnl/io/iofunc.c Modified: trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… Added: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 22707: - More name-decoration, tracing, comments, etc. - Handle cases where we ran out of memory while trying to allocate the IRP - Make sure the IRP can be re-used in IoReuseIrp.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 08:46:53 2006 New Revision: 22707 URL: http://svn.reactos.org/svn/reactos?rev=22707&view=rev Log: - More name-decoration, tracing, comments, etc. - Handle cases where we ran out of memory while trying to allocate the IRP - Make sure the IRP can be re-used in IoReuseIrp. Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 08:46:53 2006 @@ -1350,8 +1350,8 @@ IoGetRequestorSessionId(IN PIRP Irp, OUT PULONG pSessionId) { + /* Return the session */ *pSessionId = IoGetRequestorProcess(Irp)->Session; - return STATUS_SUCCESS; } @@ -1370,13 +1370,15 @@ */ VOID NTAPI -IoInitializeIrp(PIRP Irp, - USHORT PacketSize, - CCHAR StackSize) -{ - ASSERT(Irp != NULL); - +IoInitializeIrp(IN PIRP Irp, + IN USHORT PacketSize, + IN CCHAR StackSize) +{ /* Clear it */ + IOTRACE(IO_IRP_DEBUG, + "%s - Initializing IRP %p\n", + __FUNCTION__, + Irp); RtlZeroMemory(Irp, PacketSize); /* Set the Header and other data */ @@ -1399,10 +1401,12 @@ IoIsOperationSynchronous(IN PIRP Irp) { /* Check the flags */ - if ((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) || + if (((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) && + (!(Irp->Flags & IRP_PAGING_IO) && + !(Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO))) || (Irp->Flags & IRP_SYNCHRONOUS_API) || (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & - FO_SYNCHRONOUS_IO)) + FO_SYNCHRONOUS_IO)) { /* Synch API or Paging I/O is OK, as is Sync File I/O */ return TRUE; @@ -1429,10 +1433,14 @@ */ PIRP NTAPI -IoMakeAssociatedIrp(PIRP Irp, - CCHAR StackSize) -{ - PIRP AssocIrp; +IoMakeAssociatedIrp(IN PIRP Irp, + IN CCHAR StackSize) +{ + PIRP AssocIrp; + IOTRACE(IO_IRP_DEBUG, + "%s - Associating IRP %p\n", + __FUNCTION__, + Irp); /* Allocate the IRP */ AssocIrp = IoAllocateIrp(StackSize, FALSE); @@ -1446,7 +1454,6 @@ /* Associate them */ AssocIrp->AssociatedIrp.MasterIrp = Irp; - return AssocIrp; } @@ -1455,11 +1462,11 @@ */ NTSTATUS NTAPI -IoPageRead(PFILE_OBJECT FileObject, - PMDL Mdl, - PLARGE_INTEGER Offset, - PKEVENT Event, - PIO_STATUS_BLOCK StatusBlock) +IoPageRead(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; @@ -1470,6 +1477,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -1505,6 +1513,10 @@ IoQueueThreadIrp(IN PIRP Irp) { KIRQL OldIrql; + IOTRACE(IO_IRP_DEBUG, + "%s - Queueing IRP %p\n", + __FUNCTION__, + Irp); /* Raise to APC */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -1530,6 +1542,14 @@ IN NTSTATUS Status) { UCHAR AllocationFlags; + IOTRACE(IO_IRP_DEBUG, + "%s - Reusing IRP %p\n", + __FUNCTION__, + Irp); + + /* Make sure it's OK to reuse it */ + ASSERT(!Irp->CancelRoutine); + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); /* Get the old flags */ AllocationFlags = Irp->AllocationFlags; @@ -1549,6 +1569,7 @@ NTAPI IoSetTopLevelIrp(IN PIRP Irp) { + /* Set the IRP */ PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; } @@ -1572,6 +1593,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp);

1 0

[ion] 22706: - Add more tracing/name decoration/comments. - Bugcheck if cancelling and IRP that's already been completed. - Bugcheck if attempting to call a driver with an IRP that's already past its maximum stack size. - Make sure that when we free an IRP, it's not associated to a thread anymore, nor having any drivers that think it's valid.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 08:29:32 2006 New Revision: 22706 URL: http://svn.reactos.org/svn/reactos?rev=22706&view=rev Log: - Add more tracing/name decoration/comments. - Bugcheck if cancelling and IRP that's already been completed. - Bugcheck if attempting to call a driver with an IRP that's already past its maximum stack size. - Make sure that when we free an IRP, it's not associated to a thread anymore, nor having any drivers that think it's valid. Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 08:29:32 2006 @@ -13,6 +13,10 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +/* Undefine some macros we implement here */ +#undef IoCallDriver +#undef IoCompleteRequest ULONG IopTraceLevel = IO_IRP_DEBUG; @@ -843,40 +847,61 @@ */ BOOLEAN NTAPI -IoCancelIrp(PIRP Irp) -{ - KIRQL oldlvl; - PDRIVER_CANCEL CancelRoutine; - - DPRINT("IoCancelIrp(Irp 0x%p)\n",Irp); - - IoAcquireCancelSpinLock(&oldlvl); - - Irp->Cancel = TRUE; - - CancelRoutine = IoSetCancelRoutine(Irp, NULL); - if (CancelRoutine == NULL) - { - IoReleaseCancelSpinLock(oldlvl); - return(FALSE); - } - - Irp->CancelIrql = oldlvl; - CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); - return(TRUE); -} - -/* - * @name IoCancelThreadIo +IoCancelIrp(IN PIRP Irp) +{ + KIRQL OldIrql; + PDRIVER_CANCEL CancelRoutine; + + /* Acquire the cancel lock and cancel the IRP */ + IOTRACE(IO_IRP_DEBUG, + "%s - Canceling IRP %p\n", + __FUNCTION__, + Irp); + + IoAcquireCancelSpinLock(&OldIrql); + Irp->Cancel = TRUE; + + /* Clear the cancel routine and get the old one */ + CancelRoutine = IoSetCancelRoutine(Irp, NULL); + if (CancelRoutine) + { + /* We had a routine, make sure the IRP isn't completed */ + if (Irp->CurrentLocation > (Irp->StackCount + 1)) + { + /* It is, bugcheck */ + KeBugCheckEx(CANCEL_STATE_IN_COMPLETED_IRP, + (ULONG_PTR)Irp, + 0, + 0, + 0); + } + + /* Set the cancel IRQL And call the routine */ + Irp->CancelIrql = OldIrql; + CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); + return TRUE; + } + + /* Otherwise, release the cancel lock and fail */ + IoReleaseCancelSpinLock(OldIrql); + return FALSE; +} + +/* + * @implemented */ VOID NTAPI -IoCancelThreadIo(PETHREAD Thread) +IoCancelThreadIo(IN PETHREAD Thread) { PIRP Irp; KIRQL OldIrql; ULONG Retries = 3000; LARGE_INTEGER Interval; + IOTRACE(IO_IRP_DEBUG, + "%s - Canceling IRPs for Thread %p\n", + __FUNCTION__, + Thread); /* Raise to APC to protect the IrpList */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -904,19 +929,16 @@ * Don't stay here forever if some broken driver doesn't complete * the IRP. */ - if (Retries-- == 0) IopRemoveThreadIrp(); + if (!(Retries--)) IopRemoveThreadIrp(); /* Raise the IRQL Again */ OldIrql = KfRaiseIrql(APC_LEVEL); } - + /* We're done, lower the IRQL */ KfLowerIrql(OldIrql); } -#ifdef IoCallDriver -#undef IoCallDriver -#endif /* * @implemented */ @@ -932,7 +954,6 @@ /* * @implemented */ -#undef IoCompleteRequest VOID NTAPI IoCompleteRequest(PIRP Irp, @@ -949,6 +970,7 @@ NTAPI IoEnqueueIrp(IN PIRP Irp) { + /* This is the same as calling IoQueueThreadIrp */ IoQueueThreadIrp(Irp); } @@ -966,11 +988,17 @@ /* Get the Driver Object */ DriverObject = DeviceObject->DriverObject; - /* Set the Stack Location */ - IoSetNextIrpStackLocation(Irp); - - /* Get the current one */ - Param = IoGetCurrentIrpStackLocation(Irp); + /* Decrease the current location and check if */ + Irp->CurrentLocation--; + if (Irp->CurrentLocation <= 0) + { + /* This IRP ran out of stack, bugcheck */ + KeBugCheckEx(NO_MORE_IRP_STACK_LOCATIONS, (ULONG_PTR)Irp, 0, 0, 0); + } + + /* Now update the stack location */ + Param = IoGetNextIrpStackLocation(Irp); + Irp->Tail.Overlay.CurrentStackLocation = Param; /* Get the Device Object */ Param->DeviceObject = DeviceObject; @@ -980,9 +1008,6 @@ Irp); } -#ifdef IoCompleteRequest -#undef IoCompleteRequest -#endif /* * @implemented */ @@ -1242,7 +1267,15 @@ PNPAGED_LOOKASIDE_LIST List; PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; PKPRCB Prcb; - + IOTRACE(IO_IRP_DEBUG, + "%s - Freeing IRPs %p\n", + __FUNCTION__, + Irp); + + /* Make sure the Thread IRP list is empty and that it OK to free it */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); + ASSERT(Irp->CurrentLocation >= Irp->StackCount); + /* If this was a pool alloc, free it with the pool */ if (!(Irp->AllocationFlags & IRP_ALLOCATED_FIXED_SIZE)) { @@ -1252,10 +1285,7 @@ else { /* Check if this was a Big IRP */ - if (Irp->StackCount != 1) - { - ListType = LookasideLargeIrpList; - } + if (Irp->StackCount != 1) ListType = LookasideLargeIrpList; /* Get the PRCB */ Prcb = KeGetCurrentPrcb(); @@ -1284,7 +1314,7 @@ } } - /* The free was within dhe Depth */ + /* The free was within the Depth */ if (Irp) { InterlockedPushEntrySList(&List->L.ListHead,

1 0

[ion] 22705: - Add more name/prototype decoration and API tracing. - Don't handle IRP_MJ_POWER in IoBuildAsyncronousFsdRequest. - Use IoAllocateMdl instead of being a cowboy and using MmCreateMdl. - Handle failure/out-of-memory cases in IoBuildAsyncronousFsdRequest - Free the input buffer on failure in IoBuildDeviceIoControlRequest - Handle failure in IoBuildSyncronousFsdREquest.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 07:48:03 2006 New Revision: 22705 URL: http://svn.reactos.org/svn/reactos?rev=22705&view=rev Log: - Add more name/prototype decoration and API tracing. - Don't handle IRP_MJ_POWER in IoBuildAsyncronousFsdRequest. - Use IoAllocateMdl instead of being a cowboy and using MmCreateMdl. - Handle failure/out-of-memory cases in IoBuildAsyncronousFsdRequest - Free the input buffer on failure in IoBuildDeviceIoControlRequest - Handle failure in IoBuildSyncronousFsdREquest. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irp.c 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 07:48:03 2006 @@ -33,9 +33,9 @@ #endif // -// FIXME: What is this? -// -#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) +// Returns the type of METHOD_ used in this IOCTL +// +#define IO_METHOD_FROM_CTL_CODE(c) (c & 0x00000003) // // Packet Types when piggybacking on the IRP Overlay Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 07:48:03 2006 @@ -394,8 +394,8 @@ */ PIRP NTAPI -IoAllocateIrp(CCHAR StackSize, - BOOLEAN ChargeQuota) +IoAllocateIrp(IN CCHAR StackSize, + IN BOOLEAN ChargeQuota) { PIRP Irp = NULL; USHORT Size = IoSizeOfIrp(StackSize); @@ -478,6 +478,11 @@ Irp->AllocationFlags = Flags; /* Return it */ + IOTRACE(IO_IRP_DEBUG, + "%s - Allocated IRP %p with allocation flags %lx\n", + __FUNCTION__, + Irp, + Flags); return Irp; } @@ -486,19 +491,19 @@ */ PIRP NTAPI -IoBuildAsynchronousFsdRequest(ULONG MajorFunction, - PDEVICE_OBJECT DeviceObject, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER StartingOffset, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildAsynchronousFsdRequest(IN ULONG MajorFunction, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER StartingOffset, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; - LOCK_OPERATION AccessType; /* Allocate IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return Irp; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -507,9 +512,10 @@ StackPtr->MajorFunction = (UCHAR)MajorFunction; /* Do not handle the following here */ - if (MajorFunction != IRP_MJ_FLUSH_BUFFERS && - MajorFunction != IRP_MJ_SHUTDOWN && - MajorFunction != IRP_MJ_PNP) + if ((MajorFunction != IRP_MJ_FLUSH_BUFFERS) && + (MajorFunction != IRP_MJ_SHUTDOWN) && + (MajorFunction != IRP_MJ_PNP) && + (MajorFunction != IRP_MJ_POWER)) { /* Check if this is Buffered IO */ if (DeviceObject->Flags & DO_BUFFERED_IO) @@ -517,6 +523,12 @@ /* Allocate the System Buffer */ Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } /* Set flags */ Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; @@ -537,35 +549,38 @@ else if (DeviceObject->Flags & DO_DIRECT_IO) { /* Use an MDL for Direct I/O */ - Irp->MdlAddress = MmCreateMdl(NULL, Buffer, Length); - - if (MajorFunction == IRP_MJ_READ) - { - AccessType = IoWriteAccess; - } - else - { - AccessType = IoReadAccess; + Irp->MdlAddress = IoAllocateMdl(Buffer, + Length, + FALSE, + FALSE, + NULL); + if (!Irp->MdlAddress) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; } /* Probe and Lock */ _SEH_TRY { /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, KernelMode, AccessType); + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + MajorFunction == IRP_MJ_READ ? + IoWriteAccess : IoReadAccess); } _SEH_HANDLE { /* Free the IRP and its MDL */ IoFreeMdl(Irp->MdlAddress); IoFreeIrp(Irp); - /* FIXME - pass the exception to the caller? */ Irp = NULL; } _SEH_END; - if (!Irp) - return NULL; + /* This is how we know if we failed during the probe */ + if (!Irp) return NULL; } else { @@ -573,13 +588,16 @@ Irp->UserBuffer = Buffer; } + /* Check if this is a read */ if (MajorFunction == IRP_MJ_READ) { + /* Set the parameters for a read */ StackPtr->Parameters.Read.Length = Length; StackPtr->Parameters.Read.ByteOffset = *StartingOffset; } else if (MajorFunction == IRP_MJ_WRITE) { + /* Otherwise, set write parameters */ StackPtr->Parameters.Write.Length = Length; StackPtr->Parameters.Write.ByteOffset = *StartingOffset; } @@ -590,6 +608,13 @@ Irp->Tail.Overlay.Thread = PsGetCurrentThread(); /* Set the Status Block after all is done */ + IOTRACE(IO_IRP_DEBUG, + "%s - Built IRP %p with Major, Buffer, DO %lx %p %p\n", + __FUNCTION__, + Irp, + MajorFunction, + Buffer, + DeviceObject); return Irp; } @@ -598,23 +623,23 @@ */ PIRP NTAPI -IoBuildDeviceIoControlRequest (ULONG IoControlCode, - PDEVICE_OBJECT DeviceObject, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - BOOLEAN InternalDeviceIoControl, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildDeviceIoControlRequest(IN ULONG IoControlCode, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN InternalDeviceIoControl, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; ULONG BufferLength; - LOCK_OPERATION AccessType; /* Allocate IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return Irp; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -633,136 +658,132 @@ /* Handle the Methods */ switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) { + /* Buffered I/O */ case METHOD_BUFFERED: - /* Select the right Buffer Length */ - BufferLength = InputBufferLength > OutputBufferLength ? - InputBufferLength : OutputBufferLength; - - /* Make sure there is one */ - if (BufferLength) - { - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, BufferLength, TAG_SYS_BUF); - - /* Fail if we couldn't */ - if (Irp->AssociatedIrp.SystemBuffer == NULL) - { - IoFreeIrp(Irp); - return(NULL); - } - - /* Check if we got a buffer */ + /* Select the right Buffer Length */ + BufferLength = InputBufferLength > OutputBufferLength ? + InputBufferLength : OutputBufferLength; + + /* Make sure there is one */ + if (BufferLength) + { + /* Allocate the System Buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + BufferLength, + TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + + /* Check if we got a buffer */ + if (InputBuffer) + { + /* Copy into the System Buffer */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + InputBuffer, + InputBufferLength); + } + + /* Write the flags */ + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; + if (OutputBuffer) Irp->Flags |= IRP_INPUT_OPERATION; + + /* Save the Buffer */ + Irp->UserBuffer = OutputBuffer; + } + else + { + /* Clear the Flags and Buffer */ + Irp->Flags = 0; + Irp->UserBuffer = NULL; + } + break; + + /* Direct I/O */ + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + + /* Check if we got an input buffer */ if (InputBuffer) { + /* Allocate the System Buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + InputBufferLength, + TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + /* Copy into the System Buffer */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, InputBuffer, InputBufferLength); - } - - /* Write the flags */ - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; - if (OutputBuffer) Irp->Flags |= IRP_INPUT_OPERATION; - - /* Save the Buffer */ + + /* Write the flags */ + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; + } + else + { + Irp->Flags = 0; + } + + /* Check if we got an output buffer */ + if (OutputBuffer) + { + /* Allocate the System Buffer */ + Irp->MdlAddress = IoAllocateMdl(OutputBuffer, + OutputBufferLength, + FALSE, + FALSE, + Irp); + if (!Irp->MdlAddress) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + + /* Probe and Lock */ + _SEH_TRY + { + /* Do the probe */ + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + IO_METHOD_FROM_CTL_CODE(IoControlCode) == + METHOD_IN_DIRECT ? + IoReadAccess : IoWriteAccess); + } + _SEH_HANDLE + { + /* Free the MDL */ + IoFreeMdl(Irp->MdlAddress); + + /* Free the input buffer and IRP */ + if (InputBuffer) ExFreePool(Irp->AssociatedIrp.SystemBuffer); + IoFreeIrp(Irp); + Irp = NULL; + } + _SEH_END; + + /* This is how we know if probing failed */ + if (!Irp) return NULL; + } + break; + + case METHOD_NEITHER: + + /* Just save the Buffer */ Irp->UserBuffer = OutputBuffer; - } - else - { - /* Clear the Flags and Buffer */ - Irp->Flags = 0; - Irp->UserBuffer = NULL; - } - break; - - case METHOD_IN_DIRECT: - case METHOD_OUT_DIRECT: - - /* Check if we got an input buffer */ - if (InputBuffer) - { - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - InputBufferLength, - TAG_SYS_BUF); - - /* Fail if we couldn't */ - if (Irp->AssociatedIrp.SystemBuffer == NULL) - { - IoFreeIrp(Irp); - return(NULL); - } - - /* Copy into the System Buffer */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - InputBuffer, - InputBufferLength); - - /* Write the flags */ - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; - } - else - { - Irp->Flags = 0; - } - - /* Check if we got an output buffer */ - if (OutputBuffer) - { - /* Allocate the System Buffer */ - Irp->MdlAddress = IoAllocateMdl(OutputBuffer, - OutputBufferLength, - FALSE, - FALSE, - Irp); - - /* Fail if we couldn't */ - if (Irp->MdlAddress == NULL) - { - IoFreeIrp(Irp); - return NULL; - } - - /* Probe and Lock */ - _SEH_TRY - { - /* Use the right Access Type */ - if (IO_METHOD_FROM_CTL_CODE(IoControlCode) == METHOD_IN_DIRECT) - { - AccessType = IoReadAccess; - } - else - { - AccessType = IoWriteAccess; - } - - /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, KernelMode, AccessType); - } - _SEH_HANDLE - { - /* Free the MDL and IRP */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - /* FIXME - pass the exception to the caller? */ - Irp = NULL; - } - _SEH_END; - - if (!Irp) - return NULL; - } - break; - - case METHOD_NEITHER: - - /* Just save the Buffer */ - Irp->UserBuffer = OutputBuffer; - StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = InputBuffer; - break; + StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = InputBuffer; } /* Now write the Event and IoSB */ @@ -774,6 +795,14 @@ IoQueueThreadIrp(Irp); /* Return the IRP */ + IOTRACE(IO_IRP_DEBUG, + "%s - Built IRP %p with IOCTL, Buffers, DO %lx %p %p %p\n", + __FUNCTION__, + Irp, + IoControlCode, + InputBuffer, + OutputBuffer, + DeviceObject); return Irp; } @@ -782,13 +811,13 @@ */ PIRP NTAPI -IoBuildSynchronousFsdRequest(ULONG MajorFunction, - PDEVICE_OBJECT DeviceObject, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER StartingOffset, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildSynchronousFsdRequest(IN ULONG MajorFunction, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER StartingOffset, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; @@ -799,6 +828,7 @@ Length, StartingOffset, IoStatusBlock ); + if (!Irp) return NULL; /* Set the Event which makes it Syncronous */ Irp->UserEvent = Event;

1 0

[ion] 22704: - Fix I/O Completion (IopCompleteRequest/IofCompleteRequest) for the first time after the 40-thread long flame war last year: - Don't read pointers from the file object or IRP before they are actually used, because in some parts of the code, these pointers could change before we actually use them. - Get rid of the #if 1/#if 0 nonsense hbirr had added. - Properly check for success/warning/failure cases (thanks to Filip for checking this out with me last year) - Handle scenarios when
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 07:15:56 2006 New Revision: 22704 URL: http://svn.reactos.org/svn/reactos?rev=22704&view=rev Log: - Fix I/O Completion (IopCompleteRequest/IofCompleteRequest) for the first time after the 40-thread long flame war last year: - Don't read pointers from the file object or IRP before they are actually used, because in some parts of the code, these pointers could change before we actually use them. - Get rid of the #if 1/#if 0 nonsense hbirr had added. - Properly check for success/warning/failure cases (thanks to Filip for checking this out with me last year) - Handle scenarios when the IRP is marked IRP_CREATE_OPERATION - Bugcheck if IofCompleteRequest is called twice on the same IRP - Copy the master IRP's thread to the associated IRP - Free the Auxiliary Buffer if there is one. - Some formatting fixes, and majorly recomment the code to make it a lot clearer and more verbose on some of the more intricate details. - Remove some hacks which I don't think are needed anymore. If you notice regressions due to this patch let me know ASAP. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irp.c 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 07:15:56 2006 @@ -62,6 +62,15 @@ Count]) \ : \ FIELD_OFFSET(CM_RESOURCE_LIST, List) + +// +// Determines if the IRP is Synchronous +// +#define IsIrpSynchronous(Irp, FileObject) \ + ((Irp->Flags & IRP_SYNCHRONOUS_API) || \ + (!(FileObject) ? \ + FALSE : \ + FileObject->Flags & FO_SYNCHRONOUS_IO)) \ /* * VOID Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 07:15:56 2006 @@ -13,6 +13,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +ULONG IopTraceLevel = IO_IRP_DEBUG; /* PRIVATE FUNCTIONS ********************************************************/ @@ -162,21 +164,17 @@ PFILE_OBJECT FileObject; PIRP Irp; PMDL Mdl; - PKEVENT UserEvent; - BOOLEAN SyncIrp; - - if (Apc) DPRINT("IoSecondStageCompletition with APC: 0x%p\n", Apc); + PVOID Port = NULL, Key = NULL; + BOOLEAN SignaledCreateRequest = FALSE; /* Get data from the APC */ - FileObject = (PFILE_OBJECT)(*SystemArgument1); + FileObject = (PFILE_OBJECT)*SystemArgument1; Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - DPRINT("IoSecondStageCompletition, 0x%p\n", Irp); - - /* Save the User Event */ - UserEvent = Irp->UserEvent; - - /* Remember if the IRP is Sync or not */ - SyncIrp = Irp->Flags & IRP_SYNCHRONOUS_API ? TRUE : FALSE; + IOTRACE(IO_IRP_DEBUG, + "%s - Completing IRP %p for %p\n", + __FUNCTION__, + Irp, + FileObject); /* Handle Buffered case first */ if (Irp->Flags & IRP_BUFFERED_IO) @@ -195,6 +193,7 @@ /* Also check if we should de-allocate it */ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { + /* Deallocate it */ ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); } } @@ -210,17 +209,25 @@ IoFreeMdl(Mdl); } - /* Remove the IRP from the list of Thread Pending IRPs */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - -#if 1 - /* Check for Success but allow failure for Async IRPs */ - if (!(NT_ERROR(Irp->IoStatus.Status)) || - ((NT_ERROR(Irp->IoStatus.Status)) && - (Irp->PendingReturned) && !(SyncIrp) && - ((FileObject == NULL) || (FileObject->Flags & FO_SYNCHRONOUS_IO)))) - { + /* + * Check if either the request was completed without any errors + * (but warnings are OK!), or if it was completed with an error, but + * did return from a pending I/O Operation and is not synchronous. + */ + if ((!NT_ERROR(Irp->IoStatus.Status)) || + (NT_ERROR(Irp->IoStatus.Status) && + (Irp->PendingReturned) && + !(IsIrpSynchronous(Irp, FileObject)))) + { + /* Get any information we need from the FO before we kill it */ + if ((FileObject) && (FileObject->CompletionContext)) + { + /* Save Completion Data */ + Port = FileObject->CompletionContext->Port; + Key = FileObject->CompletionContext->Key; + } + + /* Use SEH to make sure we don't write somewhere invalid */ _SEH_TRY { /* Save the IOSB Information */ @@ -232,47 +239,54 @@ } _SEH_END; - /* Check if there's an event */ - if (UserEvent) - { - /* Check if we should signal the File Object Event as well */ + /* Check if we have an event or a file object */ + if (Irp->UserEvent) + { + /* At the very least, this is a PKEVENT, so signal it always */ + KeSetEvent(Irp->UserEvent, 0, FALSE); + + /* Check if we also have a File Object */ if (FileObject) { /* - * If the File Object is SYNC, then we need to - * signal its event too + * Now, if this is a Synch I/O File Object, then this event is + * NOT an actual Executive Event, so we won't dereference it, + * and instead, we will signal the File Object */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Set the Status */ + /* Signal the file object and set the status */ + KeSetEvent(&FileObject->Event, 0, FALSE); FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); } - } - - /* Signal the Event */ - KeSetEvent(UserEvent, 0, FALSE); - - /* Dereference the Event if this is an ASYNC IRP */ - if (FileObject && !SyncIrp && UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); + + /* + * This could also be a create operation, in which case we want + * to make sure there's no APC fired. + */ + if (Irp->Flags & IRP_CREATE_OPERATION) + { + /* Clear the APC Routine and remmeber this */ + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + SignaledCreateRequest = TRUE; + } } } else if (FileObject) { - /* Set the Status */ + /* Signal the file object and set the status */ + KeSetEvent(&FileObject->Event, 0, FALSE); FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal the File Object Instead */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - - /* Now call the User APC if one was requested */ + } + + /* Now that we've signaled the events, de-associate the IRP */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Now check if a User APC Routine was requested */ if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) { + /* Initialize it */ KeInitializeApc(&Irp->Tail.Apc, KeGetCurrentThread(), CurrentApcEnvironment, @@ -284,179 +298,93 @@ Irp-> Overlay.AsynchronousParameters.UserApcContext); - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - Irp = NULL; - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - Irp->Tail.CompletionKey = FileObject->CompletionContext->Key; + /* Queue it */ + KeInsertQueueApc(&Irp->Tail.Apc, Irp->UserIosb, NULL, 2); + } + else if ((Port) && + (Irp->Overlay.AsynchronousParameters.UserApcContext)) + { + /* We have an I/O Completion setup... create the special Overlay */ + Irp->Tail.CompletionKey = Key; Irp->Tail.Overlay.PacketType = IrpCompletionPacket; - KeInsertQueue(FileObject->CompletionContext->Port, - &Irp->Tail.Overlay.ListEntry); - Irp = NULL; + KeInsertQueue(Port, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* Free the IRP since we don't need it anymore */ + IoFreeIrp(Irp); + } + + /* Check if we have a file object that wasn't part of a create */ + if ((FileObject) && !(SignaledCreateRequest)) + { + /* Dereference it, since it's not needed anymore either */ + ObDereferenceObject(FileObject); } } else { /* - * Signal the Events only if PendingReturned and we have a File Object + * Either we didn't return from the request, or we did return but this + * request was synchronous. */ - if (FileObject && Irp->PendingReturned) - { - /* Check for SYNC IRP */ - if (SyncIrp) - { - /* Set the status in this case only */ - _SEH_TRY + if ((Irp->PendingReturned) && (FileObject)) + { + /* So we did return with a synch operation, was it the IRP? */ + if (Irp->Flags & IRP_SYNCHRONOUS_API) + { + /* Yes, this IRP was synchronous, so retrn the I/O Status */ + *Irp->UserIosb = Irp->IoStatus; + + /* Now check if the user gave an event */ + if (Irp->UserEvent) { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; - - /* Signal our event if we have one */ - if (UserEvent) - { - KeSetEvent(UserEvent, 0, FALSE); + /* Signal it */ + KeSetEvent(Irp->UserEvent, 0, FALSE); } else { - /* Signal the File's Event instead */ + /* No event was given, so signal the FO instead */ KeSetEvent(&FileObject->Event, 0, FALSE); } } else { -#if 1 - /* FIXME: This is necessary to fix bug #609 */ - _SEH_TRY - { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; -#endif - /* We'll report the Status to the File Object, not the IRP */ + /* + * It's not the IRP that was synchronous, it was the FO + * that was opened this way. Signal its event. + */ FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal the File Object ONLY if this was Async */ KeSetEvent(&FileObject->Event, 0, FALSE); } } - /* Dereference the Event if it's an ASYNC IRP on a File Object */ - if (UserEvent && !SyncIrp && FileObject) - { - if (UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); - } - } - } - - /* Dereference the File Object */ - if (FileObject) ObDereferenceObject(FileObject); - - /* Free the IRP */ - if (Irp) IoFreeIrp(Irp); - -#else - - if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) - { - _SEH_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; - - if (FileObject) - { - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - - /* FIXME: Remove this check when I/O code is fixed */ - if (UserEvent != &FileObject->Event) - { - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - } - } - - /* Signal the user event, if one exist */ - if (UserEvent) - { - KeSetEvent(UserEvent, 0, FALSE); - } - - /* Now call the User APC if one was requested */ - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) - { - KeInitializeApc(&Irp->Tail.Apc, - KeGetCurrentThread(), - CurrentApcEnvironment, - IopFreeIrpKernelApc, - IopAbortIrpKernelApc, - (PKNORMAL_ROUTINE)Irp-> - Overlay.AsynchronousParameters.UserApcRoutine, - Irp->RequestorMode, - Irp-> - Overlay.AsynchronousParameters.UserApcContext); - - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - Irp = NULL; - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - IoSetIoCompletion(FileObject->CompletionContext->Port, - FileObject->CompletionContext->Key, - Irp-> - Overlay.AsynchronousParameters.UserApcContext, - Irp->IoStatus.Status, - Irp->IoStatus.Information, - FALSE); - Irp = NULL; - } - } - - /* Free the Irp if it hasn't already */ - if (Irp) IoFreeIrp(Irp); - - if (FileObject) - { - /* Dereference the user event, if it is an event object */ - /* FIXME: Remove last check when I/O code is fixed */ - if (UserEvent && !SyncIrp && UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); - } - - /* Dereference the File Object */ - ObDereferenceObject(FileObject); - } -#endif + /* Now that we got here, we do this for incomplete I/Os as well */ + if ((FileObject) && !(Irp->Flags & IRP_CREATE_OPERATION)) + { + /* Dereference the File Object unless this was a create */ + ObDereferenceObject(FileObject); + } + + /* + * Check if this was an Executive Event (remember that we know this + * by checking if the IRP is synchronous) + */ + if ((Irp->UserEvent) && + (FileObject) && + !(Irp->Flags & IRP_SYNCHRONOUS_API)) + { + /* This isn't a PKEVENT, so dereference it */ + ObDereferenceObject(Irp->UserEvent); + } + + /* Now that we've signaled the events, de-associate the IRP */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Free the IRP as well */ + IoFreeIrp(Irp); + } } /* FUNCTIONS *****************************************************************/ @@ -1030,46 +958,43 @@ */ VOID FASTCALL -IofCompleteRequest(PIRP Irp, - CCHAR PriorityBoost) +IofCompleteRequest(IN PIRP Irp, + IN CCHAR PriorityBoost) { PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject = Irp->Tail.Overlay.OriginalFileObject; - PETHREAD Thread = Irp->Tail.Overlay.Thread; + PFILE_OBJECT FileObject; + PETHREAD Thread; NTSTATUS Status; PMDL Mdl; - + ULONG MasterIrpCount; + PIRP MasterIrp; + IOTRACE(IO_IRP_DEBUG, + "%s - Completing IRP %p\n", + __FUNCTION__, + Irp); + + /* Make sure this IRP isn't getting completed more then once */ + if ((Irp->CurrentLocation) > (Irp->StackCount + 1)) + { + /* Bugcheck */ + KeBugCheckEx(MULTIPLE_IRP_COMPLETE_REQUESTS, (ULONG_PTR)Irp, 0, 0, 0); + } + + /* Some sanity checks */ ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(!Irp->CancelRoutine); ASSERT(Irp->IoStatus.Status != STATUS_PENDING); - /* Get the Current Stack */ + /* Get the Current Stack and skip it */ StackPtr = IoGetCurrentIrpStackLocation(Irp); IoSkipCurrentIrpStackLocation(Irp); /* Loop the Stacks and complete the IRPs */ - for (;Irp->CurrentLocation <= (Irp->StackCount + 1); StackPtr++) + do { /* Set Pending Returned */ Irp->PendingReturned = StackPtr->Control & SL_PENDING_RETURNED; - - /* - * Completion routines expect the current irp stack location to be the same as when - * IoSetCompletionRoutine was called to set them. A side effect is that completion - * routines set by highest level drivers without their own stack location will receive - * an invalid current stack location (at least it should be considered as invalid). - * Since the DeviceObject argument passed is taken from the current stack, this value - * is also invalid (NULL). - */ - if (Irp->CurrentLocation == (Irp->StackCount + 1)) - { - DeviceObject = NULL; - } - else - { - DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; - } /* Check if there is a Completion Routine to Call */ if ((NT_SUCCESS(Irp->IoStatus.Status) && @@ -1078,44 +1003,65 @@ (StackPtr->Control & SL_INVOKE_ON_ERROR)) || (Irp->Cancel && (StackPtr->Control & SL_INVOKE_ON_CANCEL))) { - /* Call it */ + /* Check for highest-level device completion routines */ + if (Irp->CurrentLocation == (Irp->StackCount + 1)) + { + /* Clear the DO, since the current stack location is invalid */ + DeviceObject = NULL; + } + else + { + /* Otherwise, return the real one */ + DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; + } + + /* Call the completion routine */ Status = StackPtr->CompletionRoutine(DeviceObject, Irp, StackPtr->Context); - /* Don't touch the Packet if this was returned. It might be gone! */ + /* Don't touch the Packet in this case, since it might be gone! */ if (Status == STATUS_MORE_PROCESSING_REQUIRED) return; } else { - if ((Irp->CurrentLocation <= Irp->StackCount) && (Irp->PendingReturned)) - { + /* Otherwise, check if this is a completed IRP */ + if ((Irp->CurrentLocation <= Irp->StackCount) && + (Irp->PendingReturned)) + { + /* Mark it as pending */ IoMarkIrpPending(Irp); } } - /* Move to next stack */ + /* Move to next stack location and pointer */ IoSkipCurrentIrpStackLocation(Irp); - } - - /* Windows NT File System Internals, page 165 */ + StackPtr++; + } while (Irp->CurrentLocation <= (Irp->StackCount + 1)); + + /* Check if the IRP is an associated IRP */ if (Irp->Flags & IRP_ASSOCIATED_IRP) { - ULONG MasterIrpCount; - PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; - /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - /* Decrement and get the old count */ - MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); - - /* Free MDLs and IRP */ + /* Get the master IRP and count */ + MasterIrp = Irp->AssociatedIrp.MasterIrp; + MasterIrpCount = InterlockedDecrement(&MasterIrp-> + AssociatedIrp.IrpCount); + + /* Set the thread of this IRP as the master's */ + Irp->Tail.Overlay.Thread = MasterIrp->Tail.Overlay.Thread; + + /* Free the MDLs */ while ((Mdl = Irp->MdlAddress)) { + /* Go to the next one */ Irp->MdlAddress = Mdl->Next; IoFreeMdl(Mdl); } + + /* Free the IRP itself */ IoFreeIrp(Irp); /* Complete the Master IRP */ @@ -1123,8 +1069,16 @@ return; } - /* Windows NT File System Internals, page 165 */ - if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) + /* Check if we have an auxiliary buffer */ + if (Irp->Tail.Overlay.AuxiliaryBuffer) + { + /* Free it */ + ExFreePool(Irp->Tail.Overlay.AuxiliaryBuffer); + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + } + + /* Check if this is a Paging I/O or Close Operation */ + if (Irp->Flags & (IRP_PAGING_IO | IRP_CLOSE_OPERATION)) { /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); @@ -1137,10 +1091,7 @@ KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); /* Free the IRP for a Paging I/O Only, Close is handled by us */ - if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) - { - IoFreeIrp(Irp); - } + if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) IoFreeIrp(Irp); } else { @@ -1163,6 +1114,8 @@ ASSERT(FALSE); #endif } + + /* Get out of here */ return; } @@ -1175,22 +1128,33 @@ } /* Check if we should exit because of a Deferred I/O (page 168) */ - if (Irp->Flags & IRP_DEFER_IO_COMPLETION && !Irp->PendingReturned) - { + if ((Irp->Flags & IRP_DEFER_IO_COMPLETION) && !(Irp->PendingReturned)) + { + /* + * Return without queuing the completion APC, since the caller will + * take care of doing its own optimized completion at PASSIVE_LEVEL. + */ return; } - /* Now queue the special APC */ + /* Get the thread and file object */ + Thread = Irp->Tail.Overlay.Thread; + FileObject = Irp->Tail.Overlay.OriginalFileObject; + + /* Make sure the IRP isn't cancelled */ if (!Irp->Cancel) { + /* Initialize the APC */ KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, IopCompleteRequest, NULL, - (PKNORMAL_ROUTINE) NULL, + NULL, KernelMode, NULL); + + /* Queue it */ KeInsertQueueApc(&Irp->Tail.Apc, FileObject, NULL, /* This is used for REPARSE stuff */ @@ -1199,17 +1163,20 @@ else { /* The IRP just got cancelled... does a thread still own it? */ - if ((Thread = Irp->Tail.Overlay.Thread)) - { - /* Yes! There is still hope! */ + Thread = Irp->Tail.Overlay.Thread; + if (Thread) + { + /* Yes! There is still hope! Initialize the APC */ KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, IopCompleteRequest, NULL, - (PKNORMAL_ROUTINE) NULL, + NULL, KernelMode, NULL); + + /* Queue it */ KeInsertQueueApc(&Irp->Tail.Apc, FileObject, NULL, /* This is used for REPARSE stuff */

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 June 2006