Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[chorns] 15279: Only pass GCC specific options to GCC

by chorns＠svn.reactos.com

Only pass GCC specific options to GCC Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-14 15:07:11 UTC (rev 15279) @@ -383,46 +383,27 @@ fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" ); } +string +MingwBackend::GenerateIncludesAndDefines ( IfableData& data ) const +{ + string includeParameters = MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ); + string defineParameters = MingwModuleHandler::GenerateGccDefineParametersFromVector ( data.defines ); + return includeParameters + " " + defineParameters; +} + void MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, IfableData& data ) const { - size_t i; - fprintf ( fMakefile, "PROJECT_CFLAGS %s", assignmentOperation ); - for ( i = 0; i < data.compilerFlags.size(); i++ ) - { - fprintf ( - fMakefile, - " %s", - data.compilerFlags[i]->flag.c_str() ); - } + fprintf ( fMakefile, + " %s", + GenerateIncludesAndDefines ( data ).c_str() ); - for ( i = 0; i < data.includes.size(); i++ ) - { - fprintf ( - fMakefile, - " -I%s", - data.includes[i]->directory.c_str() ); - } - - for ( i = 0; i < data.defines.size(); i++ ) - { - Define& d = *data.defines[i]; - fprintf ( - fMakefile, - " -D%s", - d.name.c_str() ); - if ( d.value.size() ) - fprintf ( - fMakefile, - "=%s", - d.value.c_str() ); - } fprintf ( fMakefile, "\n" ); } @@ -441,7 +422,7 @@ prop.value.c_str() ); } - if ( data.includes.size() || data.defines.size() || data.compilerFlags.size() ) + if ( data.includes.size() || data.defines.size() ) { GenerateProjectCFlagsMacro ( assignmentOperation, data ); @@ -452,7 +433,6 @@ If& rIf = *data.ifs[i]; if ( rIf.data.defines.size() || rIf.data.includes.size() - || rIf.data.compilerFlags.size() || rIf.data.ifs.size() ) { fprintf ( @@ -470,6 +450,62 @@ } } +void +MingwBackend::GenerateProjectGccOptionsMacro ( const char* assignmentOperation, + IfableData& data ) const +{ + size_t i; + + fprintf ( + fMakefile, + "PROJECT_GCCOPTIONS %s", + assignmentOperation ); + + for ( i = 0; i < data.compilerFlags.size(); i++ ) + { + fprintf ( + fMakefile, + " %s", + data.compilerFlags[i]->flag.c_str() ); + } + + fprintf ( fMakefile, "\n" ); +} + +void +MingwBackend::GenerateProjectGccOptions ( + const char* assignmentOperation, + IfableData& data ) const +{ + size_t i; + + if ( data.compilerFlags.size() ) + { + GenerateProjectGccOptionsMacro ( assignmentOperation, + data ); + } + + for ( i = 0; i < data.ifs.size(); i++ ) + { + If& rIf = *data.ifs[i]; + if ( rIf.data.compilerFlags.size() + || rIf.data.ifs.size() ) + { + fprintf ( + fMakefile, + "ifeq (\"$(%s)\",\"%s\")\n", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateProjectGccOptions ( + "+=", + rIf.data ); + fprintf ( + fMakefile, + "endif\n\n" ); + } + } +} + string MingwBackend::GenerateProjectLFLAGS () const { @@ -487,14 +523,14 @@ void MingwBackend::GenerateGlobalVariables () const { - GenerateGlobalCFlagsAndProperties ( - "=", - ProjectNode.non_if_data ); + GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); + GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", GenerateProjectLFLAGS ().c_str () ); + fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-14 15:07:11 UTC (rev 15279) @@ -73,10 +73,15 @@ void CreateMakefile (); void CloseMakefile () const; void GenerateHeader () const; + std::string GenerateIncludesAndDefines ( IfableData& data ) const; void GenerateProjectCFlagsMacro ( const char* assignmentOperation, IfableData& data ) const; void GenerateGlobalCFlagsAndProperties ( const char* op, IfableData& data ) const; + void GenerateProjectGccOptionsMacro ( const char* assignmentOperation, + IfableData& data ) const; + void GenerateProjectGccOptions ( const char* assignmentOperation, + IfableData& data ) const; std::string GenerateProjectLFLAGS () const; void GenerateDirectories (); void GenerateGlobalVariables () const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-14 15:07:11 UTC (rev 15279) @@ -488,9 +488,9 @@ return objectFilenames; } -string +/* static */ string MingwModuleHandler::GenerateGccDefineParametersFromVector ( - const vector<Define*>& defines ) const + const vector<Define*>& defines ) { string parameters; for ( size_t i = 0; i < defines.size (); i++ ) @@ -535,8 +535,8 @@ return path1 + CSEP + path2; } -string -MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const +/* static */ string +MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) { string parameters; for ( size_t i = 0; i < includes.size (); i++ ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 14:14:01 UTC (rev 15278) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-14 15:07:11 UTC (rev 15279) @@ -40,6 +40,9 @@ const Module& module, string_list* pclean_files ); + static std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ); + static std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ); + std::string GetModuleTargets ( const Module& module ); void GetObjectsVector ( const IfableData& data, std::vector<std::string>& objectFiles ) const; @@ -100,9 +103,7 @@ private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; - std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ) const; std::string GenerateGccDefineParameters () const; - std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const; std::string GenerateCompilerParametersFromVector ( const std::vector<CompilerFlag*>& compilerFlags ) const; std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const; std::string GenerateImportLibraryDependenciesFromVector ( const std::vector<Library*>& libraries );

19 years, 4 months

[chorns] 15278: Merge r15277 to trunk

by chorns＠svn.reactos.com

Merge r15277 to trunk Modified: trunk/reactos/drivers/dd/serial/devctrl.c _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-05-14 14:08:31 UTC (rev 15277) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-05-14 14:14:01 UTC (rev 15278) @@ -202,7 +202,7 @@ { PSERIAL_DEVICE_EXTENSION pDeviceExtension; - ASSERT(Irp); + ASSERT(pIrp); pDeviceExtension = (PSERIAL_DEVICE_EXTENSION) IoGetCurrentIrpStackLocation(pIrp)->DeviceObject->DeviceExtension;

19 years, 4 months

[chorns] 15277: Compile with DBG=1

by chorns＠svn.reactos.com

Compile with DBG=1 Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c --- branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c 2005-05-14 13:57:55 UTC (rev 15276) +++ branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c 2005-05-14 14:08:31 UTC (rev 15277) @@ -202,7 +202,7 @@ { PSERIAL_DEVICE_EXTENSION pDeviceExtension; - ASSERT(Irp); + ASSERT(pIrp); pDeviceExtension = (PSERIAL_DEVICE_EXTENSION) IoGetCurrentIrpStackLocation(pIrp)->DeviceObject->DeviceExtension;

19 years, 4 months

[ea] 15276: distribute the sm system utility even if it does little now

by ea＠svn.reactos.com

distribute the sm system utility even if it does little now Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-05-14 13:43:55 UTC (rev 15275) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-05-14 13:57:55 UTC (rev 15276) @@ -169,6 +169,7 @@ subsys\system\winlogon\winlogon.exe 1 subsys\system\winefile\winefile.exe 1 subsys\system\dhcp\dhcp.exe 1 +subsys\system\sm\sm.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 services\umpnpmgr\umpnpmgr.exe 1

19 years, 4 months

[ea] 15275: compile the sm system utility

by ea＠svn.reactos.com

compile the sm system utility Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-05-14 12:54:53 UTC (rev 15274) +++ trunk/reactos/Makefile 2005-05-14 13:43:55 UTC (rev 15275) @@ -106,7 +106,7 @@ # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ - winlogon regedit winefile notepad reactos lsass dhcp + winlogon regedit winefile notepad reactos lsass dhcp sm # System services SYS_SVC = rpcss eventlog umpnpmgr

19 years, 4 months

[ea] 15274: Little fix to compile with gcc 3.4.2

by ea＠svn.reactos.com

Little fix to compile with gcc 3.4.2 Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-14 12:37:12 UTC (rev 15273) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-14 12:54:53 UTC (rev 15274) @@ -368,7 +368,7 @@ USHORT Size = IoSizeOfIrp(StackSize); PKPRCB Prcb; UCHAR Flags = 0; - PNPAGED_LOOKASIDE_LIST List; + PNPAGED_LOOKASIDE_LIST List = NULL; PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; /* Figure out which Lookaside List to use */

19 years, 4 months

[mf] 15272: sync to Wine Patch: format_bytes()

by mf＠svn.reactos.com

sync to Wine Patch: format_bytes() Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-13 21:23:37 UTC (rev 15271) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-14 12:32:44 UTC (rev 15272) @@ -2454,12 +2454,12 @@ float fBytes = (float)bytes; - if (bytes >= 1073741824) // 1 GB + if (bytes >= 1073741824) /* 1 GB */ _stprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); - else if (bytes >= 1048576) // 1 MB + else if (bytes >= 1048576) /* 1 MB */ _stprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); - else if (bytes >= 1024) // 1 kB - _stprintf(buffer, sFmtMB, fBytes/1024.f+.5f); + else if (bytes >= 1024) /* 1 kB */ + _stprintf(buffer, sFmtkB, fBytes/1024.f+.5f); else _stprintf(buffer, sLongNumFmt, bytes); }

19 years, 4 months

[chorns] 15271: Copy w32api from trunk

by chorns＠svn.reactos.com

Copy w32api from trunk Added: branches/xmlbuildsystem/reactos/w32api/ _____ Copied: branches/xmlbuildsystem/reactos/w32api (from rev 15268, trunk/reactos/w32api)

19 years, 4 months

[chorns] 15270: Remove w32api from branch

by chorns＠svn.reactos.com

Remove w32api from branch Deleted: branches/xmlbuildsystem/reactos/w32api/

19 years, 4 months

[ion] 15269: Cleanup ntlock/unlockfile with proper io semantics..same stuff as previous patches

by ion＠svn.reactos.com

Cleanup ntlock/unlockfile with proper io semantics..same stuff as previous patches Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-13 19:47:30 UTC (rev 15268) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-13 21:07:40 UTC (rev 15269) @@ -30,18 +30,6 @@ /* INTERNAL FUNCTIONS ********************************************************/ -static -NTSTATUS -STDCALL -IopLockFileCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - ExFreePool(Context); - return STATUS_SUCCESS; - // FIXME: Should I call IoFreeIrp and return STATUS_MORE_PROCESSING_REQUIRED? -} - /* * NAME INTERNAL * IopCreateFile @@ -1751,159 +1739,141 @@ */ NTSTATUS STDCALL -NtLockFile(IN HANDLE FileHandle, - IN HANDLE EventHandle OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, +NtLockFile(IN HANDLE FileHandle, + IN HANDLE EventHandle OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER ByteOffset, - IN PLARGE_INTEGER Length, - IN PULONG Key, - IN BOOLEAN FailImmediatedly, - IN BOOLEAN ExclusiveLock - ) + IN PLARGE_INTEGER ByteOffset, + IN PLARGE_INTEGER Length, + IN PULONG Key, + IN BOOLEAN FailImmediately, + IN BOOLEAN ExclusiveLock) { - PFILE_OBJECT FileObject = NULL; - PLARGE_INTEGER LocalLength = NULL; - PKEVENT Event = NULL; - PIRP Irp = NULL; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + PFILE_OBJECT FileObject = NULL; + PLARGE_INTEGER LocalLength = NULL; + PIRP Irp = NULL; + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + PKEVENT Event = NULL; + BOOLEAN LocalEvent = FALSE; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_HANDLE_INFORMATION HandleInformation; + + /* FIXME: instead of this, use SEH */ + if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; - // FIXME: instead of this, use SEH when available? - if (!Length || !ByteOffset) - { - Status = STATUS_INVALID_PARAMETER; - goto fail; - } + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + &HandleInformation); + if (!NT_SUCCESS(Status)) return Status; - PreviousMode = ExGetPreviousMode(); + /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - goto fail; - } + /* Get Event Object */ + if (EventHandle) + { + Status = ObReferenceObjectByHandle(EventHandle, + EVENT_MODIFY_STATE, + ExEventObjectType, + PreviousMode, + (PVOID *)&Event, + NULL); + if (Status != STATUS_SUCCESS) return(Status); + KeClearEvent(Event); + } - DeviceObject = IoGetRelatedDeviceObject(FileObject); + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } - Irp = IoAllocateIrp(DeviceObject->StackSize, - FALSE); - if (Irp == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto fail; - } + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + LocalEvent = TRUE; + } - if (EventHandle != NULL && !FailImmediatedly) - { - Status = ObReferenceObjectByHandle(EventHandle, - SYNCHRONIZE, - ExEventObjectType, - PreviousMode, - (PVOID*)&Event, - NULL); - if (!NT_SUCCESS(Status)) + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) { - goto fail; + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; } - } - else - { - Event = &FileObject->Event; - KeResetEvent(Event); - } - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; + /* Allocate local buffer */ + LocalLength = ExAllocatePoolWithTag(NonPagedPool, + sizeof(LARGE_INTEGER), + TAG_LOCK); + if (!LocalLength) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + *LocalLength = *Length; + + /* Set up the IRP */ + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; - Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + 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 = *ByteOffset; + StackPtr->Parameters.LockControl.Key = Key ? *Key : 0; - Irp->UserEvent = Event; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + /* Set Flags */ + if (FailImmediately) StackPtr->Flags = SL_FAIL_IMMEDIATELY; + if (ExclusiveLock) StackPtr->Flags |= SL_EXCLUSIVE_LOCK; - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; - StackPtr->MinorFunction = IRP_MN_LOCK; - StackPtr->FileObject = FileObject; - - if (ExclusiveLock) - StackPtr->Flags |= SL_EXCLUSIVE_LOCK; - - if (FailImmediatedly) - StackPtr->Flags |= SL_FAIL_IMMEDIATELY; - - LocalLength = ExAllocatePoolWithTag(NonPagedPool, - sizeof(LARGE_INTEGER), - TAG_LOCK); - if (!LocalLength) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto fail; - } - - *LocalLength = *Length; - - StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? *Key : 0; - - IoSetCompletionRoutine(Irp, - IopLockFileCompletionRoutine, - LocalLength, - TRUE, - TRUE, - TRUE); - - /* Can't touch FileObject after IoCallDriver since it might be freed */ - Status = IofCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - Status = KeWaitForSingleObject(Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - - if (Status != STATUS_WAIT_0) + /* Call the Driver */ + FileObject->LockOperation = TRUE; + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) { - DPRINT1("NtLockFile -> KeWaitForSingleObject failed!\n"); - /* - * FIXME: Should do some special processing here if alertable wait - * was interupted by user apc or a thread alert (STATUS_ALERTED, STATUS_USER_APC) - */ - return Status; /* Set status to something else? */ + if (!LocalEvent) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } } - Status = IoStatusBlock->Status; - } - - return Status; - -fail:; - if (LocalLength) - ExFreePool(LocalLength); - - if (Irp) - IoFreeIrp(Irp); - - if (Event) - ObDereferenceObject(Event); - - if (FileObject) - ObDereferenceObject(FileObject); - - return Status; + /* Return the Status */ + return Status; } /* @@ -2865,93 +2835,124 @@ IN PLARGE_INTEGER Length, OUT PULONG Key OPTIONAL) { - PFILE_OBJECT FileObject = NULL; - PLARGE_INTEGER LocalLength = NULL; - PIRP Irp = NULL; - PIO_STACK_LOCATION StackPtr; - PDEVICE_OBJECT DeviceObject; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + PFILE_OBJECT FileObject = NULL; + PLARGE_INTEGER LocalLength = NULL; + PIRP Irp = NULL; + PIO_STACK_LOCATION StackPtr; + PDEVICE_OBJECT DeviceObject; + KEVENT Event; + BOOLEAN LocalEvent = FALSE; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_HANDLE_INFORMATION HandleInformation; + + /* FIXME: instead of this, use SEH */ + if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; - // FIXME: instead of this, use SEH when available - if (!Length || !ByteOffset) - { - Status = STATUS_INVALID_PARAMETER; - goto fail; - } + /* Get File Object */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, + &HandleInformation); + if (!NT_SUCCESS(Status)) return Status; - PreviousMode = ExGetPreviousMode(); + /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } - /* - * BUGBUG: ObReferenceObjectByHandle fails if DesiredAccess=0 and mode=UserMode - * It should ONLY fail if we desire an access that conflict with granted access! - */ - Status = ObReferenceObjectByHandle(FileHandle, - 0, //FILE_READ_DATA,//BUGBUG: have to use something...but shouldn't have to! - IoFileObjectType, - PreviousMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - goto fail; - } + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + } + else + { + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } - DeviceObject = IoGetRelatedDeviceObject(FileObject); + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } - Irp = IoAllocateIrp(DeviceObject->StackSize, - FALSE); - if (Irp == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto fail; - } + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->UserIosb = IoStatusBlock; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + /* Allocate local buffer */ + LocalLength = ExAllocatePoolWithTag(NonPagedPool, + sizeof(LARGE_INTEGER), + TAG_LOCK); + if (!LocalLength) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + *LocalLength = *Length; + + /* Set up the IRP */ + Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Tail.Overlay.OriginalFileObject = FileObject; - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_LOCK_CONTROL; - StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + 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 = *ByteOffset; + StackPtr->Parameters.LockControl.Key = Key ? *Key : 0; - LocalLength = ExAllocatePoolWithTag(NonPagedPool, - sizeof(LARGE_INTEGER), - TAG_LOCK); - if (!LocalLength) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto fail; - } + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (LocalEvent) + { + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock->Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } - *LocalLength = *Length; - - StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? *Key : 0; - - /* Allways synchronous */ - Status = IofCallDriver(DeviceObject, Irp); - - ExFreePool(LocalLength); - - return Status; - -fail:; - if (LocalLength) - ExFreePool(LocalLength); - - if (Irp) - IoFreeIrp(Irp); - - if (FileObject) - ObDereferenceObject(FileObject); - - return Status; + /* Return the Status */ + return Status; } /*

19 years, 4 months

← Newer
1
...
41
42
43
44
45
46
47
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005