Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[ion] 22936: [FORMATTING] - STDCALL->NTAPI changes, tab->Spaces, name decoration, etc. - Add Eric's name since when I copied security.c into file.c, I forgot to add his name as well for that code.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:57:51 2006 New Revision: 22936 URL: http://svn.reactos.org/svn/reactos?rev=22936&view=rev Log: [FORMATTING] - STDCALL->NTAPI changes, tab->Spaces, name decoration, etc. - Add Eric's name since when I copied security.c into file.c, I forgot to add his name as well for that code. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:57:51 2006 @@ -5,6 +5,7 @@ * PURPOSE: Functions that deal with managing the FILE_OBJECT itself. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes + * Eric Kohl * Filip Navara (navaraf(a)reactos.org) */ @@ -1197,7 +1198,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI IoCheckQuotaBufferValidity(IN PFILE_QUOTA_INFORMATION QuotaBuffer, IN ULONG QuotaLength, OUT PULONG ErrorOffset) @@ -1457,7 +1458,7 @@ * @unimplemented */ NTSTATUS -STDCALL +NTAPI IoCreateFileSpecifyDeviceObjectHint(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, @@ -1534,7 +1535,7 @@ * @unimplemented */ PFILE_OBJECT -STDCALL +NTAPI IoCreateStreamFileObjectEx(IN PFILE_OBJECT FileObject OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, OUT PHANDLE FileObjectHandle OPTIONAL) @@ -1547,7 +1548,7 @@ * @unimplemented */ PFILE_OBJECT -STDCALL +NTAPI IoCreateStreamFileObjectLite(IN PFILE_OBJECT FileObject OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL) { @@ -1559,9 +1560,10 @@ * @implemented */ PGENERIC_MAPPING -STDCALL +NTAPI IoGetFileObjectGenericMapping(VOID) { + /* Return the mapping */ return &IopFileMapping; } @@ -1574,6 +1576,264 @@ { /* Return the flag status */ return (FileObject->Flags & FO_REMOTE_ORIGIN); +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +{ + NTSTATUS Status; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = IO_FORCE_ACCESS_CHECK; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = Buffer; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = TRUE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = TRUE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + KernelMode, + NULL, + DesiredAccess, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) + { + /* Parse failed */ + IoStatus->Status = Status; + } + else + { + /* Use the Io status */ + IoStatus->Status = OpenPacket.FinalStatus; + IoStatus->Information = OpenPacket.Information; + } + + /* Return success */ + return TRUE; +} + +/* + * @implemented + */ +VOID +NTAPI +IoUpdateShareAccess(IN PFILE_OBJECT FileObject, + OUT PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += FileObject->ReadAccess; + ShareAccess->Writers += FileObject->WriteAccess; + ShareAccess->Deleters += FileObject->DeleteAccess; + ShareAccess->SharedRead += FileObject->SharedRead; + ShareAccess->SharedWrite += FileObject->SharedWrite; + ShareAccess->SharedDelete += FileObject->SharedDelete; + } +} + + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess, + IN BOOLEAN Update) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (ReadAccess || WriteAccess || DeleteAccess) + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || + (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || + (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || + ((ShareAccess->Readers != 0) && !SharedRead) || + ((ShareAccess->Writers != 0) && !SharedWrite) || + ((ShareAccess->Deleters != 0) && !SharedDelete)) + { + return(STATUS_SHARING_VIOLATION); + } + + if (Update) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += ReadAccess; + ShareAccess->Writers += WriteAccess; + ShareAccess->Deleters += DeleteAccess; + ShareAccess->SharedRead += SharedRead; + ShareAccess->SharedWrite += SharedWrite; + ShareAccess->SharedDelete += SharedDelete; + } + } + + return(STATUS_SUCCESS); +} + +/* + * @implemented + */ +VOID +NTAPI +IoRemoveShareAccess(IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount--; + + ShareAccess->Readers -= FileObject->ReadAccess; + ShareAccess->Writers -= FileObject->WriteAccess; + ShareAccess->Deleters -= FileObject->DeleteAccess; + ShareAccess->SharedRead -= FileObject->SharedRead; + ShareAccess->SharedWrite -= FileObject->SharedWrite; + ShareAccess->SharedDelete -= FileObject->SharedDelete; + } +} + +/* + * @implemented + */ +VOID +NTAPI +IoSetShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + OUT PSHARE_ACCESS ShareAccess) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (!ReadAccess && !WriteAccess && !DeleteAccess) + { + ShareAccess->OpenCount = 0; + ShareAccess->Readers = 0; + ShareAccess->Writers = 0; + ShareAccess->Deleters = 0; + + ShareAccess->SharedRead = 0; + ShareAccess->SharedWrite = 0; + ShareAccess->SharedDelete = 0; + } + else + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + ShareAccess->OpenCount = 1; + ShareAccess->Readers = ReadAccess; + ShareAccess->Writers = WriteAccess; + ShareAccess->Deleters = DeleteAccess; + + ShareAccess->SharedRead = SharedRead; + ShareAccess->SharedWrite = SharedWrite; + ShareAccess->SharedDelete = SharedDelete; + } +} + +/* + * @unimplemented + */ +VOID +STDCALL +IoCancelFileOpen(IN PDEVICE_OBJECT DeviceObject, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; } /* @@ -1601,25 +1861,7 @@ } - /* - * NAME EXPORTED - * NtCreateFile@44 - * - * DESCRIPTION - * Entry point to call IoCreateFile with - * default parameters. - * - * ARGUMENTS - * See IoCreateFile. - * - * RETURN VALUE - * See IoCreateFile. - * - * REVISIONS - * 2000-03-25 (ea) - * Code originally in NtCreateFile moved in IoCreateFile. - * * @implemented */ NTSTATUS @@ -1665,41 +1907,44 @@ IN PLARGE_INTEGER TimeOut) { MAILSLOT_CREATE_PARAMETERS Buffer; - - DPRINT("NtCreateMailslotFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p)\n", - FileHandle,DesiredAccess,ObjectAttributes); - + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check for Timeout */ - if (TimeOut != NULL) - { + if (DefaultTimeout) + { + /* check if the call came from user mode */ if (KeGetPreviousMode() != KernelMode) { - NTSTATUS Status = STATUS_SUCCESS; - + /* Enter SEH for Probe */ _SEH_TRY { - Buffer.ReadTimeout = ProbeForReadLargeInteger(TimeOut); + /* Probe the timeout */ + Buffer.DefaultTimeout = + ProbeForReadLargeInteger(DefaultTimeout); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return the exception */ if (!NT_SUCCESS(Status)) return Status; } else { - Buffer.ReadTimeout = *TimeOut; - } - + /* Otherwise, capture directly */ + Buffer.DefaultTimeout = *DefaultTimeout; + } + + /* Set the correct setting */ Buffer.TimeoutSpecified = TRUE; } else { + /* Tell the FSD we don't have a timeout */ Buffer.TimeoutSpecified = FALSE; } @@ -1713,7 +1958,7 @@ ObjectAttributes, IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + 0, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, CreateOptions, @@ -1725,58 +1970,63 @@ } NTSTATUS -STDCALL -NtCreateNamedPipeFile(PHANDLE FileHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG ShareAccess, - ULONG CreateDisposition, - ULONG CreateOptions, - ULONG NamedPipeType, - ULONG ReadMode, - ULONG CompletionMode, - ULONG MaximumInstances, - ULONG InboundQuota, - ULONG OutboundQuota, - PLARGE_INTEGER DefaultTimeout) +NTAPI +NtCreateNamedPipeFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG ShareAccess, + IN ULONG CreateDisposition, + IN ULONG CreateOptions, + IN ULONG NamedPipeType, + IN ULONG ReadMode, + IN ULONG CompletionMode, + IN ULONG MaximumInstances, + IN ULONG InboundQuota, + IN ULONG OutboundQuota, + IN PLARGE_INTEGER DefaultTimeout) { NAMED_PIPE_CREATE_PARAMETERS Buffer; - - DPRINT("NtCreateNamedPipeFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p)\n", - FileHandle,DesiredAccess,ObjectAttributes); - + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check for Timeout */ - if (DefaultTimeout != NULL) - { + if (DefaultTimeout) + { + /* check if the call came from user mode */ if (KeGetPreviousMode() != KernelMode) { - NTSTATUS Status = STATUS_SUCCESS; - + /* Enter SEH for Probe */ _SEH_TRY { - Buffer.DefaultTimeout = ProbeForReadLargeInteger(DefaultTimeout); + /* Probe the timeout */ + Buffer.DefaultTimeout = + ProbeForReadLargeInteger(DefaultTimeout); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; + /* Return the exception */ if (!NT_SUCCESS(Status)) return Status; } else { + /* Otherwise, capture directly */ Buffer.DefaultTimeout = *DefaultTimeout; } + /* Set the correct setting */ Buffer.TimeoutSpecified = TRUE; } else + { + /* Tell the FSD we don't have a timeout */ Buffer.TimeoutSpecified = FALSE; + } /* Set Settings */ Buffer.NamedPipeType = NamedPipeType; @@ -1792,7 +2042,7 @@ ObjectAttributes, IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + 0, ShareAccess, CreateDisposition, CreateOptions, @@ -1804,58 +2054,27 @@ } NTSTATUS -STDCALL +NTAPI NtFlushWriteBuffer(VOID) { PAGED_CODE(); + /* Call the kernel */ KeFlushWriteBuffer(); return STATUS_SUCCESS; } /* - * NAME EXPORTED - * NtOpenFile@24 - * - * DESCRIPTION - * Opens an existing file (simpler than NtCreateFile). - * - * ARGUMENTS - * FileHandle (OUT) - * Variable that receives the file handle on return; - * - * DesiredAccess - * Access desired by the caller to the file; - * - * ObjectAttributes - * Structue describing the file to be opened; - * - * IoStatusBlock (OUT) - * Receives details about the result of the - * operation; - * - * ShareAccess - * Type of shared access the caller requires; - * - * OpenOptions - * Options for the file open. - * - * RETURN VALUE - * Status. - * - * NOTE - * Undocumented. - * * @implemented */ NTSTATUS -STDCALL -NtOpenFile(PHANDLE FileHandle, - ACCESS_MASK DesiredAccess, - POBJECT_ATTRIBUTES ObjectAttributes, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG ShareAccess, - ULONG OpenOptions) +NTAPI +NtOpenFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG ShareAccess, + IN ULONG OpenOptions) { /* Call the I/O Function */ return IoCreateFile(FileHandle, @@ -1875,7 +2094,7 @@ } NTSTATUS -STDCALL +NTAPI NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) { @@ -1887,7 +2106,7 @@ } NTSTATUS -STDCALL +NTAPI NtQueryFullAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation) { @@ -2089,263 +2308,4 @@ return OpenPacket.FinalStatus; } -/* - * @implemented - */ -BOOLEAN -NTAPI -IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) -{ - NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; - HANDLE Handle; - OPEN_PACKET OpenPacket; - PAGED_CODE(); - - /* Setup the Open Packet */ - OpenPacket.Type = IO_TYPE_OPEN_PACKET; - OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.FileObject = NULL; - OpenPacket.FinalStatus = STATUS_SUCCESS; - OpenPacket.Information = 0; - OpenPacket.ParseCheck = 0; - OpenPacket.RelatedFileObject = NULL; - OpenPacket.AllocationSize.QuadPart = 0; - OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; - OpenPacket.FileAttributes = 0; - OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - OpenPacket.EaBuffer = NULL; - OpenPacket.EaLength = 0; - OpenPacket.Options = IO_FORCE_ACCESS_CHECK; - OpenPacket.Disposition = FILE_OPEN; - OpenPacket.BasicInformation = NULL; - OpenPacket.NetworkInformation = Buffer; - OpenPacket.CreateFileType = 0; - OpenPacket.MailslotOrPipeParameters = NULL; - OpenPacket.Override = FALSE; - OpenPacket.QueryOnly = TRUE; - OpenPacket.DeleteOnly = FALSE; - OpenPacket.FullAttributes = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; - OpenPacket.InternalFlags = 0; - - /* - * Attempt opening the file. This will call the I/O Parse Routine for - * the File Object (IopParseDevice) which will use the dummy file obejct - * send the IRP to its device object. Note that we have two statuses - * to worry about: the Object Manager's status (in Status) and the I/O - * status, which is in the Open Packet's Final Status, and determined - * by the Parse Check member. - */ - Status = ObOpenObjectByName(ObjectAttributes, - NULL, - KernelMode, - NULL, - DesiredAccess, - &OpenPacket, - &Handle); - if (OpenPacket.ParseCheck != TRUE) - { - /* Parse failed */ - IoStatus->Status = Status; - } - else - { - /* Use the Io status */ - IoStatus->Status = OpenPacket.FinalStatus; - IoStatus->Information = OpenPacket.Information; - } - - /* Return success */ - return TRUE; -} - -/* - * @implemented - */ -VOID STDCALL -IoUpdateShareAccess(PFILE_OBJECT FileObject, - PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += FileObject->ReadAccess; - ShareAccess->Writers += FileObject->WriteAccess; - ShareAccess->Deleters += FileObject->DeleteAccess; - ShareAccess->SharedRead += FileObject->SharedRead; - ShareAccess->SharedWrite += FileObject->SharedWrite; - ShareAccess->SharedDelete += FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (ReadAccess || WriteAccess || DeleteAccess) - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || - (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || - (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || - ((ShareAccess->Readers != 0) && !SharedRead) || - ((ShareAccess->Writers != 0) && !SharedWrite) || - ((ShareAccess->Deleters != 0) && !SharedDelete)) - { - return(STATUS_SHARING_VIOLATION); - } - - if (Update) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += ReadAccess; - ShareAccess->Writers += WriteAccess; - ShareAccess->Deleters += DeleteAccess; - ShareAccess->SharedRead += SharedRead; - ShareAccess->SharedWrite += SharedWrite; - ShareAccess->SharedDelete += SharedDelete; - } - } - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL -IoRemoveShareAccess(IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount--; - - ShareAccess->Readers -= FileObject->ReadAccess; - ShareAccess->Writers -= FileObject->WriteAccess; - ShareAccess->Deleters -= FileObject->DeleteAccess; - ShareAccess->SharedRead -= FileObject->SharedRead; - ShareAccess->SharedWrite -= FileObject->SharedWrite; - ShareAccess->SharedDelete -= FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -VOID STDCALL -IoSetShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - OUT PSHARE_ACCESS ShareAccess) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (!ReadAccess && !WriteAccess && !DeleteAccess) - { - ShareAccess->OpenCount = 0; - ShareAccess->Readers = 0; - ShareAccess->Writers = 0; - ShareAccess->Deleters = 0; - - ShareAccess->SharedRead = 0; - ShareAccess->SharedWrite = 0; - ShareAccess->SharedDelete = 0; - } - else - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - ShareAccess->OpenCount = 1; - ShareAccess->Readers = ReadAccess; - ShareAccess->Writers = WriteAccess; - ShareAccess->Deleters = DeleteAccess; - - ShareAccess->SharedRead = SharedRead; - ShareAccess->SharedWrite = SharedWrite; - ShareAccess->SharedDelete = SharedDelete; - } -} - -/* - * @unimplemented - */ -VOID -STDCALL -IoCancelFileOpen( - IN PDEVICE_OBJECT DeviceObject, - IN PFILE_OBJECT FileObject - ) -{ - UNIMPLEMENTED; -} /* EOF */

18 years, 2 months

[ion] 22935: - Implemented NtDeleteFile, also a piece of cake now that we have IopParseDevice done.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:47:26 2006 New Revision: 22935 URL: http://svn.reactos.org/svn/reactos?rev=22935&view=rev Log: - Implemented NtDeleteFile, also a piece of cake now that we have IopParseDevice done. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:47:26 2006 @@ -2023,14 +2023,70 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + NTSTATUS Status; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + KPROCESSOR_MODE AccessMode = KeGetPreviousMode(); + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = FILE_DELETE_ON_CLOSE; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | + FILE_SHARE_WRITE | + FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = 0; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = NULL; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = FALSE; + OpenPacket.DeleteOnly = TRUE; + OpenPacket.FullAttributes = FALSE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* Update the operation counts */ + IopUpdateOperationCount(IopOtherTransfer); + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + AccessMode, + NULL, + DELETE, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) return Status; + + /* Retrn the Io status */ + return OpenPacket.FinalStatus; } /* @@ -2044,7 +2100,7 @@ OUT PIO_STATUS_BLOCK IoStatus, OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; DUMMY_FILE_OBJECT DummyFileObject; HANDLE Handle; OPEN_PACKET OpenPacket;

18 years, 2 months

[ion] 22934: - Implement IoFastQueryNetworkAttributes which is now a piece of cake thanks to a properly implemented IopParseDevice.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:35:17 2006 New Revision: 22934 URL: http://svn.reactos.org/svn/reactos?rev=22934&view=rev Log: - Implement IoFastQueryNetworkAttributes which is now a piece of cake thanks to a properly implemented IopParseDevice. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:35:17 2006 @@ -2034,17 +2034,78 @@ } /* - * @unimplemented + * @implemented */ -BOOLEAN STDCALL +BOOLEAN +NTAPI IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) -{ - UNIMPLEMENTED; - return(FALSE); + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +{ + NTSTATUS Status = STATUS_SUCCESS; + DUMMY_FILE_OBJECT DummyFileObject; + HANDLE Handle; + OPEN_PACKET OpenPacket; + PAGED_CODE(); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = OpenOptions | FILE_OPEN_REPARSE_POINT; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = IO_FORCE_ACCESS_CHECK; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = Buffer; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = TRUE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = TRUE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + KernelMode, + NULL, + DesiredAccess, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) + { + /* Parse failed */ + IoStatus->Status = Status; + } + else + { + /* Use the Io status */ + IoStatus->Status = OpenPacket.FinalStatus; + IoStatus->Information = OpenPacket.Information; + } + + /* Return success */ + return TRUE; } /*

18 years, 2 months

[ion] 22933: - Add support for cases when the FSD that actually did the FO create wasn't the one to whom we went the IRP. - Also add support for detecting volume opens and setting the FO_VOLUME_OPEN flag.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:30:59 2006 New Revision: 22933 URL: http://svn.reactos.org/svn/reactos?rev=22933&view=rev Log: - Add support for cases when the FSD that actually did the FO create wasn't the one to whom we went the IRP. - Also add support for detecting volume opens and setting the FO_VOLUME_OPEN flag. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:30:59 2006 @@ -30,7 +30,8 @@ OUT PVOID *Object) { POPEN_PACKET OpenPacket = (POPEN_PACKET)Context; - PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject; + PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject; + PDEVICE_OBJECT DeviceObject, OwnerDevice; NTSTATUS Status; PFILE_OBJECT FileObject; PVPB Vpb = NULL; @@ -431,9 +432,43 @@ KEBUGCHECK(0); } + /* Get the owner of the File Object */ + OwnerDevice = IoGetRelatedDeviceObject(FileObject); + + /* + * It's possible that the device to whom we sent the IRP to + * isn't actually the device that ended opening the file object + * internally. + */ + if (OwnerDevice != DeviceObject) + { + /* We have to de-reference the VPB we had associated */ + if (Vpb) IopDereferenceVpb(Vpb); + + /* And re-associate with the actual one */ + Vpb = FileObject->Vpb; + if (Vpb) InterlockedIncrement(&Vpb->ReferenceCount); + } + /* Make sure we are not using a dummy */ if (!UseDummyFile) { + /* Check if this was a volume open */ + if ((!(FileObject->RelatedFileObject) || + (FileObject->RelatedFileObject->Flags & FO_VOLUME_OPEN)) && + !(FileObject->FileName.Length)) + { + /* All signs point to it, but make sure it was actually an FSD */ + if ((OwnerDevice->DeviceType == FILE_DEVICE_DISK_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_TAPE_FILE_SYSTEM) || + (OwnerDevice->DeviceType == FILE_DEVICE_FILE_SYSTEM)) + { + /* The owner device is an FSD, so this is a volume open for real */ + FileObject->Flags |= FO_VOLUME_OPEN; + } + } + /* Reference the object and set the parse check */ ObReferenceObject(FileObject); *Object = FileObject;

18 years, 2 months

[cwittich] 22932: -fixed msvc /W4 warnings and errors

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 8 22:30:34 2006 New Revision: 22932 URL: http://svn.reactos.org/svn/reactos?rev=22932&view=rev Log: -fixed msvc /W4 warnings and errors Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Sat Jul 8 22:30:34 2006 @@ -67,14 +67,15 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: { - GUID Guids[] = { - GUID_DEVCLASS_CDROM, - GUID_DEVCLASS_MEDIA, - }; + GUID Guids[2]; + Guids[0] = GUID_DEVCLASS_CDROM; + Guids[1] = GUID_DEVCLASS_MEDIA; /* create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, @@ -97,6 +98,11 @@ PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh = {0}; TCHAR Caption[256]; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, @@ -182,6 +188,7 @@ DWORD dwReason, LPVOID lpReserved) { + UNREFERENCED_PARAMETER(lpReserved); switch(dwReason) { case DLL_PROCESS_ATTACH:

18 years, 2 months

[cwittich] 22931: -use msvc compatible def files

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 8 22:25:19 2006 New Revision: 22931 URL: http://svn.reactos.org/svn/reactos?rev=22931&view=rev Log: -use msvc compatible def files Modified: trunk/reactos/dll/cpl/access/access.def trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/cplsample/cplsample.def trunk/reactos/dll/cpl/desk/desk.def trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def trunk/reactos/dll/cpl/intl/intl.def trunk/reactos/dll/cpl/intl_new/intl.def trunk/reactos/dll/cpl/liccpa/liccpa.def trunk/reactos/dll/cpl/main/main.def trunk/reactos/dll/cpl/mmsys/mmsys.def trunk/reactos/dll/cpl/ncpa/ncpa.def trunk/reactos/dll/cpl/powercfg/powercfg.def trunk/reactos/dll/cpl/sysdm/sysdm.def trunk/reactos/dll/cpl/timedate/timedate.def trunk/reactos/dll/keyboard/kbdbe/kbdbe.def trunk/reactos/dll/keyboard/kbdda/kbdda.def trunk/reactos/dll/keyboard/kbddv/kbddv.def trunk/reactos/dll/keyboard/kbdes/kbdes.def trunk/reactos/dll/keyboard/kbdfr/kbdfr.def trunk/reactos/dll/keyboard/kbdgr/kbdgr.def trunk/reactos/dll/keyboard/kbdhe/kbdhe.def trunk/reactos/dll/keyboard/kbdheb/kbdheb.def trunk/reactos/dll/keyboard/kbdhu/kbdhu.def trunk/reactos/dll/keyboard/kbdpo/kbdpo.def trunk/reactos/dll/keyboard/kbdru/kbdru.def trunk/reactos/dll/keyboard/kbdse/kbdse.def trunk/reactos/dll/keyboard/kbdsg/kbdsg.def trunk/reactos/dll/keyboard/kbdsk/kbdsk.def trunk/reactos/dll/keyboard/kbduk/kbduk.def trunk/reactos/dll/keyboard/kbdur/kbdur.def trunk/reactos/dll/keyboard/kbdus/kbdus.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY appwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/cplsample/cplsample.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/cplsample/cplsampl… ============================================================================== --- trunk/reactos/dll/cpl/cplsample/cplsample.def (original) +++ trunk/reactos/dll/cpl/cplsample/cplsample.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.def (original) +++ trunk/reactos/dll/cpl/desk/desk.def Sat Jul 8 22:25:19 2006 @@ -1,7 +1,7 @@ LIBRARY desk.cpl EXPORTS -CPlApplet@16 -DisplayClassInstaller@12 +CPlApplet +DisplayClassInstaller ; EOF Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY hdwwiz.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/intl/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.def (original) +++ trunk/reactos/dll/cpl/intl/intl.def Sat Jul 8 22:25:19 2006 @@ -1,7 +1,7 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -LocalePageProc@16 +CPlApplet +LocalePageProc ; EOF Modified: trunk/reactos/dll/cpl/intl_new/intl.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.def?… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.def (original) +++ trunk/reactos/dll/cpl/intl_new/intl.def Sat Jul 8 22:25:19 2006 @@ -1,8 +1,8 @@ LIBRARY intl.cpl EXPORTS -CPlApplet@16 -RegOptsProc@16 -ExtraOptsProc@16 +CPlApplet +RegOptsProc +ExtraOptsProc ; EOF Modified: trunk/reactos/dll/cpl/liccpa/liccpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.def?… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.def (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY liccpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/main/main.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/main/main.def (original) +++ trunk/reactos/dll/cpl/main/main.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY main.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/mmsys/mmsys.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.def?re… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.def (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY mmsys.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/ncpa/ncpa.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.def (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY ncpa.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/powercfg/powercfg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.def (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY powercfg.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/sysdm/sysdm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.def?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.def (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY cplsample.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/cpl/timedate/timedate.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.def (original) +++ trunk/reactos/dll/cpl/timedate/timedate.def Sat Jul 8 22:25:19 2006 @@ -1,6 +1,6 @@ LIBRARY timedate.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdbe/kbdbe.def (original) +++ trunk/reactos/dll/keyboard/kbdbe/kbdbe.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdbe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdda/kbdda.def (original) +++ trunk/reactos/dll/keyboard/kbdda/kbdda.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,3 @@ LIBRARY kbdda.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbddv/kbddv.def (original) +++ trunk/reactos/dll/keyboard/kbddv/kbddv.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbddvorak.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.def (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,6 @@ LIBRARY kbdda.dll -EXPORTS -KbdLayerDescriptor@0 + + +EXPORTS + +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdfr/kbdfr.def (original) +++ trunk/reactos/dll/keyboard/kbdfr/kbdfr.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdfr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdgr/kbdgr.def (original) +++ trunk/reactos/dll/keyboard/kbdgr/kbdgr.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdgr.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhe/kbdhe.def (original) +++ trunk/reactos/dll/keyboard/kbdhe/kbdhe.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhe.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… ============================================================================== --- trunk/reactos/dll/keyboard/kbdheb/kbdheb.def (original) +++ trunk/reactos/dll/keyboard/kbdheb/kbdheb.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdheb.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdhu/kbdhu.def (original) +++ trunk/reactos/dll/keyboard/kbdhu/kbdhu.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdhu.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdpo/kbdpo.def (original) +++ trunk/reactos/dll/keyboard/kbdpo/kbdpo.def Sat Jul 8 22:25:19 2006 @@ -1,3 +1,3 @@ LIBRARY kbdpo.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdru/kbdru.def (original) +++ trunk/reactos/dll/keyboard/kbdru/kbdru.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdru.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdse/kbdse.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdse/kbdse.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdse/kbdse.def (original) +++ trunk/reactos/dll/keyboard/kbdse/kbdse.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdse.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsg/kbdsg.def (original) +++ trunk/reactos/dll/keyboard/kbdsg/kbdsg.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsg.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk/kbdsk.def (original) +++ trunk/reactos/dll/keyboard/kbdsk/kbdsk.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdsk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbduk/kbduk.def (original) +++ trunk/reactos/dll/keyboard/kbduk/kbduk.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbduk.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdur/kbdur.def (original) +++ trunk/reactos/dll/keyboard/kbdur/kbdur.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdur.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdus/kbdus.def (original) +++ trunk/reactos/dll/keyboard/kbdus/kbdus.def Sat Jul 8 22:25:19 2006 @@ -4,5 +4,5 @@ LIBRARY kbdus.dll EXPORTS -KbdLayerDescriptor@0 +KbdLayerDescriptor ;EOF

18 years, 2 months

[cwittich] 22930: -fix msvc dll entrypoint -fix PROJECT_LFLAGS -added --enable-stdcall-fixup to PROJECT_LFLAGS

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 8 22:24:11 2006 New Revision: 22930 URL: http://svn.reactos.org/svn/reactos?rev=22930&view=rev Log: -fix msvc dll entrypoint -fix PROJECT_LFLAGS -added --enable-stdcall-fixup to PROJECT_LFLAGS Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Jul 8 22:24:11 2006 @@ -420,8 +420,8 @@ 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_LFLAGS := %s %s\n", + GenerateProjectLFLAGS ().c_str (), "-Wl,--enable-stdcall-fixup" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jul 8 22:24:11 2006 @@ -1564,15 +1564,15 @@ killAt.c_str () ); fprintf ( fMakefile, - "\t%s %s %s %s -o %s %s %s %s\n", + "\t%s %s %s %s %s -o %s %s %s\n", linker.c_str (), + GetLinkerMacro ().c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), temp_exp.c_str (), target.c_str (), objectsMacro.c_str (), - libsMacro.c_str (), - GetLinkerMacro ().c_str () ); + libsMacro.c_str () ); fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n", @@ -2263,7 +2263,7 @@ fprintf ( fMakefile, "\t%s %s -o $@ %s %s\n\n", linker.c_str (), - GetLinkerMacro ().c_str (), + GetLinkerMacro().c_str (), objectsMacro.c_str (), libsMacro.c_str () ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Jul 8 22:24:11 2006 @@ -443,7 +443,7 @@ } else if ( dll ) { - fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.GetEntryPoint(false) == "" ? "DllMain" : module.GetEntryPoint(false).c_str ()); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n", module.GetEntryPoint(false) == "" ? "" : "_", module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" : module.GetEntryPoint(false).c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x40000" : baseaddr.c_str ()); } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Sat Jul 8 22:24:11 2006 @@ -835,7 +835,7 @@ case NativeCUI: return "NtProcessStartup@4"; case Win32DLL: - return "DllMain@12"; + return "DllMainCRTStartup@12"; case Win32CUI: case Test: if ( isUnicode )

18 years, 2 months

[ion] 22929: - Remove a ROS hack in IopCloseFile.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:19:39 2006 New Revision: 22929 URL: http://svn.reactos.org/svn/reactos?rev=22929&view=rev Log: - Remove a ROS hack in IopCloseFile. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:19:39 2006 @@ -962,13 +962,6 @@ /* Make sure this is the last handle */ if (SystemHandleCount != 1) return; - - /* FIXME: ROS HACK */ - if (!FileObject->DeviceObject) - { - DPRINT1("FIXME: MALFORMED FILE OBJECT!\n"); - return; - } /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN)

18 years, 2 months

[ion] 22928: - Uber-optimize IopQueryAttributesFile by using the OPEN_PACKET mechanism to query file attributes, instead of doing lots of slow native calls. - Modify IopParseDevice to detect when OPEN_PACKET optimizations are in use (query or deletion (deletion not yet implemented)) and have some codepaths be slightly different and use DUMMY_FILE_OBJECT. - Implement QueryOnly case in IopParseDevice to handle attribute queries. - Add a missing dereference, and remove an extra DO reference.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 8 22:17:26 2006 New Revision: 22928 URL: http://svn.reactos.org/svn/reactos?rev=22928&view=rev Log: - Uber-optimize IopQueryAttributesFile by using the OPEN_PACKET mechanism to query file attributes, instead of doing lots of slow native calls. - Modify IopParseDevice to detect when OPEN_PACKET optimizations are in use (query or deletion (deletion not yet implemented)) and have some codepaths be slightly different and use DUMMY_FILE_OBJECT. - Implement QueryOnly case in IopParseDevice to handle attribute queries. - Add a missing dereference, and remove an extra DO reference. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 8 22:17:26 2006 @@ -38,18 +38,12 @@ PEXTENDED_IO_STACK_LOCATION StackLoc; IO_SECURITY_CONTEXT SecurityContext; IO_STATUS_BLOCK IoStatusBlock; - BOOLEAN DirectOpen = FALSE; + BOOLEAN DirectOpen = FALSE, OpenCancelled, UseDummyFile; OBJECT_ATTRIBUTES ObjectAttributes; - BOOLEAN OpenCancelled; KIRQL OldIrql; - DPRINT("IopParseDevice:\n" - "DeviceObject : %p\n" - "RelatedFileObject : %p\n" - "CompleteName : %wZ, RemainingName : %wZ\n", - ParseObject, - Context, - CompleteName, - RemainingName); + PDUMMY_FILE_OBJECT DummyFileObject; + PFILE_BASIC_INFORMATION FileBasicInfo; + ULONG ReturnLength; /* Assume failure */ *Object = NULL; @@ -76,8 +70,13 @@ SeSetAccessStateGenericMapping(AccessState, &IoFileObjectType->TypeInfo.GenericMapping); + /* Check if we can simply use a dummy file */ + UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); + /* Check if this is a direct open */ - if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject)) + if (!(RemainingName->Length) && + !(OpenPacket->RelatedFileObject) && + !(UseDummyFile)) { /* Remember this for later */ DirectOpen = TRUE; @@ -127,74 +126,86 @@ } } - /* Create the actual file object */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - Attributes, - NULL, - NULL); - Status = ObCreateObject(KernelMode, - IoFileObjectType, - &ObjectAttributes, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); - - /* Set the device object and reference it */ - Status = IopReferenceDeviceObject(DeviceObject); - FileObject->DeviceObject = DeviceObject; + /* Check if we really need to create an object */ + if (!UseDummyFile) + { + /* Create the actual file object */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + Attributes, + NULL, + NULL); + Status = ObCreateObject(KernelMode, + IoFileObjectType, + &ObjectAttributes, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); + + /* Check if this is Synch I/O */ + if (OpenPacket->CreateOptions & + (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + { + /* Set the synch flag */ + FileObject->Flags |= FO_SYNCHRONOUS_IO; + + /* Check if it's also alertable */ + if (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) + { + /* It is, set the alertable flag */ + FileObject->Flags |= FO_ALERTABLE_IO; + } + } + + /* Check if the caller requested no intermediate buffering */ + if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) + { + /* Set the correct flag for the FSD to read */ + FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + } + + /* Check if the caller requested write through support */ + if (OpenPacket->CreateOptions & FILE_WRITE_THROUGH) + { + /* Set the correct flag for the FSD to read */ + FileObject->Flags |= FO_WRITE_THROUGH; + } + + /* Check if the caller says the file will be only read sequentially */ + if (OpenPacket->CreateOptions & FILE_SEQUENTIAL_ONLY) + { + /* Set the correct flag for the FSD to read */ + FileObject->Flags |= FO_SEQUENTIAL_ONLY; + } + + /* Check if the caller believes the file will be only read randomly */ + if (OpenPacket->CreateOptions & FILE_RANDOM_ACCESS) + { + /* Set the correct flag for the FSD to read */ + FileObject->Flags |= FO_RANDOM_ACCESS; + } + } + else + { + /* Use the dummy object instead */ + DummyFileObject = OpenPacket->DummyFileObject; + RtlZeroMemory(DummyFileObject, sizeof(DUMMY_FILE_OBJECT)); + + /* Set it up */ + FileObject = (PFILE_OBJECT)&DummyFileObject->ObjectHeader.Body; + DummyFileObject->ObjectHeader.Type = IoFileObjectType; + DummyFileObject->ObjectHeader.PointerCount = 1; + } /* Setup the file header */ FileObject->Type = IO_TYPE_FILE; FileObject->Size = sizeof(FILE_OBJECT); FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; - - /* Check if this is Synch I/O */ - if (OpenPacket->CreateOptions & - (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) - { - /* Set the synch flag */ - FileObject->Flags |= FO_SYNCHRONOUS_IO; - - /* Check if it's also alertable */ - if (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) - { - /* It is, set the alertable flag */ - FileObject->Flags |= FO_ALERTABLE_IO; - } - } - - /* Check if the caller requested no intermediate buffering */ - if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) - { - /* Set the correct flag for the FSD to read */ - FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; - } - - /* Check if the caller requested write through support */ - if (OpenPacket->CreateOptions & FILE_WRITE_THROUGH) - { - /* Set the correct flag for the FSD to read */ - FileObject->Flags |= FO_WRITE_THROUGH; - } - - /* Check if the caller believes the file will be only read sequentially */ - if (OpenPacket->CreateOptions & FILE_SEQUENTIAL_ONLY) - { - /* Set the correct flag for the FSD to read */ - FileObject->Flags |= FO_SEQUENTIAL_ONLY; - } - - /* Check if the caller believes the file will be only read randomly */ - if (OpenPacket->CreateOptions & FILE_RANDOM_ACCESS) - { - /* Set the correct flag for the FSD to read */ - FileObject->Flags |= FO_RANDOM_ACCESS; - } + FileObject->DeviceObject = DeviceObject; /* Check if this is a direct device open */ if (DirectOpen) FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; @@ -315,8 +326,11 @@ IopDereferenceDeviceObject(DeviceObject, FALSE); if (Vpb) IopDereferenceVpb(Vpb); - /* Clear the FO */ + /* Clear the FO and dereference it */ FileObject->DeviceObject = NULL; + if (!UseDummyFile) ObDereferenceObject(FileObject); + + /* Fail */ return STATUS_INSUFFICIENT_RESOURCES; } } @@ -324,7 +338,7 @@ /* Copy the name */ RtlCopyUnicodeString(&FileObject->FileName, RemainingName); - /* Reference the file object and call the driver */ + /* Reference the file object */ ObReferenceObject(FileObject); /* Initialize the File Object event and set the FO */ @@ -402,7 +416,7 @@ OpenPacket->FileObject = NULL; /* Dereference the file object */ - ObDereferenceObject(FileObject); + if (!UseDummyFile) ObDereferenceObject(FileObject); /* Unless the driver canelled the open, dereference the VPB */ if (!(OpenCancelled) && (Vpb)) IopDereferenceVpb(Vpb); @@ -417,14 +431,77 @@ KEBUGCHECK(0); } - /* Otherwise, we were successful. Reference the object, set status */ - ObReferenceObject(FileObject); - OpenPacket->FinalStatus = IoStatusBlock.Status; - OpenPacket->ParseCheck = TRUE; - - /* Return the object and status */ - *Object = FileObject; - return OpenPacket->FinalStatus; + /* Make sure we are not using a dummy */ + if (!UseDummyFile) + { + /* Reference the object and set the parse check */ + ObReferenceObject(FileObject); + *Object = FileObject; + OpenPacket->FinalStatus = IoStatusBlock.Status; + OpenPacket->ParseCheck = TRUE; + return OpenPacket->FinalStatus; + } + else + { + /* Check if this was a query */ + if (OpenPacket->QueryOnly) + { + /* Check if the caller wants basic info only */ + if (!OpenPacket->FullAttributes) + { + /* Allocate the buffer */ + FileBasicInfo = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*FileBasicInfo), + TAG_IO); + if (FileBasicInfo) + { + /* Do the query */ + Status = IoQueryFileInformation(FileObject, + FileBasicInformation, + sizeof(*FileBasicInfo), + FileBasicInfo, + &ReturnLength); + if (NT_SUCCESS(Status)) + { + /* Copy the data */ + RtlCopyMemory(OpenPacket->BasicInformation, + FileBasicInfo, + ReturnLength); + } + + /* Free our buffer */ + ExFreePool(FileBasicInfo); + } + else + { + /* Fail */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + /* This is a full query */ + Status = IoQueryFileInformation( + FileObject, + FileNetworkOpenInformation, + sizeof(FILE_NETWORK_OPEN_INFORMATION), + OpenPacket->NetworkInformation, + &ReturnLength); + if (!NT_SUCCESS(Status)) ASSERT(Status != STATUS_NOT_IMPLEMENTED); + } + } + + /* Delete the file object */ + IopDeleteFile(FileObject); + + /* Clear out the file */ + OpenPacket->FileObject = NULL; + + /* Set and return status */ + OpenPacket->FinalStatus = Status; + OpenPacket->ParseCheck = TRUE; + return Status; + } } NTSTATUS @@ -957,112 +1034,119 @@ NTAPI IopQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, IN FILE_INFORMATION_CLASS FileInformationClass, + IN ULONG FileInformationSize, OUT PVOID FileInformation) { - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - NTSTATUS Status; - KPROCESSOR_MODE AccessMode; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - OBJECT_ATTRIBUTES LocalObjectAttributes; - ULONG BufferSize; - union - { - FILE_BASIC_INFORMATION BasicInformation; - FILE_NETWORK_OPEN_INFORMATION NetworkOpenInformation; - }LocalFileInformation; - - if (FileInformationClass == FileBasicInformation) - { - BufferSize = sizeof(FILE_BASIC_INFORMATION); - } - else if (FileInformationClass == FileNetworkOpenInformation) - { - BufferSize = sizeof(FILE_NETWORK_OPEN_INFORMATION); + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE AccessMode = ExGetPreviousMode(); + DUMMY_FILE_OBJECT DummyFileObject; + FILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo; + HANDLE Handle; + OPEN_PACKET OpenPacket; + BOOLEAN IsBasic; + PAGED_CODE(); + + /* Check if the caller was user mode */ + if (AccessMode != KernelMode) + { + /* Protect probe in SEH */ + _SEH_TRY + { + /* Probe the buffer */ + ProbeForWrite(FileInformation, FileInformationSize, sizeof(ULONG)); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status))return Status; + } + + /* Check if this is a basic or full request */ + IsBasic = (FileInformationSize == sizeof(FILE_BASIC_INFORMATION)); + + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.AllocationSize.QuadPart = 0; + OpenPacket.CreateOptions = FILE_OPEN_REPARSE_POINT; + OpenPacket.FileAttributes = 0; + OpenPacket.ShareAccess = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + OpenPacket.EaBuffer = NULL; + OpenPacket.EaLength = 0; + OpenPacket.Options = 0; + OpenPacket.Disposition = FILE_OPEN; + OpenPacket.BasicInformation = IsBasic ? FileInformation : NULL; + OpenPacket.NetworkInformation = IsBasic ? &NetworkOpenInfo : + (AccessMode != KernelMode) ? + &NetworkOpenInfo : FileInformation; + OpenPacket.CreateFileType = 0; + OpenPacket.MailslotOrPipeParameters = NULL; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = TRUE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = IsBasic ? FALSE : TRUE; + OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.InternalFlags = 0; + + /* Update the operation count */ + IopUpdateOperationCount(IopOtherTransfer); + + /* + * Attempt opening the file. This will call the I/O Parse Routine for + * the File Object (IopParseDevice) which will use the dummy file obejct + * send the IRP to its device object. Note that we have two statuses + * to worry about: the Object Manager's status (in Status) and the I/O + * status, which is in the Open Packet's Final Status, and determined + * by the Parse Check member. + */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + AccessMode, + NULL, + FILE_READ_ATTRIBUTES, + &OpenPacket, + &Handle); + if (OpenPacket.ParseCheck != TRUE) + { + /* Parse failed */ + return Status; } else { - return STATUS_INVALID_PARAMETER; - } - - AccessMode = ExGetPreviousMode(); - - if (AccessMode != KernelMode) - { - Status = STATUS_SUCCESS; + /* Use the Io status */ + Status = OpenPacket.FinalStatus; + } + + /* Check if we were succesful and this was user mode and a full query */ + if ((NT_SUCCESS(Status)) && (AccessMode != KernelMode) && !(IsBasic)) + { + /* Enter SEH for copy */ _SEH_TRY { - ProbeForWrite(FileInformation, - BufferSize, - sizeof(ULONG)); + /* Copy the buffer back */ + RtlMoveMemory(FileInformation, + &NetworkOpenInfo, + FileInformationSize); } _SEH_HANDLE { + /* Get exception code */ Status = _SEH_GetExceptionCode(); } _SEH_END; - if (NT_SUCCESS(Status)) - { - Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - } - if (!NT_SUCCESS(Status)) - { - return Status; - } - InitializeObjectAttributes(&LocalObjectAttributes, - &ObjectName, - ObjectCreateInfo.Attributes, - ObjectCreateInfo.RootDirectory, - ObjectCreateInfo.SecurityDescriptor); - } - - /* Open the file */ - Status = ZwOpenFile(&FileHandle, - SYNCHRONIZE | FILE_READ_ATTRIBUTES, - AccessMode == KernelMode ? ObjectAttributes : &LocalObjectAttributes, - &IoStatusBlock, - 0, - FILE_SYNCHRONOUS_IO_NONALERT); - if (AccessMode != KernelMode) - { - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - } - if (!NT_SUCCESS (Status)) - { - DPRINT ("ZwOpenFile() failed (Status %lx)\n", Status); - return Status; - } - - /* Get file attributes */ - Status = ZwQueryInformationFile(FileHandle, - &IoStatusBlock, - AccessMode == KernelMode ? FileInformation : &LocalFileInformation, - BufferSize, - FileInformationClass); - if (!NT_SUCCESS (Status)) - { - DPRINT ("ZwQueryInformationFile() failed (Status %lx)\n", Status); - } - ZwClose(FileHandle); - - if (NT_SUCCESS(Status) && AccessMode != KernelMode) - { - _SEH_TRY - { - memcpy(FileInformation, &LocalFileInformation, BufferSize); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + } + + /* Return status */ return Status; } @@ -1228,6 +1312,9 @@ OpenPacket.DummyFileObject = NULL; OpenPacket.InternalFlags = 0; + /* Update the operation count */ + IopUpdateOperationCount(IopOtherTransfer); + /* * Attempt opening the file. This will call the I/O Parse Routine for * the File Object (IopParseDevice) which will create the object and @@ -1386,7 +1473,7 @@ sizeof(FILE_OBJECT), 0, (PVOID*)&CreatedFileObject); - if (!NT_SUCCESS(Status)) return (NULL); + if (!NT_SUCCESS(Status)) return NULL; /* Choose Device Object */ if (FileObject) DeviceObject = FileObject->DeviceObject; @@ -1764,8 +1851,10 @@ NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) { + /* Call the internal helper API */ return IopQueryAttributesFile(ObjectAttributes, FileBasicInformation, + sizeof(FILE_BASIC_INFORMATION), FileInformation); } @@ -1774,9 +1863,11 @@ NtQueryFullAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation) { - return IopQueryAttributesFile(ObjectAttributes, - FileNetworkOpenInformation, - FileInformation); + /* Call the internal helper API */ + return IopQueryAttributesFile(ObjectAttributes, + FileNetworkOpenInformation, + sizeof(FILE_NETWORK_OPEN_INFORMATION), + FileInformation); } /**

18 years, 2 months

[fireball] 22927: - Remove extern (I don't see a reason to use it in function declarations) - Add co_CsrNotifyScreenSaver(), so win32k builds properly - Make style better

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jul 8 22:05:06 2006 New Revision: 22927 URL: http://svn.reactos.org/svn/reactos?rev=22927&view=rev Log: - Remove extern (I don't see a reason to use it in function declarations) - Add co_CsrNotifyScreenSaver(), so win32k builds properly - Make style better Modified: trunk/reactos/subsystems/win32/win32k/include/csr.h Modified: trunk/reactos/subsystems/win32/win32k/include/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/csr.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/csr.h Sat Jul 8 22:05:06 2006 @@ -12,14 +12,13 @@ extern PEPROCESS CsrProcess; -extern NTSTATUS FASTCALL CsrInit(void); -extern NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); -extern NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); -NTSTATUS -STDCALL -CsrInsertObject(HANDLE ObjectHandle, - ACCESS_MASK DesiredAccess, - PHANDLE Handle); +NTSTATUS FASTCALL CsrInit(void); +NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); +NTSTATUS FASTCALL co_CsrNotifyScreenSaver(PCSR_API_MESSAGE Request); +NTSTATUS FASTCALL CsrCloseHandle(HANDLE Handle); +NTSTATUS WINAPI CsrInsertObject(HANDLE ObjectHandle, + ACCESS_MASK DesiredAccess, + PHANDLE Handle); #endif /* CSR_H_INCLUDED */

18 years, 2 months

← Newer
1
...
44
45
46
47
48
49
50
...
67
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 July 2006