Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by ion＠svn.reactos.com

grr Deleted: trunk/reactos/subsys/system/reporterror/Dk.rc Added: trunk/reactos/subsys/system/reporterror/dk.rc _____ Deleted: trunk/reactos/subsys/system/reporterror/Dk.rc --- trunk/reactos/subsys/system/reporterror/Dk.rc 2005-05-09 16:00:21 UTC (rev 15187) +++ trunk/reactos/subsys/system/reporterror/Dk.rc 2005-05-09 19:05:41 UTC (rev 15188) @@ -1,54 +0,0 @@ -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Systemet er blev genoprettet fra en fejl.", -1, 115, 15, 160, 24 - LTEXT "Ïnsker du at indsende en fejl rapport til ReactOS Projektet?", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Beskriv venligst hvad du pr°vede at g°re inden fejlen opstod.\n\nKlik pÕ 'Nµste' for at indsende rapporten til ReactOS Projektet eller 'Fortryd' for ikke at indsende nogle informationer.",-1,10,0,225,40 - LTEXT "Din e-mail adresse (valgfri):",-1,10,40,120,20 - EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 - LTEXT "Beskrivelse af problemet (valgfri):",-1,10,55,120,20 - EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL -END - -IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 - CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 -END - -IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Fejl Meddeler Assistenten" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Din fejl rapport blev vellykket indsendt til ReactOS Projektet. Mange Tak.",-1,25,5,225,20 -END - -STRINGTABLE -BEGIN - IDS_WIZARD_NAME "Rapporterings Fejl ved indsendelse til ReactOS Projektet" - IDS_FAILED_TO_CONTACT_SERVER "Systemet var ikke i stand til at kontakte Fejl Rapportings Serveren.\nVµr venlig at sikre dig at dit system er forbundet til Internettet." - IDS_FAILED_TO_DELIVER_ERROR_REPORT "Systemet var ikke i stand til at levere Fejl Rapporten." -END - -STRINGTABLE -BEGIN - IDS_CONTACTING_SERVER "Kontakter Fejl Rapporterings Serveren Vent Venligst..." - IDS_FAILED_TO_INITIALIZE_WINSOCK "Fejl opstod da man fors°gte at initialisere Winsock 2.0 (Reactos Fejl Kode %d)" - IDS_FAILED_TO_LOCATE_SERVER "Kunne ikke komme i kontakt med Fejl Rapportings Serveren. Pr°v Venligst igen Senere.." -END - _____ Copied: trunk/reactos/subsys/system/reporterror/dk.rc (from rev 15070, trunk/reactos/subsys/system/reporterror/Dk.rc)

19 years, 4 months

[navaraf] 15187: tinus <o112w8r02@sneakemail.com>

by navaraf＠svn.reactos.com

tinus <o112w8r02(a)sneakemail.com> Use ExFreePool instead of RtlFreeUnicodeString. Modified: trunk/reactos/drivers/fs/cdfs/close.c Modified: trunk/reactos/drivers/fs/cdfs/create.c _____ Modified: trunk/reactos/drivers/fs/cdfs/close.c --- trunk/reactos/drivers/fs/cdfs/close.c 2005-05-09 12:32:10 UTC (rev 15186) +++ trunk/reactos/drivers/fs/cdfs/close.c 2005-05-09 16:00:21 UTC (rev 15187) @@ -69,7 +69,10 @@ CdfsReleaseFCB(DeviceExt, FileObject->FsContext); } - RtlFreeUnicodeString(&Ccb->DirectorySearchPattern); + if (Ccb->DirectorySearchPattern.Buffer) + { + ExFreePool(Ccb->DirectorySearchPattern.Buffer); + } ExFreePool(Ccb); return(STATUS_SUCCESS); _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-05-09 12:32:10 UTC (rev 15186) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-05-09 16:00:21 UTC (rev 15187) @@ -183,8 +183,8 @@ Fcb, FileObject); - if (FileName == &AbsFileName) - RtlFreeUnicodeString(&AbsFileName); + if ((FileName == &AbsFileName) && AbsFileName.Buffer) + ExFreePool(AbsFileName.Buffer); return Status; }

19 years, 4 months

[greatlrd] 15186: Remove ntvdmpat.exe it is not need any longe it was for djgpp

by greatlrd＠svn.reactos.com

Remove ntvdmpat.exe it is not need any longe it was for djgpp Deleted: trunk/reactos/boot/freeldr/ntvdmpat.exe _____ Deleted: trunk/reactos/boot/freeldr/ntvdmpat.exe (Binary files differ)

19 years, 4 months

[sedwards] 15185: strip the whitespace one more time

by sedwards＠svn.reactos.com

strip the whitespace one more time Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 11:02:48 UTC (rev 15184) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 11:03:44 UTC (rev 15185) @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/file.c * PURPOSE: I/O File Object & NT File Handle Access/Managment of Files. - * + * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) */ @@ -30,8 +30,8 @@ /* INTERNAL FUNCTIONS ********************************************************/ -static -NTSTATUS +static +NTSTATUS STDCALL IopLockFileCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -45,16 +45,16 @@ /* * NAME INTERNAL * IopCreateFile - * + * * DESCRIPTION - * + * * ARGUMENTS - * + * * RETURN VALUE * * REVISIONS */ -NTSTATUS +NTSTATUS STDCALL IopCreateFile(PVOID ObjectBody, PVOID Parent, @@ -180,7 +180,7 @@ return(STATUS_SUCCESS); } -VOID +VOID STDCALL IopDeleteFile(PVOID ObjectBody) { @@ -190,11 +190,11 @@ NTSTATUS Status; KEVENT Event; PDEVICE_OBJECT DeviceObject; - + DPRINT("IopDeleteFile()\n"); if (FileObject->DeviceObject) - { + { /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -204,46 +204,46 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Clear and set up Events */ KeClearEvent(&FileObject->Event); KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - + /* Allocate an IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set it up */ Irp->UserEvent = &Event; Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; - + /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_CLOSE; StackPtr->DeviceObject = DeviceObject; StackPtr->FileObject = FileObject; - + /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); - + /* Wait for completion */ if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } IoFreeIrp(Irp); - + } - /* Clear the file name */ + /* Clear the file name */ if (FileObject->FileName.Buffer) { ExFreePool(FileObject->FileName.Buffer); FileObject->FileName.Buffer = NULL; } - + /* Free the completion context */ if (FileObject->CompletionContext) { @@ -292,7 +292,7 @@ /* Get the Device Object */ DPRINT1("here\n"); DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); - + /* Assign the Security Descriptor */ DeviceObject->SecurityDescriptor = SecurityDescriptor; } @@ -302,7 +302,7 @@ { MajorFunction = IRP_MJ_SET_SECURITY; DPRINT("Set security descriptor\n"); - + /* If this is a direct open, we can set it */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -310,11 +310,11 @@ return STATUS_SUCCESS; } } - + /* Get the Device Object */ DPRINT1("FileObject: %p\n", FileObject); DeviceObject = IoGetRelatedDeviceObject(FileObject); - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -327,10 +327,10 @@ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } - + /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = ExGetPreviousMode(); @@ -338,7 +338,7 @@ Irp->UserEvent = (LocalEvent) ? &Event : NULL; Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - + /* Set Stack Parameters */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; @@ -355,32 +355,32 @@ StackPtr->Parameters.SetSecurity.SecurityInformation = SecurityInformation; StackPtr->Parameters.SetSecurity.SecurityDescriptor = SecurityDescriptor; } - + /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); - + if (Status == STATUS_PENDING) { if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = IoStatusBlock.Status; } else { KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } } - + /* This Driver doesn't implement Security, so try to give it a default */ if (Status == STATUS_INVALID_DEVICE_REQUEST) { @@ -472,7 +472,7 @@ return Status; } -VOID +VOID STDCALL IopCloseFile(PVOID ObjectBody, ULONG HandleCount) @@ -483,9 +483,9 @@ PIO_STACK_LOCATION StackPtr; NTSTATUS Status; PDEVICE_OBJECT DeviceObject; - + DPRINT("IopCloseFile()\n"); - + if (HandleCount > 1 || FileObject->DeviceObject == NULL) return; /* Check if this is a direct open or not */ @@ -497,29 +497,29 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Clear and set up Events */ KeClearEvent(&FileObject->Event); KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - + /* Allocate an IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set it up */ Irp->UserEvent = &Event; Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; - + /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_CLEANUP; StackPtr->FileObject = FileObject; - + /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); - + /* Wait for completion */ if (Status == STATUS_PENDING) { @@ -559,60 +559,60 @@ /* * NAME EXPORTED * IoCreateFile@56 - * + * * DESCRIPTION * Either causes a new file or directory to be created, or it * opens an existing file, device, directory or volume, giving * the caller a handle for the file object. This handle can be * used by subsequent calls to manipulate data within the file * or the file object's state of attributes. - * + * * ARGUMENTS * FileHandle (OUT) * Points to a variable which receives the file handle * on return; - * + * * DesiredAccess * Desired access to the file; - * + * * ObjectAttributes * Structure describing the file; - * + * * IoStatusBlock (OUT) * Receives information about the operation on return; - * + * * AllocationSize [OPTIONAL] * Initial size of the file in bytes; - * + * * FileAttributes * Attributes to create the file with; - * + * * ShareAccess * Type of shared access the caller would like to the * file; - * + * * CreateDisposition * Specifies what to do, depending on whether the * file already exists; - * + * * CreateOptions * Options for creating a new file; - * + * * EaBuffer [OPTIONAL] * Undocumented; - * + * * EaLength * Undocumented; - * + * * CreateFileType * Type of file (normal, named pipe, mailslot) to create; - * + * * ExtraCreateParameters [OPTIONAL] * Additional creation data for named pipe and mailsots; - * + * * Options * Undocumented. - * + * * RETURN VALUE * Status * @@ -620,12 +620,12 @@ * Prototype taken from Bo Branten's ntifs.h v15. * Description taken from old NtCreateFile's which is * now a wrapper of this call. - * + * * REVISIONS - * + * * @implemented */ -NTSTATUS +NTSTATUS STDCALL IoCreateFile(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, @@ -653,12 +653,12 @@ LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; - + DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", FileHandle,DesiredAccess,ObjectAttributes, ObjectAttributes->ObjectName->Buffer); - + ASSERT_IRQL(PASSIVE_LEVEL); if (IoStatusBlock == NULL || FileHandle == NULL) @@ -670,7 +670,7 @@ AccessMode = KernelMode; else AccessMode = ExGetPreviousMode(); - + if(AccessMode != KernelMode) { _SEH_TRY @@ -716,7 +716,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - + if(!NT_SUCCESS(Status)) { return Status; @@ -758,7 +758,7 @@ AccessMode, (PVOID*)&DeviceObject, NULL); - ZwClose(LocalHandle); + ZwClose(LocalHandle); if (!NT_SUCCESS(Status)) { return Status; @@ -792,9 +792,9 @@ return Status; } } - RtlMapGenericMask(&DesiredAccess, + RtlMapGenericMask(&DesiredAccess, BODY_TO_HEADER(FileObject)->ObjectType->Mapping); - + Status = ObInsertObject ((PVOID)FileObject, NULL, DesiredAccess, @@ -824,10 +824,10 @@ SecurityContext.AccessState = NULL; /* ?? */ SecurityContext.DesiredAccess = DesiredAccess; SecurityContext.FullCreateOptions = 0; /* ?? */ - + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); - + DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject->DeviceObject %x\n", FileObject->DeviceObject); /* @@ -851,7 +851,7 @@ Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; Irp->Overlay.AllocationSize = SafeAllocationSize; - + /* * Get the stack location for the new * IRP and prepare it. @@ -875,7 +875,7 @@ StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; break; - + case CreateFileTypeNamedPipe: StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; StackLoc->Parameters.CreatePipe.SecurityContext = &SecurityContext; @@ -903,7 +903,7 @@ */ Status = IofCallDriver(FileObject->DeviceObject, Irp ); DPRINT("Status :%x\n", Status); - + if (Status == STATUS_PENDING) { KeWaitForSingleObject(&FileObject->Event, @@ -976,34 +976,34 @@ /* * NAME EXPORTED * IoCreateStreamFileObject@8 - * + * * DESCRIPTION - * + * * ARGUMENTS * FileObject * ? - * + * * DeviceObject * ? - * + * * RETURN VALUE * * NOTE - * + * * REVISIONS - * + * * @implemented */ -PFILE_OBJECT +PFILE_OBJECT STDCALL IoCreateStreamFileObject(PFILE_OBJECT FileObject, PDEVICE_OBJECT DeviceObject) { PFILE_OBJECT CreatedFileObject; NTSTATUS Status; - - /* FIXME: This function should call ObInsertObject. The "Lite" version - doesnt. This function is also called from IoCreateFile for some + + /* FIXME: This function should call ObInsertObject. The "Lite" version + doesnt. This function is also called from IoCreateFile for some reason. These hacks need to be removed. */ @@ -1030,9 +1030,9 @@ /* Choose Device Object */ if (FileObject) DeviceObject = FileObject->DeviceObject; DPRINT("DeviceObject %x\n", DeviceObject); - + /* Set File Object Data */ - CreatedFileObject->DeviceObject = DeviceObject; + CreatedFileObject->DeviceObject = DeviceObject; CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; CreatedFileObject->Flags = FO_STREAM_FILE; @@ -1072,7 +1072,7 @@ /* * @implemented */ -PGENERIC_MAPPING +PGENERIC_MAPPING STDCALL IoGetFileObjectGenericMapping(VOID) { @@ -1105,7 +1105,7 @@ /* * @implemented */ -NTSTATUS +NTSTATUS STDCALL IoQueryFileInformation(IN PFILE_OBJECT FileObject, IN FILE_INFORMATION_CLASS FileInformationClass, @@ -1120,20 +1120,20 @@ BOOLEAN LocalEvent = FALSE; KEVENT Event; NTSTATUS Status; - + ASSERT(FileInformation != NULL); - + Status = ObReferenceObjectByPointer(FileObject, FILE_READ_ATTRIBUTES, IoFileObjectType, KernelMode); if (!NT_SUCCESS(Status)) return(Status); - + DPRINT("FileObject %x\n", FileObject); - + /* Get the Device Object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -1146,10 +1146,10 @@ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } - + /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = KernelMode; @@ -1158,42 +1158,42 @@ Irp->UserEvent = (LocalEvent) ? &Event : NULL; Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - + /* Set the Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; + StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; StackPtr->FileObject = FileObject; - + /* Set Parameters */ StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; StackPtr->Parameters.QueryFile.Length = Length; - + /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); - + if (Status == STATUS_PENDING) { if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = IoStatusBlock.Status; } else { KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } } - - + + /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; return Status; @@ -1214,7 +1214,7 @@ /** * @name NtCancelIoFile * - * Cancel all pending I/O operations in the current thread for specified + * Cancel all pending I/O operations in the current thread for specified * file object. * * @param FileHandle @@ -1228,7 +1228,7 @@ * * @implemented */ -NTSTATUS +NTSTATUS STDCALL NtCancelIoFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) @@ -1272,7 +1272,7 @@ /* Don't break here, we want to cancel all IRPs for the file object. */ OurIrpsInList = TRUE; } - } + } KfLowerIrql(OldIrql); @@ -1328,14 +1328,14 @@ /* * NAME EXPORTED * NtCreateFile@44 - * + * * DESCRIPTION * Entry point to call IoCreateFile with * default parameters. * * ARGUMENTS * See IoCreateFile. - * + * * RETURN VALUE * See IoCreateFile. * @@ -1345,7 +1345,7 @@ * * @implemented */ -NTSTATUS +NTSTATUS STDCALL NtCreateFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, @@ -1388,19 +1388,19 @@ IN PLARGE_INTEGER TimeOut) { MAILSLOT_CREATE_PARAMETERS Buffer; - + DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", FileHandle,DesiredAccess,ObjectAttributes, ObjectAttributes->ObjectName->Buffer); PAGED_CODE(); - + /* Check for Timeout */ if (TimeOut) { /* Enable it */ Buffer.TimeoutSpecified = TRUE; - + /* FIXME: Add SEH */ Buffer.ReadTimeout = *TimeOut; } @@ -1409,7 +1409,7 @@ /* No timeout */ Buffer.TimeoutSpecified = FALSE; } - + /* Set Settings */ Buffer.MailslotQuota = MailslotQuota; Buffer.MaximumMessageSize = MaxMessageSize; @@ -1461,7 +1461,7 @@ { /* Enable it */ Buffer.TimeoutSpecified = TRUE; - + /* FIXME: Add SEH */ Buffer.DefaultTimeout = *DefaultTimeout; } @@ -1470,7 +1470,7 @@ /* No timeout */ Buffer.TimeoutSpecified = FALSE; } - + /* Set Settings */ Buffer.NamedPipeType = NamedPipeType; Buffer.ReadMode = ReadMode; @@ -1499,9 +1499,9 @@ /* * NAME EXPORTED * NtDeleteFile@4 - * + * * DESCRIPTION - * + * * ARGUMENTS * ObjectAttributes * ? @@ -1509,10 +1509,10 @@ * RETURN VALUE * * REVISIONS - * + * * @unimplemented */ -NTSTATUS +NTSTATUS STDCALL NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { @@ -1532,10 +1532,10 @@ * FUNCTION: Flushes cached file data to disk * ARGUMENTS: * FileHandle = Points to the file - * IoStatusBlock = Caller must supply storage to receive the result of + * IoStatusBlock = Caller must supply storage to receive the result of * the flush buffers operation. The information field is * set to number of bytes flushed to disk. - * RETURNS: Status + * RETURNS: Status * REMARKS: This function maps to the win32 FlushFileBuffers */ NTSTATUS @@ -1570,7 +1570,7 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -1590,7 +1590,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->RequestorMode = PreviousMode; @@ -1603,26 +1603,26 @@ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_FLUSH_BUFFERS; StackPtr->FileObject = FileObject; - + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = IoStatusBlock->Status; } else { KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } @@ -1638,9 +1638,9 @@ NTSTATUS STDCALL NtNotifyChangeDirectoryFile(IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, IN ULONG BufferSize, @@ -1653,13 +1653,13 @@ PIO_STACK_LOCATION IoStack; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; - + DPRINT("NtNotifyChangeDirectoryFile()\n"); - + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); - + if(PreviousMode != KernelMode) { _SEH_TRY @@ -1679,7 +1679,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - + if(!NT_SUCCESS(Status)) { return Status; @@ -1693,18 +1693,18 @@ (PVOID *)&FileObject, NULL); if (Status != STATUS_SUCCESS) return(Status); - - + + DeviceObject = FileObject->DeviceObject; - - + + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); if (Irp==NULL) { ObDereferenceObject(FileObject); return STATUS_UNSUCCESSFUL; } - + if (Event == NULL) { Event = &FileObject->Event; @@ -1720,16 +1720,16 @@ Irp->UserBuffer = Buffer; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - + IoStack = IoGetNextIrpStackLocation(Irp); - + IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY; IoStack->Flags = 0; IoStack->Control = 0; IoStack->DeviceObject = DeviceObject; IoStack->FileObject = FileObject; - + if (WatchTree) { IoStack->Flags = SL_WATCH_TREE; @@ -1737,7 +1737,7 @@ IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter; IoStack->Parameters.NotifyDirectory.Length = BufferSize; - + Status = IoCallDriver(FileObject->DeviceObject,Irp); /* FIXME: Should we wait here or not for synchronously opened files? */ @@ -1908,39 +1908,39 @@ /* * 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 +NTSTATUS STDCALL NtOpenFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, @@ -1966,7 +1966,7 @@ 0); } -NTSTATUS +NTSTATUS STDCALL NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) @@ -2021,10 +2021,10 @@ * FileBothDirectoryInformation FILE_BOTH_DIR_INFORMATION * * Length = Size of the storage supplied - * FileInformationClass = Indicates the type of information requested. - * ReturnSingleEntry = Specify true if caller only requests the first + * FileInformationClass = Indicates the type of information requested. + * ReturnSingleEntry = Specify true if caller only requests the first * directory found. - * FileName = Initial directory name to query, that may contain wild + * FileName = Initial directory name to query, that may contain wild * cards. * RestartScan = Number of times the action should be repeated * RETURNS: Status [ STATUS_SUCCESS, STATUS_ACCESS_DENIED, STATUS_INSUFFICIENT_RESOURCES, @@ -2032,7 +2032,7 @@ * STATUS_INVALID_INFO_CLASS, STATUS_NO_SUCH_FILE, STATUS_NO_MORE_FILES ] */ NTSTATUS -STDCALL +STDCALL NtQueryDirectoryFile(IN HANDLE FileHandle, [truncated at 1000 lines; 431 more skipped]

19 years, 4 months

[sedwards] 15184: correct typo in header to fix the build

by sedwards＠svn.reactos.com

correct typo in header to fix the build Modified: trunk/reactos/include/ddk/iodef.h _____ Modified: trunk/reactos/include/ddk/iodef.h --- trunk/reactos/include/ddk/iodef.h 2005-05-09 10:06:58 UTC (rev 15183) +++ trunk/reactos/include/ddk/iodef.h 2005-05-09 11:02:48 UTC (rev 15184) @@ -141,7 +141,7 @@ #define SL_KEY_SPECIFIED (0x1) #define SL_OVERRIDE_VERIFY_VOLUME (0x2) -#define SL_WRITE_THROUGHT (0x4) +#define SL_WRITE_THROUGH (0x4) #define SL_FT_SEQUENTIAL_WRITE (0x8) #define SL_FAIL_IMMEDIATELY (0x1)

19 years, 4 months

[greatlrd] 15183: update swedish translation by Harteex

by greatlrd＠svn.reactos.com

update swedish translation by Harteex Modified: trunk/reactos/subsys/system/taskmgr/Sv.rc _____ Modified: trunk/reactos/subsys/system/taskmgr/Sv.rc --- trunk/reactos/subsys/system/taskmgr/Sv.rc 2005-05-09 09:52:48 UTC (rev 15182) +++ trunk/reactos/subsys/system/taskmgr/Sv.rc 2005-05-09 10:06:58 UTC (rev 15183) @@ -681,6 +681,8 @@ IDS_STATUS_MEMUSAGE "Minnesanv: %dK / %dK" IDS_STATUS_CPUUSAGE "Processoranv: %3d%%" IDS_STATUS_PROCESSES "Processer: %d" + IDS_Not_Responding "Svarar inte" + IDS_Running "IgÕng" END

19 years, 4 months

[ion] 15175: Fix NtWriteFile: Get right Deviceobject, Use FileObject->FinalStatus, use FileObject-.CurrentByteOffset if ByteOffset == FILE_USER_FILE_POINTER_POSITION, add SEH, use right event requested access, set IRP_WRITE_OPERATION flag, add support for IRP_NOCACHE and add support for SL_WRITE_THROUGH if FO_WRITE_THROUGH is enabled.

by ion＠svn.reactos.com

Fix NtWriteFile: Get right Deviceobject, Use FileObject->FinalStatus, use FileObject-.CurrentByteOffset if ByteOffset == FILE_USER_FILE_POINTER_POSITION, add SEH, use right event requested access, set IRP_WRITE_OPERATION flag, add support for IRP_NOCACHE and add support for SL_WRITE_THROUGH if FO_WRITE_THROUGH is enabled. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 02:04:53 UTC (rev 15174) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 02:15:03 UTC (rev 15175) @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/file.c * PURPOSE: I/O File Object & NT File Handle Access/Managment of Files. - * + * * PROGRAMMERS: David Welch (welch(a)mcmail.com) */ @@ -23,8 +23,8 @@ /* INTERNAL FUNCTIONS ********************************************************/ -static -NTSTATUS +static +NTSTATUS STDCALL IopLockFileCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -38,16 +38,16 @@ /* * NAME INTERNAL * IopCreateFile - * + * * DESCRIPTION - * + * * ARGUMENTS - * + * * RETURN VALUE * * REVISIONS */ -NTSTATUS +NTSTATUS STDCALL IopCreateFile(PVOID ObjectBody, PVOID Parent, @@ -173,7 +173,7 @@ return(STATUS_SUCCESS); } -VOID +VOID STDCALL IopDeleteFile(PVOID ObjectBody) { @@ -183,11 +183,11 @@ NTSTATUS Status; KEVENT Event; PDEVICE_OBJECT DeviceObject; - + DPRINT("IopDeleteFile()\n"); if (FileObject->DeviceObject) - { + { /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -197,46 +197,46 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Clear and set up Events */ KeClearEvent(&FileObject->Event); KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - + /* Allocate an IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set it up */ Irp->UserEvent = &Event; Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; - + /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_CLOSE; StackPtr->DeviceObject = DeviceObject; StackPtr->FileObject = FileObject; - + /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); - + /* Wait for completion */ if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } IoFreeIrp(Irp); - + } - /* Clear the file name */ + /* Clear the file name */ if (FileObject->FileName.Buffer) { ExFreePool(FileObject->FileName.Buffer); FileObject->FileName.Buffer = NULL; } - + /* Free the completion context */ if (FileObject->CompletionContext) { @@ -245,7 +245,7 @@ } } -static +static NTSTATUS IopSetDefaultSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -489,7 +489,7 @@ return Status; } -VOID +VOID STDCALL IopCloseFile(PVOID ObjectBody, ULONG HandleCount) @@ -500,9 +500,9 @@ PIO_STACK_LOCATION StackPtr; NTSTATUS Status; PDEVICE_OBJECT DeviceObject; - + DPRINT("IopCloseFile()\n"); - + if (HandleCount > 1 || FileObject->DeviceObject == NULL) return; /* Check if this is a direct open or not */ @@ -514,29 +514,29 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Clear and set up Events */ KeClearEvent(&FileObject->Event); KeInitializeEvent(&Event, SynchronizationEvent, FALSE); - + /* Allocate an IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set it up */ Irp->UserEvent = &Event; Irp->UserIosb = &Irp->IoStatus; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API; - + /* Set up Stack Pointer Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_CLEANUP; StackPtr->FileObject = FileObject; - + /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); - + /* Wait for completion */ if (Status == STATUS_PENDING) { @@ -576,60 +576,60 @@ /* * NAME EXPORTED * IoCreateFile@56 - * + * * DESCRIPTION * Either causes a new file or directory to be created, or it * opens an existing file, device, directory or volume, giving * the caller a handle for the file object. This handle can be * used by subsequent calls to manipulate data within the file * or the file object's state of attributes. - * + * * ARGUMENTS * FileHandle (OUT) * Points to a variable which receives the file handle * on return; - * + * * DesiredAccess * Desired access to the file; - * + * * ObjectAttributes * Structure describing the file; - * + * * IoStatusBlock (OUT) * Receives information about the operation on return; - * + * * AllocationSize [OPTIONAL] * Initial size of the file in bytes; - * + * * FileAttributes * Attributes to create the file with; - * + * * ShareAccess * Type of shared access the caller would like to the * file; - * + * * CreateDisposition * Specifies what to do, depending on whether the * file already exists; - * + * * CreateOptions * Options for creating a new file; - * + * * EaBuffer [OPTIONAL] * Undocumented; - * + * * EaLength * Undocumented; - * + * * CreateFileType * Type of file (normal, named pipe, mailslot) to create; - * + * * ExtraCreateParameters [OPTIONAL] * Additional creation data for named pipe and mailsots; - * + * * Options * Undocumented. - * + * * RETURN VALUE * Status * @@ -637,12 +637,12 @@ * Prototype taken from Bo Branten's ntifs.h v15. * Description taken from old NtCreateFile's which is * now a wrapper of this call. - * + * * REVISIONS - * + * * @implemented */ -NTSTATUS +NTSTATUS STDCALL IoCreateFile(OUT PHANDLE FileHandle, IN ACCESS_MASK DesiredAccess, @@ -670,12 +670,12 @@ LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; - + DPRINT("IoCreateFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", FileHandle,DesiredAccess,ObjectAttributes, ObjectAttributes->ObjectName->Buffer); - + ASSERT_IRQL(PASSIVE_LEVEL); if (IoStatusBlock == NULL || FileHandle == NULL) @@ -687,7 +687,7 @@ AccessMode = KernelMode; else AccessMode = ExGetPreviousMode(); - + if(AccessMode != KernelMode) { _SEH_TRY @@ -733,7 +733,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - + if(!NT_SUCCESS(Status)) { return Status; @@ -775,7 +775,7 @@ AccessMode, (PVOID*)&DeviceObject, NULL); - ZwClose(LocalHandle); + ZwClose(LocalHandle); if (!NT_SUCCESS(Status)) { return Status; @@ -808,9 +808,9 @@ return Status; } } - RtlMapGenericMask(&DesiredAccess, + RtlMapGenericMask(&DesiredAccess, BODY_TO_HEADER(FileObject)->ObjectType->Mapping); - + Status = ObInsertObject ((PVOID)FileObject, NULL, DesiredAccess, @@ -840,10 +840,10 @@ SecurityContext.AccessState = NULL; /* ?? */ SecurityContext.DesiredAccess = DesiredAccess; SecurityContext.FullCreateOptions = 0; /* ?? */ - + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); - + DPRINT("FileObject %x\n", FileObject); DPRINT("FileObject->DeviceObject %x\n", FileObject->DeviceObject); /* @@ -867,7 +867,7 @@ Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserEvent = &FileObject->Event; Irp->Overlay.AllocationSize = SafeAllocationSize; - + /* * Get the stack location for the new * IRP and prepare it. @@ -891,7 +891,7 @@ StackLoc->Parameters.Create.ShareAccess = (USHORT)ShareAccess; StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; break; - + case CreateFileTypeNamedPipe: StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; StackLoc->Parameters.CreatePipe.SecurityContext = &SecurityContext; @@ -919,7 +919,7 @@ */ Status = IofCallDriver(FileObject->DeviceObject, Irp ); DPRINT("Status :%x\n", Status); - + if (Status == STATUS_PENDING) { KeWaitForSingleObject(&FileObject->Event, @@ -992,25 +992,25 @@ /* * NAME EXPORTED * IoCreateStreamFileObject@8 - * + * * DESCRIPTION - * + * * ARGUMENTS * FileObject * ? - * + * * DeviceObject * ? - * + * * RETURN VALUE * * NOTE - * + * * REVISIONS - * + * * @implemented */ -PFILE_OBJECT +PFILE_OBJECT STDCALL IoCreateStreamFileObject(PFILE_OBJECT FileObject, PDEVICE_OBJECT DeviceObject) @@ -1046,14 +1046,14 @@ DPRINT("DeviceObject %x\n", DeviceObject); - if (DeviceObject->Vpb && + if (DeviceObject->Vpb && DeviceObject->Vpb->DeviceObject) { CreatedFileObject->DeviceObject = DeviceObject->Vpb->DeviceObject; } else { - CreatedFileObject->DeviceObject = DeviceObject; + CreatedFileObject->DeviceObject = DeviceObject; } CreatedFileObject->Vpb = DeviceObject->Vpb; CreatedFileObject->Type = IO_TYPE_FILE; @@ -1093,7 +1093,7 @@ /* * @implemented */ -PGENERIC_MAPPING +PGENERIC_MAPPING STDCALL IoGetFileObjectGenericMapping(VOID) { @@ -1126,7 +1126,7 @@ /* * @implemented */ -NTSTATUS +NTSTATUS STDCALL IoQueryFileInformation(IN PFILE_OBJECT FileObject, IN FILE_INFORMATION_CLASS FileInformationClass, @@ -1141,20 +1141,20 @@ BOOLEAN LocalEvent = FALSE; KEVENT Event; NTSTATUS Status; - + ASSERT(FileInformation != NULL); - + Status = ObReferenceObjectByPointer(FileObject, FILE_READ_ATTRIBUTES, IoFileObjectType, KernelMode); if (!NT_SUCCESS(Status)) return(Status); - + DPRINT("FileObject %x\n", FileObject); - + /* Get the Device Object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -1167,10 +1167,10 @@ KeInitializeEvent(&Event, SynchronizationEvent, FALSE); LocalEvent = TRUE; } - + /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - + /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = KernelMode; @@ -1179,42 +1179,42 @@ Irp->UserEvent = (LocalEvent) ? &Event : NULL; Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - + /* Set the Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; + StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; StackPtr->FileObject = FileObject; - + /* Set Parameters */ StackPtr->Parameters.QueryFile.FileInformationClass = FileInformationClass; StackPtr->Parameters.QueryFile.Length = Length; - + /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); - + if (Status == STATUS_PENDING) { if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = IoStatusBlock.Status; } else { KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } } - - + + /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; return Status; @@ -1235,7 +1235,7 @@ /** * @name NtCancelIoFile * - * Cancel all pending I/O operations in the current thread for specified + * Cancel all pending I/O operations in the current thread for specified * file object. * * @param FileHandle @@ -1249,7 +1249,7 @@ * * @implemented */ -NTSTATUS +NTSTATUS STDCALL NtCancelIoFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) @@ -1293,7 +1293,7 @@ /* Don't break here, we want to cancel all IRPs for the file object. */ OurIrpsInList = TRUE; } - } + } KfLowerIrql(OldIrql); @@ -1349,14 +1349,14 @@ /* * NAME EXPORTED * NtCreateFile@44 - * + * * DESCRIPTION * Entry point to call IoCreateFile with * default parameters. * * ARGUMENTS * See IoCreateFile. - * + * * RETURN VALUE * See IoCreateFile. * @@ -1366,7 +1366,7 @@ * * @implemented */ -NTSTATUS +NTSTATUS STDCALL NtCreateFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, @@ -1409,14 +1409,14 @@ IN PLARGE_INTEGER TimeOut) { MAILSLOT_CREATE_PARAMETERS Buffer; - + DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", FileHandle,DesiredAccess,ObjectAttributes, ObjectAttributes->ObjectName->Buffer); - + ASSERT_IRQL(PASSIVE_LEVEL); - + if (TimeOut != NULL) { Buffer.ReadTimeout.QuadPart = TimeOut->QuadPart; @@ -1506,9 +1506,9 @@ /* * NAME EXPORTED * NtDeleteFile@4 - * + * * DESCRIPTION - * + * * ARGUMENTS * ObjectAttributes * ? @@ -1516,10 +1516,10 @@ * RETURN VALUE * * REVISIONS - * + * * @unimplemented */ -NTSTATUS +NTSTATUS STDCALL NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { @@ -1539,10 +1539,10 @@ * FUNCTION: Flushes cached file data to disk * ARGUMENTS: * FileHandle = Points to the file - * IoStatusBlock = Caller must supply storage to receive the result of + * IoStatusBlock = Caller must supply storage to receive the result of * the flush buffers operation. The information field is * set to number of bytes flushed to disk. - * RETURNS: Status + * RETURNS: Status * REMARKS: This function maps to the win32 FlushFileBuffers */ NTSTATUS @@ -1577,7 +1577,7 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -1597,7 +1597,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; Irp->RequestorMode = PreviousMode; @@ -1610,26 +1610,26 @@ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->MajorFunction = IRP_MJ_FLUSH_BUFFERS; StackPtr->FileObject = FileObject; - + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { if (LocalEvent) { - KeWaitForSingleObject(&Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = IoStatusBlock->Status; } else { KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } @@ -1645,9 +1645,9 @@ NTSTATUS STDCALL NtNotifyChangeDirectoryFile(IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, IN ULONG BufferSize, @@ -1660,13 +1660,13 @@ PIO_STACK_LOCATION IoStack; KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; - + DPRINT("NtNotifyChangeDirectoryFile()\n"); - + PAGED_CODE(); PreviousMode = ExGetPreviousMode(); - + if(PreviousMode != KernelMode) { _SEH_TRY @@ -1686,7 +1686,7 @@ Status = _SEH_GetExceptionCode(); } _SEH_END; - + if(!NT_SUCCESS(Status)) { return Status; @@ -1700,18 +1700,18 @@ (PVOID *)&FileObject, NULL); if (Status != STATUS_SUCCESS) return(Status); - - + + DeviceObject = FileObject->DeviceObject; - - + + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); if (Irp==NULL) { ObDereferenceObject(FileObject); return STATUS_UNSUCCESSFUL; } - + if (Event == NULL) { Event = &FileObject->Event; @@ -1727,16 +1727,16 @@ Irp->UserBuffer = Buffer; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - + IoStack = IoGetNextIrpStackLocation(Irp); - + IoStack->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; IoStack->MinorFunction = IRP_MN_NOTIFY_CHANGE_DIRECTORY; IoStack->Flags = 0; IoStack->Control = 0; IoStack->DeviceObject = DeviceObject; IoStack->FileObject = FileObject; - + if (WatchTree) { IoStack->Flags = SL_WATCH_TREE; @@ -1744,7 +1744,7 @@ IoStack->Parameters.NotifyDirectory.CompletionFilter = CompletionFilter; IoStack->Parameters.NotifyDirectory.Length = BufferSize; - + Status = IoCallDriver(FileObject->DeviceObject,Irp); /* FIXME: Should we wait here or not for synchronously opened files? */ @@ -1915,39 +1915,39 @@ /* * 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 +NTSTATUS STDCALL NtOpenFile(PHANDLE FileHandle, ACCESS_MASK DesiredAccess, @@ -1973,7 +1973,7 @@ 0); } -NTSTATUS +NTSTATUS STDCALL NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) @@ -2028,10 +2028,10 @@ * FileBothDirectoryInformation FILE_BOTH_DIR_INFORMATION * * Length = Size of the storage supplied - * FileInformationClass = Indicates the type of information requested. - * ReturnSingleEntry = Specify true if caller only requests the first + * FileInformationClass = Indicates the type of information requested. + * ReturnSingleEntry = Specify true if caller only requests the first * directory found. - * FileName = Initial directory name to query, that may contain wild + * FileName = Initial directory name to query, that may contain wild * cards. * RestartScan = Number of times the action should be repeated * RETURNS: Status [ STATUS_SUCCESS, STATUS_ACCESS_DENIED, STATUS_INSUFFICIENT_RESOURCES, @@ -2039,7 +2039,7 @@ * STATUS_INVALID_INFO_CLASS, STATUS_NO_SUCH_FILE, STATUS_NO_MORE_FILES ] */ NTSTATUS -STDCALL +STDCALL NtQueryDirectoryFile(IN HANDLE FileHandle, IN HANDLE PEvent OPTIONAL, IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, @@ -2060,10 +2060,10 @@ NTSTATUS Status = STATUS_SUCCESS; BOOLEAN LocalEvent = FALSE; PKEVENT Event = NULL; - + DPRINT("NtQueryDirectoryFile()\n"); PAGED_CODE(); - + /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { @@ -2093,7 +2093,7 @@ (PVOID *)&FileObject, NULL); if (Status != STATUS_SUCCESS) return(Status); - + /* Get Event Object */ if (PEvent) { @@ -2116,7 +2116,7 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -2127,14 +2127,14 @@ { LocalEvent = TRUE; } - + /* Allocate the IRP */ if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE))) { ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Set up the IRP */ Irp->RequestorMode = PreviousMode; Irp->UserIosb = IoStatusBlock; @@ -2144,13 +2144,13 @@ Irp->UserBuffer = FileInformation; Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine; Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext; - + /* Set up Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; StackPtr->MajorFunction = IRP_MJ_DIRECTORY_CONTROL; StackPtr->MinorFunction = IRP_MN_QUERY_DIRECTORY; - + /* Set Parameters */ StackPtr->Parameters.QueryDirectory.FileInformationClass = FileInformationClass; StackPtr->Parameters.QueryDirectory.FileName = FileName; @@ -2159,7 +2159,7 @@ StackPtr->Flags = 0; if (RestartScan) StackPtr->Flags = SL_RESTART_SCAN; if (ReturnSingleEntry) StackPtr->Flags |= SL_RETURN_SINGLE_ENTRY; - + /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) @@ -2167,9 +2167,9 @@ if (!LocalEvent) { KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, NULL); Status = FileObject->FinalStatus; } @@ -2197,7 +2197,7 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS +NTSTATUS STDCALL NtQueryFullAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation) @@ -2302,7 +2302,7 @@ } DPRINT("FileObject %x\n", FileObject); - + /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -2312,7 +2312,7 @@ { DeviceObject = IoGetRelatedDeviceObject(FileObject); } - + /* Check if we should use Sync IO or not */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { @@ -2332,10 +2332,10 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - + /* Allocate the System Buffer */ - if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, + if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, TAG_SYSB))) [truncated at 1000 lines; 487 more skipped]

19 years, 4 months

[greatlrd] 15182: Fix spellinng error in En.rc

by greatlrd＠svn.reactos.com

Fix spellinng error in En.rc STRING_DIR_HELP8 it should not be "Dirs" it must be "Files" then it was a "command" wrong spelling in one place Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 08:43:05 UTC (rev 15181) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 09:52:48 UTC (rev 15182) @@ -198,7 +198,7 @@ STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" STRING_DIR_HELP7, "\n Directory of %s\n\n" -STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n" +STRING_DIR_HELP8, "%16i File(s)% 14s bytes\n" STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ changes to the specified directory.\n\n\ @@ -237,7 +237,7 @@ (set) Specifies a set of one or more files. Wildcards may be used.\n\ command Specifies the command to carry out for each file.\n\ parameters Specifies parameters or switches for the specified command.\n\n\ -To use the FOR comamnd in a batch program, specify %%variable instead of\n\ +To use the FOR command in a batch program, specify %%variable instead of\n\ %variable." STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\

19 years, 4 months

[greatlrd] 15181: remove doublecate string STRING_CHCP_ERROR2 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT

by greatlrd＠svn.reactos.com

remove doublecate string STRING_CHCP_ERROR2 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT Fr.rc and En.rc STRING_CHCP_ERROR2 been remove Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 08:23:18 UTC (rev 15180) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 08:43:05 UTC (rev 15181) @@ -496,7 +496,6 @@ STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\n" -STRING_CHCP_ERROR2, "Invalid parameter format - %s\n" STRING_CHCP_ERROR4, "Invalid code page\n" STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" _____ Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 08:23:18 UTC (rev 15180) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 08:43:05 UTC (rev 15181) @@ -507,7 +507,6 @@ STRING_ALIAS_ERROR, "Ligne de commande trop longue aprÞs remplacement de l'alias!\n" STRING_BATCH_ERROR, "Erreur Ó l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" -STRING_CHCP_ERROR2, "Format de paramÞtre invalide - %s\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramÞtre incorrect - %s\n" STRING_CHCP_ERROR4, "Page de code invalide \n" STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 08:23:18 UTC (rev 15180) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 08:43:05 UTC (rev 15181) @@ -46,7 +46,7 @@ if (args >= 2) { /* too many parameters */ - LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR2, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 08:23:18 UTC (rev 15180) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 08:43:05 UTC (rev 15181) @@ -23,7 +23,6 @@ #define STRING_ALIAS_ERROR 300 #define STRING_BATCH_ERROR 301 #define STRING_CHCP_ERROR1 302 -#define STRING_CHCP_ERROR2 303 #define STRING_CHCP_ERROR4 305 #define STRING_CHOICE_ERROR 306 #define STRING_CHOICE_ERROR_TXT 307

19 years, 4 months

[greatlrd] 15180: remove doublecate string STRING_CHCP_ERROR3 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT

by greatlrd＠svn.reactos.com

remove doublecate string STRING_CHCP_ERROR3 and replace it with STRING_ERROR_INVALID_PARAM_FORMAT Fr.rc change STRING_CHCP_ERROR3 to STRING_ERROR_INVALID_PARAM_FORMAT En.rc STRING_CHCP_ERROR3 been remove Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-09 08:23:18 UTC (rev 15180) @@ -497,7 +497,6 @@ STRING_BATCH_ERROR, "Error opening batch file\n" STRING_CHCP_ERROR1, "Active code page: %u\n" STRING_CHCP_ERROR2, "Invalid parameter format - %s\n" -STRING_CHCP_ERROR3, "Parameter format incorrect - %s\n" STRING_CHCP_ERROR4, "Invalid code page\n" STRING_CHOICE_ERROR, "Invalid option. Expected format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Invalid option. Expected format: /T[:]c,nn" _____ Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-05-09 08:23:18 UTC (rev 15180) @@ -508,7 +508,7 @@ STRING_BATCH_ERROR, "Erreur Ó l'ouverture du fichier batch\n" STRING_CHCP_ERROR1, "Page de codes actuelle : %u\n" STRING_CHCP_ERROR2, "Format de paramÞtre invalide - %s\n" -STRING_CHCP_ERROR3, "Format de paramÞtre incorrect - %s\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Format de paramÞtre incorrect - %s\n" STRING_CHCP_ERROR4, "Page de code invalide \n" STRING_CHOICE_ERROR, "Option invalide. Format attendu: /C[:]options" STRING_CHOICE_ERROR_TXT, "Option invalide. Format attendu: /T[:]c,nn" _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-05-09 08:23:18 UTC (rev 15180) @@ -55,7 +55,7 @@ if (uNewCodePage == 0) { - LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR3, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, arg[0]); freep (arg); return 1; _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 06:14:54 UTC (rev 15179) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-09 08:23:18 UTC (rev 15180) @@ -24,7 +24,6 @@ #define STRING_BATCH_ERROR 301 #define STRING_CHCP_ERROR1 302 #define STRING_CHCP_ERROR2 303 -#define STRING_CHCP_ERROR3 304 #define STRING_CHCP_ERROR4 305 #define STRING_CHOICE_ERROR 306 #define STRING_CHOICE_ERROR_TXT 307

19 years, 4 months

← Newer
1
...
50
51
52
53
54
55
56
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005