Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22929: - Remove a ROS hack in IopCloseFile.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

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)

1 0

[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 08 Jul '06

08 Jul '06

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); } /**

1 0

[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 08 Jul '06

08 Jul '06

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 */

1 0

[ion] 22926: - Massively improve File I/O by using deferred I/O completion for MJ_(MAILSLOT/FILE/NAMEDPIPE)CREATE and manually completing the IRP.
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 21:07:24 2006 New Revision: 22926 URL: http://svn.reactos.org/svn/reactos?rev=22926&view=rev Log: - Massively improve File I/O by using deferred I/O completion for MJ_(MAILSLOT/FILE/NAMEDPIPE)CREATE and manually completing the IRP. 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 21:07:24 2006 @@ -41,6 +41,7 @@ BOOLEAN DirectOpen = FALSE; OBJECT_ATTRIBUTES ObjectAttributes; BOOLEAN OpenCancelled; + KIRQL OldIrql; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -232,8 +233,8 @@ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = AccessMode; Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API;// | - //IRP_DEFER_IO_COMPLETION; + IRP_SYNCHRONOUS_API | + IRP_DEFER_IO_COMPLETION; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; Irp->UserIosb = &IoStatusBlock; @@ -341,26 +342,41 @@ KernelMode, FALSE, NULL); + + /* Get the new status */ Status = IoStatusBlock.Status; } -#if 0 else { - KIRQL OldIrql; - PKNORMAL_ROUTINE NormalRoutine; - PVOID NormalContext; - /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); + + /* Completion happens at APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); - IopCompleteRequest(&Irp->Tail.Apc, - &NormalRoutine, - &NormalContext, - (PVOID*)&FileObject, - &NormalContext); + + /* Get the new I/O Status block ourselves */ + IoStatusBlock = Irp->IoStatus; + Status = IoStatusBlock.Status; + + /* Manually signal the even, we can't have any waiters */ + FileObject->Event.Header.SignalState = 1; + + /* Now that we've signaled the events, de-associate the IRP */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Check if the IRP had an input buffer */ + if ((Irp->Flags & IRP_BUFFERED_IO) && + (Irp->Flags & IRP_DEALLOCATE_BUFFER)) + { + /* Free it. A driver might've tacked one on */ + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + + /* Free the IRP and bring the IRQL back down */ + IoFreeIrp(Irp); KeLowerIrql(OldIrql); } -#endif /* Copy the I/O Status */ OpenPacket->Information = IoStatusBlock.Information;

1 0

[ion] 22925: - Add proper failure case for IRP allocation failure - Only initialize the FO's lock for Synch I/O - Add some missing comments - Fixup some formatting
by ion＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: ion Date: Sat Jul 8 20:45:53 2006 New Revision: 22925 URL: http://svn.reactos.org/svn/reactos?rev=22925&view=rev Log: - Add proper failure case for IRP allocation failure - Only initialize the FO's lock for Synch I/O - Add some missing comments - Fixup some formatting 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 20:45:53 2006 @@ -147,56 +147,86 @@ Status = IopReferenceDeviceObject(DeviceObject); FileObject->DeviceObject = DeviceObject; + /* 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; } - if (DirectOpen) - { - FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - } - + /* Check if this is a direct device open */ + if (DirectOpen) FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; + + /* Check if the caller wants case sensitivity */ if (!(Attributes & OBJ_CASE_INSENSITIVE)) { + /* Tell the driver about it */ FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; } + /* Setup the security context */ SecurityContext.SecurityQos = SecurityQos; SecurityContext.AccessState = AccessState; SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - - Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return STATUS_UNSUCCESSFUL; + /* Check if this is synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Initialize the event */ + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); + } + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + /* Dereference the device and VPB, then fail */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Now set the IRP data */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -214,35 +244,52 @@ Irp->CancelRoutine = NULL; Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + /* Get the I/O Stack location */ StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); StackLoc->Control = 0; StackLoc->FileObject = FileObject; + /* Check what kind of file this is */ switch (OpenPacket->CreateFileType) { - default: + /* Normal file */ case CreateFileTypeNone: + + /* Set the major function and EA Length */ StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; + + /* Set the flags */ StackLoc->Flags = OpenPacket->Options; - StackLoc->Parameters.Create.EaLength = OpenPacket->EaBuffer != NULL ? OpenPacket->EaLength : 0; - StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? + SL_CASE_SENSITIVE: 0; break; + /* Named pipe */ case CreateFileTypeNamedPipe: + + /* Set the named pipe MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreatePipe.Parameters = + OpenPacket->MailslotOrPipeParameters; break; + /* Mailslot */ case CreateFileTypeMailslot: + + /* Set the mailslot MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreateMailslot.Parameters = + OpenPacket->MailslotOrPipeParameters; break; } /* Set the common data */ Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; Irp->AssociatedIrp.SystemBuffer =OpenPacket->EaBuffer; - StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | (OpenPacket->CreateOptions & 0x00FFFFFF); + StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | + (OpenPacket->CreateOptions & + 0xFFFFFF); StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; StackLoc->Parameters.Create.SecurityContext = &SecurityContext; @@ -286,10 +333,9 @@ /* Queue the IRP and call the driver */ //IopQueueIrpToThread(Irp); Status = IoCallDriver(DeviceObject, Irp); - - /* Copy the status block */ if (Status == STATUS_PENDING) { + /* Wait for the driver to complete the create */ KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode,

1 0

[cwittich] 22924: -fixed some msvc /W4 warnings
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 20:45:13 2006 New Revision: 22924 URL: http://svn.reactos.org/svn/reactos?rev=22924&view=rev Log: -fixed some msvc /W4 warnings Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Sat Jul 8 20:45:13 2006 @@ -289,7 +289,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); - pOldWndProc = (WNDPROC) SetWindowLong(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); + pOldWndProc = (WNDPROC) SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); } break; @@ -322,7 +322,7 @@ case WM_CTLCOLORSTATIC: { if ((HWND) lParam == GetDlgItem(hwndDlg, IDC_YEARTEXT)) - return (int) GetSysColorBrush(COLOR_WINDOW); + return (INT_PTR) GetSysColorBrush(COLOR_WINDOW); } break; Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Sat Jul 8 20:45:13 2006 @@ -237,7 +237,7 @@ TCHAR szBuf[64]; UINT i; - infoPtr->UIState = SendMessage(GetAncestor(infoPtr->hSelf, + infoPtr->UIState = (DWORD) SendMessage(GetAncestor(infoPtr->hSelf, GA_PARENT), WM_QUERYUISTATE, 0, @@ -439,7 +439,7 @@ IN HDC hDC, IN LPRECT prcUpdate) { - UINT x, y; + LONG x, y; RECT rcCell; COLORREF crOldText, crOldCtrlText = CLR_INVALID; HFONT hOldFont; @@ -993,7 +993,7 @@ { if (wParam == GWL_STYLE) { - BOOL OldEnabled = infoPtr->Enabled; + unsigned int OldEnabled = infoPtr->Enabled; infoPtr->Enabled = !(((LPSTYLESTRUCT)lParam)->styleNew & WS_DISABLED); if (OldEnabled != infoPtr->Enabled) Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Sat Jul 8 20:45:13 2006 @@ -135,7 +135,7 @@ } -BOOL STDCALL +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpReserved)

1 0

[cwittich] 22923: -revert 22909 -take care of ModuleDefinitionFile
by cwittich＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: cwittich Date: Sat Jul 8 20:44:38 2006 New Revision: 22923 URL: http://svn.reactos.org/svn/reactos?rev=22923&view=rev Log: -revert 22909 -take care of ModuleDefinitionFile Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 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 20:44:38 2006 @@ -323,12 +323,7 @@ fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); - - if (dll) - fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 3 : 2 ); // 3=/MDd 5=/MD - else - fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd 5=/MT - + fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"%d\"\r\n", debug ? 1 : 5 ); // 1=/MTd 5=/MT fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); @@ -376,7 +371,8 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); - + if (module.importLibrary != NULL) + fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); fprintf ( OUT, "\t\t\t\tAdditionalDependencies=\"" ); for ( i = 0; i < libraries.size(); i++ ) {

1 0

[janderwald] 22922: * halfplement reading console properties * thnx to Alex_Ionescu for advice on how get HKCU path
by janderwald＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: janderwald Date: Sat Jul 8 20:00:08 2006 New Revision: 22922 URL: http://svn.reactos.org/svn/reactos?rev=22922&view=rev Log: * halfplement reading console properties * thnx to Alex_Ionescu for advice on how get HKCU path Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sat Jul 8 20:00:08 2006 @@ -54,6 +54,158 @@ } static BOOL FASTCALL +GuiConsoleOpenUserRegistryPathPerProcessId(DWORD ProcessId, PHANDLE hProcHandle, PHKEY hResult, REGSAM samDesired) +{ + HANDLE hProcessToken = NULL; + HANDLE hProcess; + + BYTE Buffer[256]; + DWORD Length = 0; + UNICODE_STRING SidName; + LONG res; + PTOKEN_USER TokUser; + + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | READ_CONTROL, FALSE, ProcessId); + if (!hProcess) + { + DPRINT("Error: OpenProcess failed(0x%x)\n", GetLastError()); + return FALSE; + } + + if (!OpenProcessToken(hProcess, TOKEN_QUERY, &hProcessToken)) + { + DPRINT("Error: OpenProcessToken failed(0x%x)\n", GetLastError()); + CloseHandle(hProcess); + return FALSE; + } + + if (!GetTokenInformation(hProcessToken, TokenUser, (PVOID)Buffer, sizeof(Buffer), &Length)) + { + DPRINT("Error: GetTokenInformation failed(0x%x)\n",GetLastError()); + CloseHandle(hProcess); + CloseHandle(hProcessToken); + return FALSE; + } + + TokUser = ((PTOKEN_USER)Buffer)->User.Sid; + if (!NT_SUCCESS(RtlConvertSidToUnicodeString(&SidName, TokUser, TRUE))) + { + DPRINT("Error: RtlConvertSidToUnicodeString failed(0x%x)\n", GetLastError()); + return FALSE; + } + + res = RegOpenKeyExW(HKEY_USERS, SidName.Buffer, 0, samDesired, hResult); + RtlFreeUnicodeString(&SidName); + + CloseHandle(hProcessToken); + if (hProcHandle) + *hProcHandle = hProcess; + else + CloseHandle(hProcess); + + if (res != ERROR_SUCCESS) + return FALSE; + else + return TRUE; +} + +static BOOL FASTCALL +GuiConsoleOpenUserSettings(HWND hWnd, DWORD ProcessId, PHKEY hSubKey, REGSAM samDesired) +{ + WCHAR szProcessName[MAX_PATH]; + WCHAR szBuffer[MAX_PATH]; + UINT fLength, wLength; + DWORD dwBitmask, dwLength; + WCHAR CurDrive[] = { 'A',':', 0 }; + HANDLE hProcess; + HKEY hKey; + WCHAR * ptr, *res; + static const WCHAR szSystemRoot[] = { '%','S','y','s','t','e','m','R','o','o','t','%', 0 }; + + + /* + * console properties are stored under + * HKCU\Console\* + * + * There are 3 ways to store console properties + * + * 1. use console title as subkey name + * i.e. cmd.exe + * + * 2. use application name as subkey name + * + * 3. use unexpanded path to console application. + * i.e. %SystemRoot%_system32_cmd.exe + */ + + if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey, samDesired)) + return FALSE; + + fLength = GetProcessImageFileNameW(hProcess, szProcessName, MAX_PATH); + CloseHandle(hProcess); + + if (!fLength) + { + DPRINT1("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); + return FALSE; + } + + + ptr = wcsrchr(szProcessName, L'\\'); + swprintf(szBuffer, L"Console%s",ptr); + + if (RegOpenKeyExW(hKey, szBuffer, 0, samDesired, hSubKey) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + + dwBitmask = GetLogicalDrives(); + while(dwBitmask) + { + if (dwBitmask & 0x1) + { + dwLength = QueryDosDeviceW(CurDrive, szBuffer, MAX_PATH); + if (dwLength) + { + if (!memcmp(szBuffer, szProcessName, (dwLength-2)*sizeof(WCHAR))) + { + wcscpy(szBuffer, CurDrive); + wcscat(&szBuffer[(sizeof(CurDrive)/sizeof(WCHAR))-1], &szProcessName[dwLength-2]); + break; + } + } + } + dwBitmask = (dwBitmask >> 1); + CurDrive[0]++; + } + + wLength = GetWindowsDirectoryW(szProcessName, MAX_PATH); + + if (!wcsncmp(szProcessName, szBuffer, wLength)) + { + wcscpy(szProcessName, szSystemRoot); + wcscpy(&szProcessName[(sizeof(szSystemRoot) / sizeof(WCHAR))-1], &szBuffer[wLength]); + ptr = res = szProcessName; + } + else + { + ptr = res = szBuffer; + } + + while((ptr = wcschr(szProcessName, L'\\'))) + ptr[0] = L'_'; + + if (RegOpenKeyExW(hKey, res, 0, samDesired, hSubKey) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + RegCloseKey(hKey); + return FALSE; +} + +static BOOL FASTCALL GuiConsoleHandleNcCreate(HWND hWnd, CREATESTRUCTW *Create) { RECT Rect; @@ -62,7 +214,20 @@ HDC Dc; HFONT OldFont; TEXTMETRICW Metrics; - + PCSRSS_PROCESS_DATA ProcessData; + HKEY hKey; + + if (Console->ProcessList.Flink != &Console->ProcessList) + { + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); + if (GuiConsoleOpenUserSettings(hWnd, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ)) + { + // TODO + // read registry settings + // and store them in GuiData struct + RegCloseKey(hKey); + } + } GuiData = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(GUI_CONSOLE_DATA) + (Console->Size.X + 1) * sizeof(WCHAR)); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Sat Jul 8 20:00:08 2006 @@ -3,6 +3,9 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <accctrl.h> +#include <psapi.h> /* Our own BLUE.SYS Driver for Console Output */ #include <blue/ntddblue.h> Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Sat Jul 8 20:00:08 2006 @@ -6,12 +6,14 @@ <include base="ReactOS">include/reactos/drivers</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> - <define name="_WIN32_WINNT">0x0500</define> + <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> - <pch>w32csr.h</pch> + <library>advapi32</library> + <library>psapi</library> + <pch>w32csr.h</pch> <file>conio.c</file> <file>desktopbg.c</file> <file>dllmain.c</file>

1 0

[mbosma] 22921: Add Instructions.
by mbosma＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: mbosma Date: Sat Jul 8 16:27:53 2006 New Revision: 22921 URL: http://svn.reactos.org/svn/reactos?rev=22921&view=rev Log: Add Instructions. Added: branches/cache_manager_rewrite/Instructions.txt (with props) Added: branches/cache_manager_rewrite/Instructions.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/Instructi… ============================================================================== --- branches/cache_manager_rewrite/Instructions.txt (added) +++ branches/cache_manager_rewrite/Instructions.txt Sat Jul 8 16:27:53 2006 @@ -1,0 +1,1 @@ +To build this branch apply the patch to trunk. And replace ntoskrnl/mm, ntoskrnl/cc and drivers/filesystems/vfat with the folders from here. Propchange: branches/cache_manager_rewrite/Instructions.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mbosma] 22920: Forgot vfat
by mbosma＠svn.reactos.org 08 Jul '06

08 Jul '06

Author: mbosma Date: Sat Jul 8 16:23:55 2006 New Revision: 22920 URL: http://svn.reactos.org/svn/reactos?rev=22920&view=rev Log: Forgot vfat Added: branches/cache_manager_rewrite/vfat/ branches/cache_manager_rewrite/vfat/blockdev.c (with props) branches/cache_manager_rewrite/vfat/cleanup.c (with props) branches/cache_manager_rewrite/vfat/close.c (with props) branches/cache_manager_rewrite/vfat/create.c (with props) branches/cache_manager_rewrite/vfat/dir.c (with props) branches/cache_manager_rewrite/vfat/direntry.c (with props) branches/cache_manager_rewrite/vfat/dirwr.c (with props) branches/cache_manager_rewrite/vfat/ea.c (with props) branches/cache_manager_rewrite/vfat/fastio.c (with props) branches/cache_manager_rewrite/vfat/fat.c (with props) branches/cache_manager_rewrite/vfat/fcb.c (with props) branches/cache_manager_rewrite/vfat/finfo.c (with props) branches/cache_manager_rewrite/vfat/flush.c (with props) branches/cache_manager_rewrite/vfat/fsctl.c (with props) branches/cache_manager_rewrite/vfat/iface.c (with props) branches/cache_manager_rewrite/vfat/misc.c (with props) branches/cache_manager_rewrite/vfat/rw.c (with props) branches/cache_manager_rewrite/vfat/shutdown.c (with props) branches/cache_manager_rewrite/vfat/string.c (with props) branches/cache_manager_rewrite/vfat/vfat.h (with props) branches/cache_manager_rewrite/vfat/vfat005.1st branches/cache_manager_rewrite/vfat/vfat_fr.txt (with props) branches/cache_manager_rewrite/vfat/vfatfs.def branches/cache_manager_rewrite/vfat/vfatfs.rbuild branches/cache_manager_rewrite/vfat/vfatfs.rc branches/cache_manager_rewrite/vfat/volume.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/cache_manager_rewrite/vfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/bloc… Added: branches/cache_manager_rewrite/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clea… Added: branches/cache_manager_rewrite/vfat/close.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clos… Added: branches/cache_manager_rewrite/vfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/crea… Added: branches/cache_manager_rewrite/vfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/dir.… Added: branches/cache_manager_rewrite/vfat/direntry.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/dire… Added: branches/cache_manager_rewrite/vfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/dirw… Added: branches/cache_manager_rewrite/vfat/ea.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/ea.c… Added: branches/cache_manager_rewrite/vfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fast… Added: branches/cache_manager_rewrite/vfat/fat.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fat.… Added: branches/cache_manager_rewrite/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fcb.… Added: branches/cache_manager_rewrite/vfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/finf… Added: branches/cache_manager_rewrite/vfat/flush.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/flus… Added: branches/cache_manager_rewrite/vfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fsct… Added: branches/cache_manager_rewrite/vfat/iface.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/ifac… Added: branches/cache_manager_rewrite/vfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/misc… Added: branches/cache_manager_rewrite/vfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/rw.c… Added: branches/cache_manager_rewrite/vfat/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/shut… Added: branches/cache_manager_rewrite/vfat/string.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/stri… Added: branches/cache_manager_rewrite/vfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/vfat005.1st URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/vfat_fr.txt URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/vfatfs.def URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/vfatfs.rc URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/vfat… Added: branches/cache_manager_rewrite/vfat/volume.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/volu…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs