Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[greatlrd] 15179: wrong string where being use when you type echo

by greatlrd＠svn.reactos.com

wrong string where being use when you type echo thx David Nordenberg for notify me about it Modified: trunk/reactos/subsys/system/cmd/echo.c _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-05-09 04:31:04 UTC (rev 15178) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-05-09 06:14:54 UTC (rev 15179) @@ -61,7 +61,7 @@ ConOutPuts (param); else { - LoadString(CMD_ModuleHandle, STRING_ECHO_HELP4, szMsg, RC_STRING_MAX_SIZE); + LoadString(CMD_ModuleHandle, STRING_ECHO_HELP5, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, bEcho ? D_ON : D_OFF); } }

19 years, 4 months

[ion] 15178: Make the remaning code match the current formatting instead of being really ugly, and make some changes to IoCreateFileStreamObject (which is wrong anyways, since it's doing what *Lite should do)

by ion＠svn.reactos.com

Make the remaning code match the current formatting instead of being really ugly, and make some changes to IoCreateFileStreamObject (which is wrong anyways, since it's doing what *Lite should do) Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 03:58:35 UTC (rev 15177) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 04:31:04 UTC (rev 15178) @@ -4,7 +4,8 @@ * FILE: ntoskrnl/io/file.c * PURPOSE: I/O File Object & NT File Handle Access/Managment of Files. * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * David Welch (welch(a)mcmail.com) */ /* INCLUDES *****************************************************************/ @@ -767,6 +768,7 @@ ObDereferenceObject (DeviceObject); return STATUS_OBJECT_NAME_COLLISION; } + /* FIXME: wt... */ FileObject = IoCreateStreamFileObject(NULL, DeviceObject); ObDereferenceObject (DeviceObject); } @@ -997,55 +999,50 @@ IoCreateStreamFileObject(PFILE_OBJECT FileObject, PDEVICE_OBJECT DeviceObject) { - PFILE_OBJECT CreatedFileObject; - NTSTATUS Status; + PFILE_OBJECT CreatedFileObject; + NTSTATUS Status; + + /* 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. + */ - DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n", - FileObject, DeviceObject); + DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n", + FileObject, DeviceObject); + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); - - Status = ObCreateObject(KernelMode, - IoFileObjectType, - NULL, - KernelMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&CreatedFileObject); - if (!NT_SUCCESS(Status)) + /* Create the File Object */ + Status = ObCreateObject(KernelMode, + IoFileObjectType, + NULL, + KernelMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&CreatedFileObject); + if (!NT_SUCCESS(Status)) { - DPRINT("Could not create FileObject\n"); - return (NULL); + DPRINT1("Could not create FileObject\n"); + return (NULL); } - if (FileObject != NULL) - { - DeviceObject = FileObject->DeviceObject; - } - DeviceObject = IoGetAttachedDevice(DeviceObject); + /* Choose Device Object */ + if (FileObject) DeviceObject = FileObject->DeviceObject; + DPRINT("DeviceObject %x\n", DeviceObject); + + /* Set File Object Data */ + CreatedFileObject->DeviceObject = DeviceObject; + CreatedFileObject->Vpb = DeviceObject->Vpb; + CreatedFileObject->Type = IO_TYPE_FILE; + CreatedFileObject->Flags = FO_STREAM_FILE; - DPRINT("DeviceObject %x\n", DeviceObject); + /* Initialize Lock and Event */ + KeInitializeEvent(&CreatedFileObject->Event, NotificationEvent, FALSE); + KeInitializeEvent(&CreatedFileObject->Lock, SynchronizationEvent, TRUE); - if (DeviceObject->Vpb && - DeviceObject->Vpb->DeviceObject) - { - CreatedFileObject->DeviceObject = DeviceObject->Vpb->DeviceObject; - } - else - { - CreatedFileObject->DeviceObject = DeviceObject; - } - CreatedFileObject->Vpb = DeviceObject->Vpb; - CreatedFileObject->Type = IO_TYPE_FILE; - CreatedFileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - - // shouldn't we initialize the lock event, and several other things here too? - KeInitializeEvent(&CreatedFileObject->Event, NotificationEvent, FALSE); - KeInitializeEvent(&CreatedFileObject->Lock, SynchronizationEvent, TRUE); - - return CreatedFileObject; + /* Return file */ + return CreatedFileObject; } /* @@ -1390,41 +1387,48 @@ IN ULONG MaxMessageSize, IN PLARGE_INTEGER TimeOut) { - MAILSLOT_CREATE_PARAMETERS Buffer; + MAILSLOT_CREATE_PARAMETERS Buffer; - DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " - "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + DPRINT("NtCreateMailslotFile(FileHandle %x, DesiredAccess %x, " + "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", + FileHandle,DesiredAccess,ObjectAttributes, + ObjectAttributes->ObjectName->Buffer); + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); - - if (TimeOut != NULL) - { - Buffer.ReadTimeout.QuadPart = TimeOut->QuadPart; - Buffer.TimeoutSpecified = TRUE; - } - else - { - Buffer.TimeoutSpecified = FALSE; - } - Buffer.MailslotQuota = MailslotQuota; - Buffer.MaximumMessageSize = MaxMessageSize; + /* Check for Timeout */ + if (TimeOut) + { + /* Enable it */ + Buffer.TimeoutSpecified = TRUE; + + /* FIXME: Add SEH */ + Buffer.ReadTimeout = *TimeOut; + } + else + { + /* No timeout */ + Buffer.TimeoutSpecified = FALSE; + } + + /* Set Settings */ + Buffer.MailslotQuota = MailslotQuota; + Buffer.MaximumMessageSize = MaxMessageSize; - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_CREATE, - CreateOptions, - NULL, - 0, - CreateFileTypeMailslot, - (PVOID)&Buffer, - 0); + /* Call I/O */ + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + CreateOptions, + NULL, + 0, + CreateFileTypeMailslot, + (PVOID)&Buffer, + 0); } NTSTATUS @@ -1444,45 +1448,52 @@ ULONG OutboundQuota, PLARGE_INTEGER DefaultTimeout) { - NAMED_PIPE_CREATE_PARAMETERS Buffer; + NAMED_PIPE_CREATE_PARAMETERS Buffer; - DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " - "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + DPRINT("NtCreateNamedPipeFile(FileHandle %x, DesiredAccess %x, " + "ObjectAttributes %x ObjectAttributes->ObjectName->Buffer %S)\n", + FileHandle,DesiredAccess,ObjectAttributes, + ObjectAttributes->ObjectName->Buffer); + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); - - if (DefaultTimeout != NULL) + /* Check for Timeout */ + if (DefaultTimeout) { - Buffer.DefaultTimeout.QuadPart = DefaultTimeout->QuadPart; - Buffer.TimeoutSpecified = TRUE; + /* Enable it */ + Buffer.TimeoutSpecified = TRUE; + + /* FIXME: Add SEH */ + Buffer.DefaultTimeout = *DefaultTimeout; } - else + else { - Buffer.TimeoutSpecified = FALSE; + /* No timeout */ + Buffer.TimeoutSpecified = FALSE; } - Buffer.NamedPipeType = NamedPipeType; - Buffer.ReadMode = ReadMode; - Buffer.CompletionMode = CompletionMode; - Buffer.MaximumInstances = MaximumInstances; - Buffer.InboundQuota = InboundQuota; - Buffer.OutboundQuota = OutboundQuota; + + /* Set Settings */ + Buffer.NamedPipeType = NamedPipeType; + Buffer.ReadMode = ReadMode; + Buffer.CompletionMode = CompletionMode; + Buffer.MaximumInstances = MaximumInstances; + Buffer.InboundQuota = InboundQuota; + Buffer.OutboundQuota = OutboundQuota; - return IoCreateFile(FileHandle, - DesiredAccess, - ObjectAttributes, - IoStatusBlock, - NULL, - FILE_ATTRIBUTE_NORMAL, - ShareAccess, - CreateDisposition, - CreateOptions, - NULL, - 0, - CreateFileTypeNamedPipe, - (PVOID)&Buffer, - 0); + /* Call I/O */ + return IoCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + ShareAccess, + CreateDisposition, + CreateOptions, + NULL, + 0, + CreateFileTypeNamedPipe, + (PVOID)&Buffer, + 0); } /* @@ -1513,8 +1524,8 @@ STDCALL NtFlushWriteBuffer(VOID) { - KeFlushWriteBuffer(); - return STATUS_SUCCESS; + KeFlushWriteBuffer(); + return STATUS_SUCCESS; } /* @@ -1960,36 +1971,36 @@ NtQueryAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_BASIC_INFORMATION FileInformation) { - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + NTSTATUS Status; - /* Open the file */ - Status = ZwOpenFile (&FileHandle, - SYNCHRONIZE | FILE_READ_ATTRIBUTES, - ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS (Status)) + /* Open the file */ + Status = ZwOpenFile(&FileHandle, + SYNCHRONIZE | FILE_READ_ATTRIBUTES, + ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS (Status)) { - DPRINT ("ZwOpenFile() failed (Status %lx)\n", Status); - return Status; + DPRINT ("ZwOpenFile() failed (Status %lx)\n", Status); + return Status; } - /* Get file attributes */ - Status = ZwQueryInformationFile (FileHandle, - &IoStatusBlock, - FileInformation, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - ZwClose (FileHandle); - if (!NT_SUCCESS (Status)) + /* Get file attributes */ + Status = ZwQueryInformationFile(FileHandle, + &IoStatusBlock, + FileInformation, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS (Status)) { - DPRINT ("ZwQueryInformationFile() failed (Status %lx)\n", Status); + DPRINT ("ZwQueryInformationFile() failed (Status %lx)\n", Status); } - return Status; + ZwClose(FileHandle); + return Status; } /* @@ -2184,36 +2195,36 @@ NtQueryFullAttributesFile(IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation) { - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle; - NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + NTSTATUS Status; - /* Open the file */ - Status = ZwOpenFile (&FileHandle, - SYNCHRONIZE | FILE_READ_ATTRIBUTES, - ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT); - if (!NT_SUCCESS (Status)) + /* Open the file */ + Status = ZwOpenFile(&FileHandle, + SYNCHRONIZE | FILE_READ_ATTRIBUTES, + ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS (Status)) { - DPRINT ("ZwOpenFile() failed (Status %lx)\n", Status); - return Status; + DPRINT ("ZwOpenFile() failed (Status %lx)\n", Status); + return Status; } - /* Get file attributes */ - Status = ZwQueryInformationFile (FileHandle, - &IoStatusBlock, - FileInformation, - sizeof(FILE_NETWORK_OPEN_INFORMATION), - FileNetworkOpenInformation); - ZwClose (FileHandle); - if (!NT_SUCCESS (Status)) + /* Get file attributes */ + Status = ZwQueryInformationFile(FileHandle, + &IoStatusBlock, + FileInformation, + sizeof(FILE_NETWORK_OPEN_INFORMATION), + FileNetworkOpenInformation); + if (!NT_SUCCESS (Status)) { - DPRINT ("ZwQueryInformationFile() failed (Status %lx)\n", Status); + DPRINT ("ZwQueryInformationFile() failed (Status %lx)\n", Status); } - return Status; + ZwClose (FileHandle); + return Status; } /*

19 years, 4 months

[ion] 15177: Fix IopSecurityFile: Do not use BuildFsd, create IRP manually for sync/async, support assigning SD to device instead of file, and signal unimplemented set sd to device, simplify code for file object setting and remove duplication, wait on right event and return the matching status. moved static io security function to se subsystem and renamed it from default to world to better match what it's doing

by ion＠svn.reactos.com

Fix IopSecurityFile: Do not use BuildFsd, create IRP manually for sync/async, support assigning SD to device instead of file, and signal unimplemented set sd to device, simplify code for file object setting and remove duplication, wait on right event and return the matching status. moved static io security function to se subsystem and renamed it from default to world to better match what it's doing Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/se/sd.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 03:02:36 UTC (rev 15176) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 03:58:35 UTC (rev 15177) @@ -21,6 +21,12 @@ extern GENERIC_MAPPING IopFileMapping; +NTSTATUS +STDCALL +SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength); + /* INTERNAL FUNCTIONS ********************************************************/ static @@ -226,7 +232,7 @@ { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } - IoFreeIrp(Irp); + IoFreeIrp(Irp); } @@ -245,183 +251,159 @@ } } -static NTSTATUS -IopSetDefaultSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength) +STDCALL +IopSecurityFile(PVOID ObjectBody, + SECURITY_OPERATION_CODE OperationCode, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength) { - ULONG_PTR Current; - ULONG SidSize; - ULONG SdSize; - NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION StackPtr; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + ULONG MajorFunction; + PIRP Irp; + BOOLEAN LocalEvent = FALSE; + KEVENT Event; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IopSetDefaultSecurityDescriptor() called\n"); + DPRINT("IopSecurityFile() called\n"); - if (SecurityInformation == 0) + FileObject = (PFILE_OBJECT)ObjectBody; + + if (OperationCode == QuerySecurityDescriptor) { - return STATUS_ACCESS_DENIED; + MajorFunction = IRP_MJ_QUERY_SECURITY; + DPRINT("Query security descriptor\n"); } - - SidSize = RtlLengthSid(SeWorldSid); - SdSize = sizeof(SECURITY_DESCRIPTOR) + (2 * SidSize); - - if (*BufferLength < SdSize) + else if (OperationCode == DeleteSecurityDescriptor) { - *BufferLength = SdSize; - return STATUS_BUFFER_TOO_SMALL; + DPRINT("Delete\n"); + return STATUS_SUCCESS; } - - *BufferLength = SdSize; - - Status = RtlCreateSecurityDescriptor(SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) + else if (OperationCode == AssignSecurityDescriptor) { - return Status; + /* If this is a direct open, we can assign it */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) + { + /* Get the Device Object */ + DPRINT1("here\n"); + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); + + /* Assign the Security Descriptor */ + DeviceObject->SecurityDescriptor = SecurityDescriptor; + } + return STATUS_SUCCESS; } - - SecurityDescriptor->Control |= SE_SELF_RELATIVE; - Current = (ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR); - - if (SecurityInformation & OWNER_SECURITY_INFORMATION) + else { - RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); - Current += SidSize; + 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) + { + DPRINT1("Set SD unimplemented for Devices\n"); + return STATUS_SUCCESS; + } } - - if (SecurityInformation & GROUP_SECURITY_INFORMATION) + + /* 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) { - RtlCopyMemory((PVOID)Current, - SeWorldSid, - SidSize); - SecurityDescriptor->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); - Current += SidSize; + /* Use File Object event */ + KeClearEvent(&FileObject->Event); } - - if (SecurityInformation & DACL_SECURITY_INFORMATION) + else { - SecurityDescriptor->Control |= SE_DACL_PRESENT; + /* Use local event */ + 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(); + Irp->UserIosb = &IoStatusBlock; + 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; - if (SecurityInformation & SACL_SECURITY_INFORMATION) + /* Set Parameters */ + if (OperationCode == QuerySecurityDescriptor) { - SecurityDescriptor->Control |= SE_SACL_PRESENT; + StackPtr->Parameters.QuerySecurity.SecurityInformation = SecurityInformation; + StackPtr->Parameters.QuerySecurity.Length = *BufferLength; + Irp->UserBuffer = SecurityDescriptor; } - - return STATUS_SUCCESS; -} - -NTSTATUS -STDCALL -IopSecurityFile(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION StackPtr; - PFILE_OBJECT FileObject; - PIRP Irp; - NTSTATUS Status; - - DPRINT("IopSecurityFile() called\n"); - - FileObject = (PFILE_OBJECT)ObjectBody; - - switch (OperationCode) + else { - case SetSecurityDescriptor: - DPRINT("Set security descriptor\n"); - KeResetEvent(&FileObject->Event); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SET_SECURITY, - FileObject->DeviceObject, - NULL, - 0, - NULL, - &FileObject->Event, - &IoStatusBlock); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - - StackPtr->Parameters.SetSecurity.SecurityInformation = SecurityInformation; - StackPtr->Parameters.SetSecurity.SecurityDescriptor = SecurityDescriptor; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - - if (Status == STATUS_INVALID_DEVICE_REQUEST) - { - Status = STATUS_SUCCESS; - } - return Status; - - case QuerySecurityDescriptor: - DPRINT("Query security descriptor\n"); - KeResetEvent(&FileObject->Event); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_QUERY_SECURITY, - FileObject->DeviceObject, - NULL, - 0, - NULL, - &FileObject->Event, - &IoStatusBlock); - - Irp->UserBuffer = SecurityDescriptor; - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->FileObject = FileObject; - - StackPtr->Parameters.QuerySecurity.SecurityInformation = SecurityInformation; - StackPtr->Parameters.QuerySecurity.Length = *BufferLength; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - - if (Status == STATUS_INVALID_DEVICE_REQUEST) - { - Status = IopSetDefaultSecurityDescriptor(SecurityInformation, - SecurityDescriptor, - BufferLength); - } - else - { - /* FIXME: Is this correct?? */ - *BufferLength = IoStatusBlock.Information; - } - return Status; - - case DeleteSecurityDescriptor: - DPRINT("Delete security descriptor\n"); - return STATUS_SUCCESS; - - case AssignSecurityDescriptor: - DPRINT("Assign security descriptor\n"); - return STATUS_SUCCESS; + 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, + NULL); + Status = IoStatusBlock.Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + 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) + { + if (OperationCode == QuerySecurityDescriptor) + { + /* Set a World Security Descriptor */ + Status = SeSetWorldSecurityDescriptor(SecurityInformation, + SecurityDescriptor, + BufferLength); + } + else + { + /* It wasn't a query, so just fake success */ + Status = STATUS_SUCCESS; + } + } + else if (OperationCode == QuerySecurityDescriptor) + { + /* Return length */ + *BufferLength = IoStatusBlock.Information; + } - return STATUS_UNSUCCESSFUL; + /* Return Status */ + return Status; } NTSTATUS @@ -2664,8 +2646,8 @@ ASSERT(IoStatusBlock != NULL); ASSERT(FileInformation != NULL); - DPRINT1("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " - "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, + DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " + "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, Length, FileInformationClass); /* Get the file object from the file handle */ _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2005-05-09 03:02:36 UTC (rev 15176) +++ trunk/reactos/ntoskrnl/se/sd.c 2005-05-09 03:58:35 UTC (rev 15177) @@ -108,7 +108,77 @@ return TRUE; } +NTSTATUS +STDCALL +SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength) +{ + ULONG_PTR Current; + ULONG SidSize; + ULONG SdSize; + NTSTATUS Status; + DPRINT("SeSetWorldSecurityDescriptor() called\n"); + + if (SecurityInformation == 0) + { + return STATUS_ACCESS_DENIED; + } + + SidSize = RtlLengthSid(SeWorldSid); + SdSize = sizeof(SECURITY_DESCRIPTOR) + (2 * SidSize); + + if (*BufferLength < SdSize) + { + *BufferLength = SdSize; + return STATUS_BUFFER_TOO_SMALL; + } + + *BufferLength = SdSize; + + Status = RtlCreateSecurityDescriptor(SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + SecurityDescriptor->Control |= SE_SELF_RELATIVE; + Current = (ULONG_PTR)SecurityDescriptor + sizeof(SECURITY_DESCRIPTOR); + + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + RtlCopyMemory((PVOID)Current, + SeWorldSid, + SidSize); + SecurityDescriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + Current += SidSize; + } + + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + { + RtlCopyMemory((PVOID)Current, + SeWorldSid, + SidSize); + SecurityDescriptor->Group = (PSID)((ULONG_PTR)Current - (ULONG_PTR)SecurityDescriptor); + Current += SidSize; + } + + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + SecurityDescriptor->Control |= SE_DACL_PRESENT; + } + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + SecurityDescriptor->Control |= SE_SACL_PRESENT; + } + + return STATUS_SUCCESS; +} + + NTSTATUS SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode,

19 years, 4 months

[ion] 15176: Fix NtSetInformationFile: Cleanup FileCompletionInformation case, use Tag. Use right device object, read FileObject->FinalStatus, use right flags to IO manager can do the cleanup and buffered io semantics, support sync or async waiting

by ion＠svn.reactos.com

Fix NtSetInformationFile: Cleanup FileCompletionInformation case, use Tag. Use right device object, read FileObject->FinalStatus, use right flags to IO manager can do the cleanup and buffered io semantics, support sync or async waiting Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 02:15:03 UTC (rev 15175) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 03:02:36 UTC (rev 15176) @@ -2650,171 +2650,200 @@ ULONG Length, FILE_INFORMATION_CLASS FileInformationClass) { - OBJECT_HANDLE_INFORMATION HandleInformation; - PIO_STACK_LOCATION StackPtr; - PFILE_OBJECT FileObject; - PDEVICE_OBJECT DeviceObject; - PIRP Irp; - NTSTATUS Status; - PVOID SystemBuffer; - KPROCESSOR_MODE PreviousMode; - BOOLEAN Failed = FALSE; + OBJECT_HANDLE_INFORMATION HandleInformation; + PIO_STACK_LOCATION StackPtr; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + PIRP Irp; + KEVENT Event; + BOOLEAN LocalEvent = FALSE; + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + BOOLEAN Failed = FALSE; - ASSERT(IoStatusBlock != NULL); - ASSERT(FileInformation != NULL); + ASSERT(IoStatusBlock != NULL); + ASSERT(FileInformation != NULL); - DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " - "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, - Length, FileInformationClass); + DPRINT1("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " + "Class %d)\n", FileHandle, IoStatusBlock, FileInformation, + Length, FileInformationClass); - PreviousMode = ExGetPreviousMode(); + /* Get the file object from the file handle */ + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID *)&FileObject, + &HandleInformation); + if (!NT_SUCCESS(Status)) return Status; - /* Get the file object from the file handle */ - Status = ObReferenceObjectByHandle(FileHandle, - 0, - IoFileObjectType, - PreviousMode, - (PVOID *)&FileObject, - &HandleInformation); - if (!NT_SUCCESS(Status)) - { - return Status; - } + /* Check information class specific access rights */ + switch (FileInformationClass) + { + case FileBasicInformation: + if (!(HandleInformation.GrantedAccess & FILE_WRITE_ATTRIBUTES)) + Failed = TRUE; + break; - /* Check information class specific access rights */ - switch (FileInformationClass) - { - case FileBasicInformation: - if (!(HandleInformation.GrantedAccess & FILE_WRITE_ATTRIBUTES)) - Failed = TRUE; - break; + case FileDispositionInformation: + if (!(HandleInformation.GrantedAccess & DELETE)) + Failed = TRUE; + break; - case FileDispositionInformation: - if (!(HandleInformation.GrantedAccess & DELETE)) - Failed = TRUE; - break; + case FilePositionInformation: + if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || + !(FileObject->Flags & FO_SYNCHRONOUS_IO)) + Failed = TRUE; + break; - case FilePositionInformation: - if (!(HandleInformation.GrantedAccess & (FILE_READ_DATA | FILE_WRITE_DATA)) || - !(FileObject->Flags & FO_SYNCHRONOUS_IO)) - Failed = TRUE; - break; + case FileEndOfFileInformation: + if (!(HandleInformation.GrantedAccess & FILE_WRITE_DATA)) + Failed = TRUE; + break; - case FileEndOfFileInformation: - if (!(HandleInformation.GrantedAccess & FILE_WRITE_DATA)) - Failed = TRUE; - break; + default: + break; + } - default: - break; - } + if (Failed) + { + DPRINT1("NtSetInformationFile() returns STATUS_ACCESS_DENIED!\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } - if (Failed) - { - DPRINT1("NtSetInformationFile() returns STATUS_ACCESS_DENIED!\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; - } + DPRINT("FileObject %x\n", FileObject); - DPRINT("FileObject %x\n", FileObject); + /* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */ + /* Handle IO Completion Port quickly */ + if (FileInformationClass == FileCompletionInformation) + { + PVOID Queue; + PFILE_COMPLETION_INFORMATION CompletionInfo = FileInformation; + PIO_COMPLETION_CONTEXT Context; - /* io completion port? */ - if (FileInformationClass == FileCompletionInformation) - { - PKQUEUE Queue; + if (Length < sizeof(FILE_COMPLETION_INFORMATION)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + /* Reference the Port */ + Status = ObReferenceObjectByHandle(CompletionInfo->IoCompletionHandle, + IO_COMPLETION_MODIFY_STATE, + ExIoCompletionType, + PreviousMode, + (PVOID*)&Queue, + NULL); + if (NT_SUCCESS(Status)) + { + /* Allocate the Context */ + Context = ExAllocatePoolWithTag(PagedPool, + sizeof(IO_COMPLETION_CONTEXT), + TAG('I', 'o', 'C', 'p')); + + /* Set the Data */ + Context->Key = CompletionInfo->CompletionKey; + Context->Port = Queue; + FileObject->CompletionContext = Context; + + /* Dereference the Port now */ + ObDereferenceObject(Queue); + } + } + + /* Complete the I/O */ + ObDereferenceObject(FileObject); + return Status; + } - if (Length < sizeof(FILE_COMPLETION_INFORMATION)) + /* Check if this is a direct open or not */ + if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { - Status = STATUS_INFO_LENGTH_MISMATCH; + DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject); } else { - Status = ObReferenceObjectByHandle(((PFILE_COMPLETION_INFORMATION)FileInformation )->IoCompletionHandle, - IO_COMPLETION_MODIFY_STATE,//??? - ExIoCompletionType, - PreviousMode, - (PVOID*)&Queue, - NULL); - if (NT_SUCCESS(Status)) - { - /* FIXME: maybe use lookaside list */ - FileObject->CompletionContext = ExAllocatePool(NonPagedPool, sizeof(IO_COMPLETION_CONTEXT)); - FileObject->CompletionContext->Key = ((PFILE_COMPLETION_INFORMATION)FileInformation)->CompletionKey; - FileObject->CompletionContext->Port = Queue; + DeviceObject = IoGetRelatedDeviceObject(FileObject); + } + + /* Check if we should use Sync IO or not */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Use File Object event */ + KeClearEvent(&FileObject->Event); + } + else + { + /* Use local event */ + KeInitializeEvent(&Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } - ObDereferenceObject(Queue); - } + /* Allocate the IRP */ + if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE))) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; } + + /* Allocate the System Buffer */ + if (!(Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB))) + { + IoFreeIrp(Irp); + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Copy the data inside */ + MmSafeCopyFromUser(Irp->AssociatedIrp.SystemBuffer, FileInformation, Length); - ObDereferenceObject(FileObject); - return Status; - } + /* Set up the IRP */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = PreviousMode; + Irp->UserIosb = IoStatusBlock; + Irp->UserEvent = (LocalEvent) ? &Event : NULL; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; + Irp->Flags |= (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; + + /* Set up Stack Data */ + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; + StackPtr->FileObject = FileObject; - DeviceObject = FileObject->DeviceObject; + /* Set the Parameters */ + StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.SetFile.Length = Length; + + /* Call the Driver */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + if (LocalEvent) + { + KeWaitForSingleObject(&Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock->Status; + } + else + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + PreviousMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = FileObject->FinalStatus; + } + } - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (SystemBuffer == NULL) - { - IoFreeIrp(Irp); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - MmSafeCopyFromUser(SystemBuffer, - FileInformation, - Length); - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = PreviousMode; - Irp->AssociatedIrp.SystemBuffer = SystemBuffer; - Irp->UserIosb = IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - KeResetEvent(&FileObject->Event); - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - - StackPtr->Parameters.SetFile.FileInformationClass = - FileInformationClass; - StackPtr->Parameters.SetFile.Length = Length; - - /* - * Pass the IRP to the FSD (and wait for - * it if required) - */ - DPRINT("FileObject->DeviceObject %x\n", FileObject->DeviceObject); - Status = IoCallDriver(FileObject->DeviceObject, - Irp); - if (Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO)) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - PreviousMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock->Status; - } - - ExFreePool(SystemBuffer); - - return Status; + /* Return the Status */ + return Status; } /*

19 years, 4 months

[sedwards] 15174: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/services/dhcpd/src/leases/leases.c Modified: trunk/reactos/services/dhcpd/src/lock/locker.c Modified: trunk/reactos/services/dhcpd/src/main.c Modified: trunk/reactos/services/dhcpd/src/parsing/parser.c Modified: trunk/reactos/services/dhcpd/src/utils/iputils.c _____ Modified: trunk/reactos/services/dhcpd/src/leases/leases.c --- trunk/reactos/services/dhcpd/src/leases/leases.c 2005-05-09 01:50:07 UTC (rev 15173) +++ trunk/reactos/services/dhcpd/src/leases/leases.c 2005-05-09 02:04:53 UTC (rev 15174) @@ -66,10 +66,10 @@ if( !strcmp( line, "router" )) fscanf( config, "%s", textrouter ); - + if( !strcmp( line, "mask" )) fscanf( config, "%s", textmask ); - + if( !strcmp( line, "range" )) fscanf( config, "%s %s", textlowrange, texthighrange ); if( !strcmp( line, "server" )) _____ Modified: trunk/reactos/services/dhcpd/src/lock/locker.c --- trunk/reactos/services/dhcpd/src/lock/locker.c 2005-05-09 01:50:07 UTC (rev 15173) +++ trunk/reactos/services/dhcpd/src/lock/locker.c 2005-05-09 02:04:53 UTC (rev 15174) @@ -8,7 +8,7 @@ { DHCPLIST *temp, *ntemp; int count = 1, i; - + /* fprintf( stdout, "checking list! \n" ); */ return 0; _____ Modified: trunk/reactos/services/dhcpd/src/main.c --- trunk/reactos/services/dhcpd/src/main.c 2005-05-09 01:50:07 UTC (rev 15173) +++ trunk/reactos/services/dhcpd/src/main.c 2005-05-09 02:04:53 UTC (rev 15174) @@ -16,14 +16,14 @@ int nCode; #endif int sockfd; - struct sockaddr_in my_addr; - struct sockaddr_in their_addr; + struct sockaddr_in my_addr; + struct sockaddr_in their_addr; int addr_len, numbytes; DHCPMESSAGE dhcpm; DHCPOPTIONS dhcpo; #ifdef __MINGW32__ - if ((nCode = WSAStartup(MAKEWORD(1, 1), &wsaData)) != 0) + if ((nCode = WSAStartup(MAKEWORD(1, 1), &wsaData)) != 0) { perror("WSAStartup"); return 0; @@ -36,12 +36,12 @@ } init_leases_list(); - + my_addr.sin_family = AF_INET; my_addr.sin_port = htons(MYPORT); my_addr.sin_addr.s_addr = INADDR_ANY; memset(&(my_addr.sin_zero), '\0', 8); - + if (bind(sockfd, (struct sockaddr *)&my_addr, sizeof(struct sockaddr)) == -1) { perror("bind"); @@ -60,13 +60,13 @@ if( process_dhcp_packet( &dhcpm, &dhcpo ) < 0 ) continue; } - + close(sockfd); #ifdef __MINGW32__ WSACleanup(); #endif - + return 0; - + } _____ Modified: trunk/reactos/services/dhcpd/src/parsing/parser.c --- trunk/reactos/services/dhcpd/src/parsing/parser.c 2005-05-09 01:50:07 UTC (rev 15173) +++ trunk/reactos/services/dhcpd/src/parsing/parser.c 2005-05-09 02:04:53 UTC (rev 15174) @@ -107,67 +107,67 @@ } pointer = opointer; break; - case TOFFSET: + case TOFFSET: case TIMESERVER: - case NS: - case DNS: - case LOGSERVER: + case NS: + case DNS: + case LOGSERVER: case COOKIESERVER: - case LPRSERVER: - case IMPSERVER: + case LPRSERVER: + case IMPSERVER: case RESLOCSERVER: case BOOTFILESIZE: case MERITDUMPFILE: - case DOMAINNAME: - case SWAPSERVER: + case DOMAINNAME: + case SWAPSERVER: case ROOTPATH: case EXTENSIONPATH: - case IPFORWARD: - case NONLOCAL: - case POLICYFILTER: + case IPFORWARD: + case NONLOCAL: + case POLICYFILTER: case MAXIMUMDATAG: - case DEFAULTTTL: - case PATHMTUATO: + case DEFAULTTTL: + case PATHMTUATO: case PATHMTUPTO: - case IMTU: - case ALLSUBLOCAL: + case IMTU: + case ALLSUBLOCAL: case BROADCAST: case PMASKDISCOVERY: - case MASKSUPPLIER: + case MASKSUPPLIER: case PROUTERDISCOVE: case RSOLICIADDRESS: - case STATICROUTE: + case STATICROUTE: case TENCAPSULATION: - case ARPCACHE: - case ETHENCAPSUL: + case ARPCACHE: + case ETHENCAPSUL: case TCPDEFTTL: - case TCPKAI: - case TCPKAG: - case NISDOMAIN: - case NISSERVER: - case NTPSERVER: - case VENDORSP: - case NBTCPIPNS: - case NBTCPIPDDS: - case NBTCPIPNT: + case TCPKAI: + case TCPKAG: + case NISDOMAIN: + case NISSERVER: + case NTPSERVER: + case VENDORSP: + case NBTCPIPNS: + case NBTCPIPDDS: + case NBTCPIPNT: case NBTCPIPSC: case XWINFONTSERVER: case XWINDISPLAY: case OVERLOAD: case SERVER: - case MESSAGE: - case MAXIMUMDHCP: + case MESSAGE: + case MAXIMUMDHCP: case RENEWALTIME: - case REBINDING: + case REBINDING: case VENDORCLASS: - case NISPLUSDOMAIN: - case NISPLUSSERVER: - case TFTPSERVER: - case BOOTFILE: - case MOBILEIP: - case SMTPSERVER: - case POP3SERVER: - case NNTPSERVER: + case NISPLUSDOMAIN: + case NISPLUSSERVER: + case TFTPSERVER: + case BOOTFILE: + case MOBILEIP: + case SMTPSERVER: + case POP3SERVER: + case NNTPSERVER: case HTTPSERVER: case FINGERSERVER: case IRCSERVER: @@ -231,7 +231,7 @@ dhcpm->options[pointer++] = ((dhcpl.mask >> 16) & 0xFF); dhcpm->options[pointer++] = (dhcpl.mask >> 24); dhcpm->options[pointer++] = SERVER; - dhcpm->options[pointer++] = 4; + dhcpm->options[pointer++] = 4; dhcpm->options[pointer++] = (dhcpl.siaddr & 0xFF); dhcpm->options[pointer++] = ((dhcpl.siaddr >> 8) & 0xFF); dhcpm->options[pointer++] = ((dhcpl.siaddr >> 16) & 0xFF); @@ -300,7 +300,7 @@ dhcpm->options[pointer++] = ((dhcpl.mask >> 8) & 0xFF); dhcpm->options[pointer++] = (dhcpl.mask & 0xFF); dhcpm->options[pointer++] = SERVER; - dhcpm->options[pointer++] = 4; + dhcpm->options[pointer++] = 4; dhcpm->options[pointer++] = dhcpl.siaddr >> 24; dhcpm->options[pointer++] = ((dhcpl.siaddr >> 16) & 0xFF); dhcpm->options[pointer++] = ((dhcpl.siaddr >> 8) & 0xFF); @@ -322,7 +322,7 @@ dhcpm->options[pointer++] = (dhcpl.lease >> 24); dhcpm->options[pointer++] = ((dhcpl.lease >> 16) & 0xFF); dhcpm->options[pointer++] = ((dhcpl.lease >> 8) & 0xFF); - dhcpm->options[pointer++] = (dhcpl.lease & 0xFF); + dhcpm->options[pointer++] = (dhcpl.lease & 0xFF); dhcpm->options[pointer++] = PAD; dhcpm->options[pointer++] = PAD; dhcpm->options[pointer++] = PAD; @@ -339,7 +339,7 @@ display_dhcp_packet( dhcpm, dhcpo ); write_packet( dhcpm, name ); fprintf( stdout, "process_dhcp_packet [end]!\n"); - return 0; + return 0; } int write_packet( DHCPMESSAGE *dhcpm, char *name ) @@ -390,7 +390,7 @@ perror("sendto"); exit(1); } - + printf("sent %d bytes to %s\n", numbytes, inet_ntoa(their_addr.sin_addr)); _____ Modified: trunk/reactos/services/dhcpd/src/utils/iputils.c --- trunk/reactos/services/dhcpd/src/utils/iputils.c 2005-05-09 01:50:07 UTC (rev 15173) +++ trunk/reactos/services/dhcpd/src/utils/iputils.c 2005-05-09 02:04:53 UTC (rev 15174) @@ -17,7 +17,7 @@ for( dotcount = 0; (dotcount < place) && ( text ); text++ ) if( *text == '.' ) dotcount++; - + if( !text ) return -2;

19 years, 4 months

[sedwards] 15173: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/w32api/include/GL/gl.h Modified: trunk/reactos/w32api/include/GL/glext.h Modified: trunk/reactos/w32api/include/GL/glu.h Modified: trunk/reactos/w32api/include/GdiPlus.h Modified: trunk/reactos/w32api/include/accctrl.h Modified: trunk/reactos/w32api/include/aclui.h Modified: trunk/reactos/w32api/include/basetyps.h Modified: trunk/reactos/w32api/include/commctrl.h Modified: trunk/reactos/w32api/include/commdlg.h Modified: trunk/reactos/w32api/include/dde.h Modified: trunk/reactos/w32api/include/ddk/afilter.h Modified: trunk/reactos/w32api/include/ddk/atm.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h Modified: trunk/reactos/w32api/include/ddk/hidpi.h Modified: trunk/reactos/w32api/include/ddk/minitape.h Modified: trunk/reactos/w32api/include/ddk/ndis.h Modified: trunk/reactos/w32api/include/ddk/ndistapi.h Modified: trunk/reactos/w32api/include/ddk/ndiswan.h Modified: trunk/reactos/w32api/include/ddk/ntagp.h Modified: trunk/reactos/w32api/include/ddk/ntapi.h Modified: trunk/reactos/w32api/include/ddk/ntddcdrm.h Modified: trunk/reactos/w32api/include/ddk/ntddpcm.h Modified: trunk/reactos/w32api/include/ddk/ntddstor.h Modified: trunk/reactos/w32api/include/ddk/ntifs.h Modified: trunk/reactos/w32api/include/ddk/ntpoapi.h Modified: trunk/reactos/w32api/include/ddk/ntstatus.h Modified: trunk/reactos/w32api/include/ddk/parallel.h Modified: trunk/reactos/w32api/include/ddk/pfhook.h Modified: trunk/reactos/w32api/include/ddk/prntfont.h Modified: trunk/reactos/w32api/include/ddk/scsi.h Modified: trunk/reactos/w32api/include/ddk/scsiwmi.h Modified: trunk/reactos/w32api/include/ddk/srb.h Modified: trunk/reactos/w32api/include/ddk/tdi.h Modified: trunk/reactos/w32api/include/ddk/tdikrnl.h Modified: trunk/reactos/w32api/include/ddk/usb.h Modified: trunk/reactos/w32api/include/ddk/usb100.h Modified: trunk/reactos/w32api/include/ddk/usbcamdi.h Modified: trunk/reactos/w32api/include/ddk/usbdi.h Modified: trunk/reactos/w32api/include/ddk/usbioctl.h Modified: trunk/reactos/w32api/include/ddk/usbiodef.h Modified: trunk/reactos/w32api/include/ddk/usbscan.h Modified: trunk/reactos/w32api/include/ddk/usbuser.h Modified: trunk/reactos/w32api/include/ddk/win2k.h Modified: trunk/reactos/w32api/include/ddk/winddi.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/ddk/winnt4.h Modified: trunk/reactos/w32api/include/ddk/ws2san.h Modified: trunk/reactos/w32api/include/icmpapi.h Modified: trunk/reactos/w32api/include/imagehlp.h Modified: trunk/reactos/w32api/include/intshcut.h Modified: trunk/reactos/w32api/include/iprtrmib.h Modified: trunk/reactos/w32api/include/iptypes.h Modified: trunk/reactos/w32api/include/lmaccess.h Modified: trunk/reactos/w32api/include/lmaudit.h Modified: trunk/reactos/w32api/include/lmbrowsr.h Modified: trunk/reactos/w32api/include/lmchdev.h Modified: trunk/reactos/w32api/include/lmconfig.h Modified: trunk/reactos/w32api/include/lmerr.h Modified: trunk/reactos/w32api/include/lmerrlog.h Modified: trunk/reactos/w32api/include/lmmsg.h Modified: trunk/reactos/w32api/include/lmremutl.h Modified: trunk/reactos/w32api/include/lmrepl.h Modified: trunk/reactos/w32api/include/lmserver.h Modified: trunk/reactos/w32api/include/lmshare.h Modified: trunk/reactos/w32api/include/lmstats.h Modified: trunk/reactos/w32api/include/lmsvc.h Modified: trunk/reactos/w32api/include/lmuse.h Modified: trunk/reactos/w32api/include/lmuseflg.h Modified: trunk/reactos/w32api/include/lmwksta.h Modified: trunk/reactos/w32api/include/mswsock.h Modified: trunk/reactos/w32api/include/ntdef.h Modified: trunk/reactos/w32api/include/oaidl.h Modified: trunk/reactos/w32api/include/objidl.h Modified: trunk/reactos/w32api/include/ocidl.h Modified: trunk/reactos/w32api/include/odbcinst.h Modified: trunk/reactos/w32api/include/oleacc.h Modified: trunk/reactos/w32api/include/olectl.h Modified: trunk/reactos/w32api/include/oledlg.h Modified: trunk/reactos/w32api/include/oleidl.h Modified: trunk/reactos/w32api/include/powrprof.h Modified: trunk/reactos/w32api/include/rapi.h Modified: trunk/reactos/w32api/include/ras.h Modified: trunk/reactos/w32api/include/rasdlg.h Modified: trunk/reactos/w32api/include/richedit.h Modified: trunk/reactos/w32api/include/secext.h Modified: trunk/reactos/w32api/include/setupapi.h Modified: trunk/reactos/w32api/include/shlobj.h Modified: trunk/reactos/w32api/include/shlwapi.h Modified: trunk/reactos/w32api/include/shtypes.h Modified: trunk/reactos/w32api/include/snmp.h Modified: trunk/reactos/w32api/include/sql.h Modified: trunk/reactos/w32api/include/sqlext.h Modified: trunk/reactos/w32api/include/sqlucode.h Modified: trunk/reactos/w32api/include/sspi.h Modified: trunk/reactos/w32api/include/subauth.h Modified: trunk/reactos/w32api/include/tlhelp32.h Modified: trunk/reactos/w32api/include/uxtheme.h Modified: trunk/reactos/w32api/include/vfw.h Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/wincon.h [truncated at 100 lines; 15 more skipped] _____ Modified: trunk/reactos/w32api/include/GL/gl.h --- trunk/reactos/w32api/include/GL/gl.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/GL/gl.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -1452,7 +1452,7 @@ /* Include external definitions of OpenGL extensions */ /* Removed, see this bug report for reference: * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id =2435&atid=102435 - * + * * #include <GL/glext.h> */ _____ Modified: trunk/reactos/w32api/include/GL/glext.h --- trunk/reactos/w32api/include/GL/glext.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/GL/glext.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -13,21 +13,21 @@ ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) _____ Modified: trunk/reactos/w32api/include/GL/glu.h --- trunk/reactos/w32api/include/GL/glu.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/GL/glu.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -6,21 +6,21 @@ ** this file except in compliance with the License. You may obtain a copy ** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 ** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** +** ** http://oss.sgi.com/projects/FreeB -** +** ** Note that, as provided in the License, the Software is distributed on an ** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS ** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND ** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A ** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** +** ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. -** +** ** Additional Notice Provisions: This software was created using the ** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has ** not been independently verified as being compliant with the OpenGL(R) _____ Modified: trunk/reactos/w32api/include/GdiPlus.h --- trunk/reactos/w32api/include/GdiPlus.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/GdiPlus.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -42,7 +42,7 @@ }; #include "GdiplusBase.h" - + #include "GdiplusEnums.h" #include "GdiplusTypes.h" #include "GdiplusInit.h" _____ Modified: trunk/reactos/w32api/include/accctrl.h --- trunk/reactos/w32api/include/accctrl.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/accctrl.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -237,7 +237,7 @@ ULONG cEntries; PACTRL_PROPERTY_ENTRYW pPropertyAccessList; } ACTRL_ACCESSW, *PACTRL_ACCESSW, ACTRL_AUDITW, *PACTRL_AUDITW; -typedef struct _TRUSTEE_ACCESSA { +typedef struct _TRUSTEE_ACCESSA { LPSTR lpProperty; ACCESS_RIGHTS Access; ULONG fAccessFlags; @@ -341,9 +341,9 @@ } SI_INHERIT_TYPE, *PSI_INHERIT_TYPE; typedef enum _SI_PAGE_TYPE { - SI_PAGE_PERM = 0, - SI_PAGE_ADVPERM, - SI_PAGE_AUDIT, + SI_PAGE_PERM = 0, + SI_PAGE_ADVPERM, + SI_PAGE_AUDIT, SI_PAGE_OWNER } SI_PAGE_TYPE; @@ -391,4 +391,4 @@ #ifdef __cplusplus } #endif -#endif +#endif _____ Modified: trunk/reactos/w32api/include/aclui.h --- trunk/reactos/w32api/include/aclui.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/aclui.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -55,7 +55,7 @@ STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - + /* ISecurityInformation */ STDMETHOD(GetObjectInformation)(THIS_ PSI_OBJECT_INFO) PURE; STDMETHOD(GetSecurity)(THIS_ SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*,BOOL) PURE; _____ Modified: trunk/reactos/w32api/include/basetyps.h --- trunk/reactos/w32api/include/basetyps.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/basetyps.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -9,7 +9,7 @@ # define EXTERN_C extern "C" # else # define EXTERN_C extern -# endif /* __cplusplus */ +# endif /* __cplusplus */ # ifndef __int64 # define __int64 long long # endif _____ Modified: trunk/reactos/w32api/include/commctrl.h --- trunk/reactos/w32api/include/commctrl.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/commctrl.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -731,8 +731,8 @@ #define TTM_GETCURRENTTOOLW (WM_USER+59) #define TTM_WINDOWFROMPOINT (WM_USER+16) #if (_WIN32_IE >= 0x0300) -#define TTM_TRACKACTIVATE (WM_USER+17) -#define TTM_TRACKPOSITION (WM_USER+18) +#define TTM_TRACKACTIVATE (WM_USER+17) +#define TTM_TRACKPOSITION (WM_USER+18) #define TTM_SETTIPBKCOLOR (WM_USER+19) #define TTM_SETTIPTEXTCOLOR (WM_USER+20) #define TTM_GETDELAYTIME (WM_USER+21) @@ -740,8 +740,8 @@ #define TTM_GETTIPTEXTCOLOR (WM_USER+23) #define TTM_SETMAXTIPWIDTH (WM_USER+24) #define TTM_GETMAXTIPWIDTH (WM_USER+25) -#define TTM_SETMARGIN (WM_USER+26) -#define TTM_GETMARGIN (WM_USER+27) +#define TTM_SETMARGIN (WM_USER+26) +#define TTM_GETMARGIN (WM_USER+27) #define TTM_POP (WM_USER+28) #endif /* _WIN32_IE */ #if (_WIN32_IE >= 0x0400) /* IE4.0 ??? */ @@ -883,7 +883,7 @@ #define TBM_SETTIPSIDE (WM_USER+31) #define TBM_SETBUDDY (WM_USER+32) #define TBM_GETBUDDY (WM_USER+33) -#define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT +#define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define TBM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TB_LINEUP 0 #define TB_LINEDOWN 1 @@ -1134,7 +1134,7 @@ #if (_WIN32_IE >= 0x0300) #define LVCFMT_BITMAP_ON_RIGHT 4096 #define LVCFMT_COL_HAS_IMAGES 32768 -#define LVCFMT_IMAGE 2048 +#define LVCFMT_IMAGE 2048 #endif #define LVM_GETCOLUMNA (LVM_FIRST+25) #define LVM_GETCOLUMNW (LVM_FIRST+95) @@ -1493,7 +1493,7 @@ #if (_WIN32_WINNT >= 0x0501) #define CCM_SETWINDOWTHEME 0x200b #define CCM_DPISCALE 0x200c -#endif +#endif #define ICC_LISTVIEW_CLASSES 1 #define ICC_TREEVIEW_CLASSES 2 #define ICC_BAR_CLASSES 4 @@ -1557,13 +1557,13 @@ #define DTN_USERSTRINGW ((UINT)-745) #define DTN_WMKEYDOWNA ((UINT)-757) #define DTN_WMKEYDOWNW ((UINT)-744) -#define DTN_FORMATA ((UINT)-756) +#define DTN_FORMATA ((UINT)-756) #define DTN_FORMATW ((UINT)-743) -#define DTN_FORMATQUERYA ((UINT)-755) +#define DTN_FORMATQUERYA ((UINT)-755) #define DTN_FORMATQUERYW ((UINT)-742) -#define DTN_DROPDOWN ((UINT)-754) -#define DTN_CLOSEUP ((UINT)-753) -#define DTN_DATETIMECHANGE ((UINT)-759) +#define DTN_DROPDOWN ((UINT)-754) +#define DTN_CLOSEUP ((UINT)-753) +#define DTN_DATETIMECHANGE ((UINT)-759) #define MCM_GETCURSEL 0x1001 #define MCM_SETCURSEL 0x1002 #define MCM_GETMAXSELCOUNT 0x1003 @@ -2033,7 +2033,7 @@ DWORD dwFlags; } TBINSERTMARK, *LPTBINSERTMARK; typedef struct tagLVBKIMAGEA { - ULONG ulFlags; + ULONG ulFlags; HBITMAP hbm; LPSTR pszImage; UINT cchImageMax; @@ -2041,7 +2041,7 @@ int yOffsetPercent; } LVBKIMAGEA, *LPLVBKIMAGEA; typedef struct tagLVBKIMAGEW { - ULONG ulFlags; + ULONG ulFlags; HBITMAP hbm; LPWSTR pszImage; UINT cchImageMax; @@ -2401,8 +2401,8 @@ } NMLINK, *PNMLINK; #endif /* for backward compatability */ -#define NM_UPDOWN NMUPDOWN -#define LPNM_UPDOWN LPNMUPDOWN +#define NM_UPDOWN NMUPDOWN +#define LPNM_UPDOWN LPNMUPDOWN typedef struct _LVITEMA { UINT mask; int iItem; @@ -2851,8 +2851,8 @@ int y; int cx; int cy; - int xBitmap; - int yBitmap; + int xBitmap; + int yBitmap; COLORREF rgbBk; COLORREF rgbFg; UINT fStyle; _____ Modified: trunk/reactos/w32api/include/commdlg.h --- trunk/reactos/w32api/include/commdlg.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/commdlg.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -441,7 +441,7 @@ HANDLE hSetupTemplate; } PRINTDLGW,*LPPRINTDLGW; #if (WINVER >= 0x0500) && !defined (__OBJC__) -#include <unknwn.h> /* for LPUNKNOWN */ +#include <unknwn.h> /* for LPUNKNOWN */ #include <prsht.h> /* for HPROPSHEETPAGE */ typedef struct tagPRINTPAGERANGE { DWORD nFromPage; _____ Modified: trunk/reactos/w32api/include/dde.h --- trunk/reactos/w32api/include/dde.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/dde.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -52,10 +52,10 @@ } DDEUP; BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE); BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND); -LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); -BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); -BOOL WINAPI FreeDDElParam(UINT,LPARAM); -LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); +LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); +BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); +BOOL WINAPI FreeDDElParam(UINT,LPARAM); +LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); #endif #ifdef __cplusplus _____ Modified: trunk/reactos/w32api/include/ddk/afilter.h --- trunk/reactos/w32api/include/ddk/afilter.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/afilter.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -169,7 +169,7 @@ DDKAPI ArcFreeNdisPacket( IN PARC_PACKET Packet); - + VOID DDKAPI ArcFilterDoIndication( _____ Modified: trunk/reactos/w32api/include/ddk/atm.h --- trunk/reactos/w32api/include/ddk/atm.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/atm.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -146,7 +146,7 @@ UCHAR UserToUserIndication; UCHAR CommonPartIndicator; } ATM_AAL5_INFO; - + struct _ATM_AAL0_INFO { BOOLEAN CellLossPriority; UCHAR PayLoadTypeIdentifier; @@ -158,10 +158,10 @@ #endif } ATM_AAL_OOB_INFO, *PATM_AAL_OOB_INFO; -typedef struct _ATM_ADDRESS { - ATM_ADDRESSTYPE AddressType; - ULONG NumberOfDigits; - UCHAR Address[ATM_ADDRESS_LENGTH]; +typedef struct _ATM_ADDRESS { + ATM_ADDRESSTYPE AddressType; + ULONG NumberOfDigits; + UCHAR Address[ATM_ADDRESS_LENGTH]; } ATM_ADDRESS, *PATM_ADDRESS; /* ATM_BHLI_IE.HighLayerInfoType constants */ _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -697,7 +697,7 @@ CONFIGRET WINAPI CM_Disconnect_Machine( - IN HMACHINE hMachine); + IN HMACHINE hMachine); /* FIXME: Obsolete CM_Enable_DevNode */ /* FIXME: Obsolete CM_Enable_DevNodeEx */ _____ Modified: trunk/reactos/w32api/include/ddk/hidpi.h --- trunk/reactos/w32api/include/ddk/hidpi.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/hidpi.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -528,7 +528,7 @@ DDKAPI HidP_SetScaledUsageValue( IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, + IN USAGE UsagePage, IN USHORT LinkCollection OPTIONAL, IN USAGE Usage, IN LONG UsageValue, _____ Modified: trunk/reactos/w32api/include/ddk/minitape.h --- trunk/reactos/w32api/include/ddk/minitape.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/minitape.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -49,7 +49,7 @@ TAPE_STATUS_INSUFFICIENT_RESOURCES, TAPE_STATUS_NOT_IMPLEMENTED, TAPE_STATUS_INVALID_DEVICE_REQUEST, - TAPE_STATUS_INVALID_PARAMETER, + TAPE_STATUS_INVALID_PARAMETER, TAPE_STATUS_MEDIA_CHANGED, TAPE_STATUS_BUS_RESET, TAPE_STATUS_SETMARK_DETECTED, @@ -187,27 +187,27 @@ #define IGNORE_ERRORS 0x00010000 #define RETURN_ERRORS 0x00020000 -typedef struct _TAPE_INIT_DATA { +typedef struct _TAPE_INIT_DATA { TAPE_VERIFY_INQUIRY_ROUTINE VerifyInquiry; - BOOLEAN QueryModeCapabilitiesPage; - ULONG MinitapeExtensionSize; + BOOLEAN QueryModeCapabilitiesPage; + ULONG MinitapeExtensionSize; TAPE_EXTENSION_INIT_ROUTINE ExtensionInit; ULONG DefaultTimeOutValue; TAPE_ERROR_ROUTINE TapeError; ULONG CommandExtensionSize; - TAPE_PROCESS_COMMAND_ROUTINE CreatePartition; - TAPE_PROCESS_COMMAND_ROUTINE Erase; - TAPE_PROCESS_COMMAND_ROUTINE GetDriveParameters; - TAPE_PROCESS_COMMAND_ROUTINE GetMediaParameters; - TAPE_PROCESS_COMMAND_ROUTINE GetPosition; - TAPE_PROCESS_COMMAND_ROUTINE GetStatus; - TAPE_PROCESS_COMMAND_ROUTINE Prepare; - TAPE_PROCESS_COMMAND_ROUTINE SetDriveParameters; - TAPE_PROCESS_COMMAND_ROUTINE SetMediaParameters; - TAPE_PROCESS_COMMAND_ROUTINE SetPosition; - TAPE_PROCESS_COMMAND_ROUTINE WriteMarks; + TAPE_PROCESS_COMMAND_ROUTINE CreatePartition; + TAPE_PROCESS_COMMAND_ROUTINE Erase; + TAPE_PROCESS_COMMAND_ROUTINE GetDriveParameters; + TAPE_PROCESS_COMMAND_ROUTINE GetMediaParameters; + TAPE_PROCESS_COMMAND_ROUTINE GetPosition; + TAPE_PROCESS_COMMAND_ROUTINE GetStatus; + TAPE_PROCESS_COMMAND_ROUTINE Prepare; + TAPE_PROCESS_COMMAND_ROUTINE SetDriveParameters; + TAPE_PROCESS_COMMAND_ROUTINE SetMediaParameters; + TAPE_PROCESS_COMMAND_ROUTINE SetPosition; + TAPE_PROCESS_COMMAND_ROUTINE WriteMarks; TAPE_PROCESS_COMMAND_ROUTINE PreProcessReadWrite; /* optional */ -} TAPE_INIT_DATA, *PTAPE_INIT_DATA; +} TAPE_INIT_DATA, *PTAPE_INIT_DATA; typedef struct _TAPE_PHYS_POSITION { ULONG SeekBlockAddress; _____ Modified: trunk/reactos/w32api/include/ddk/ndis.h --- trunk/reactos/w32api/include/ddk/ndis.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/ndis.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -678,15 +678,15 @@ /* OID_GEN_NETWORK_LAYER_ADDRESSES */ typedef struct _NETWORK_ADDRESS { - USHORT AddressLength; - USHORT AddressType; - UCHAR Address[1]; + USHORT AddressLength; + USHORT AddressType; + UCHAR Address[1]; } NETWORK_ADDRESS, *PNETWORK_ADDRESS; typedef struct _NETWORK_ADDRESS_LIST { - LONG AddressCount; - USHORT AddressType; - NETWORK_ADDRESS Address[1]; + LONG AddressCount; + USHORT AddressType; + NETWORK_ADDRESS Address[1]; } NETWORK_ADDRESS_LIST, *PNETWORK_ADDRESS_LIST; /* Protocol types supported by NDIS */ @@ -700,8 +700,8 @@ /* OID_GEN_TRANSPORT_HEADER_OFFSET */ typedef struct _TRANSPORT_HEADER_OFFSET { - USHORT ProtocolType; - USHORT HeaderOffset; + USHORT ProtocolType; + USHORT HeaderOffset; } TRANSPORT_HEADER_OFFSET, *PTRANSPORT_HEADER_OFFSET; @@ -926,7 +926,7 @@ ULONG V4_OPTIONS; ULONG RESERVED; } Supported; - + struct { ULONG MD5 : 1; ULONG SHA_1 : 1; @@ -935,7 +935,7 @@ ULONG Send : 1; ULONG Receive : 1; } V4AH; - + struct { ULONG DES : 1; ULONG RESERVED : 1; @@ -986,7 +986,7 @@ ULONG UdpChecksum:1; ULONG IpChecksum:1; } V4Transmit; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; @@ -994,14 +994,14 @@ ULONG UdpChecksum : 1; ULONG IpChecksum : 1; } V4Receive; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; ULONG TcpChecksum : 1; ULONG UdpChecksum : 1; } V6Transmit; - + struct { ULONG IpOptionsSupported : 1; ULONG TcpOptionsSupported : 1; @@ -1027,7 +1027,7 @@ ULONG NdisPacketUdpChecksum : 1; ULONG NdisPacketIpChecksum : 1; } Transmit; - + struct { ULONG NdisPacketTcpChecksumFailed : 1; ULONG NdisPacketUdpChecksumFailed : 1; @@ -1051,9 +1051,9 @@ } NDIS_WAN_FRAGMENT, *PNDIS_WAN_FRAGMENT; typedef struct _WAN_CO_LINKPARAMS { - ULONG TransmitSpeed; - ULONG ReceiveSpeed; - ULONG SendWindow; + ULONG TransmitSpeed; + ULONG ReceiveSpeed; + ULONG SendWindow; } WAN_CO_LINKPARAMS, *PWAN_CO_LINKPARAMS; @@ -1450,7 +1450,7 @@ BIND_HANDLER BindAdapterHandler; \ UNBIND_HANDLER UnbindAdapterHandler; \ PNP_EVENT_HANDLER PnPEventHandler; \ - UNLOAD_PROTOCOL_HANDLER UnloadHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; #else /* !__cplusplus */ @@ -1460,7 +1460,7 @@ BIND_HANDLER BindAdapterHandler; \ UNBIND_HANDLER UnbindAdapterHandler; \ PNP_EVENT_HANDLER PnPEventHandler; \ - UNLOAD_PROTOCOL_HANDLER UnloadHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; #endif /* __cplusplus */ @@ -1920,7 +1920,7 @@ /* * UINT * NdisGetPacketFlags( - * IN PNDIS_PACKET Packet); + * IN PNDIS_PACKET Packet); */ #define NdisGetPacketFlags(Packet)(Packet)->Private.Flags; @@ -2029,7 +2029,7 @@ (PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \ (_Packet)->Private.NdisPacketOobOffset) - + /* * VOID * NdisQueryPacket( @@ -2162,7 +2162,7 @@ * VOID * NdisSetPacketFlags( * IN PNDIS_PACKET Packet, - * IN UINT Flags); + * IN UINT Flags); */ #define NdisSetPacketFlags(Packet, Flags) \ (Packet)->Private.Flags |= (Flags); @@ -2481,7 +2481,7 @@ * VOID * NDIS_PHYSICAL_ADDRESS_CONST( * IN ULONG Low, - * IN LONG High); + * IN LONG High); */ #define NDIS_PHYSICAL_ADDRESS_CONST(Low, High) \ { {(ULONG)(Low), (LONG)(High)} } @@ -2531,7 +2531,7 @@ * VOID * NdisStoreUlong( * IN PULONG DestinationAddress, - * IN ULONG Value); + * IN ULONG Value); */ #define NdisStoreUlong(DestinationAddress, Value) \ RtlStoreUlong(DestinationAddress, Value) @@ -2597,7 +2597,7 @@ IN ULONG Length); NDISAPI -ULONG +ULONG DDKAPI NdisWritePciSlotInformation( IN NDIS_HANDLE NdisAdapterHandle, @@ -3084,7 +3084,7 @@ /* * VOID - * NDIS_PAGABLE_FUNCTION(FunctionName) + * NDIS_PAGABLE_FUNCTION(FunctionName) */ #define NDIS_PAGEABLE_FUNCTION(FunctionName) \ alloc_text(page, FunctionName) @@ -3406,7 +3406,7 @@ OUT PNDIS_HANDLE NdisPartyHandle OPTIONAL); NDISAPI -NDIS_STATUS +NDIS_STATUS DDKAPI NdisClModifyCallQoS( IN NDIS_HANDLE NdisVcHandle, @@ -3710,7 +3710,7 @@ IN PNDIS_REQUEST Request); NDISAPI -VOID +VOID DDKAPI NdisMCoSendComplete( IN NDIS_STATUS Status, @@ -3728,7 +3728,7 @@ IN NDIS_HANDLE ProtocolHandle); NDISAPI -NDIS_STATUS +NDIS_STATUS DDKAPI NdisIMCancelInitializeDeviceInstance( IN NDIS_HANDLE DriverHandle, @@ -4541,11 +4541,11 @@ } DUMMYUNIONNAME2; PVOID SavedSendPacketsHandler; PVOID SavedCancelSendPacketsHandler; - W_SEND_PACKETS_HANDLER WSendPacketsHandler; + W_SEND_PACKETS_HANDLER WSendPacketsHandler; ULONG MiniportAttributes; PDMA_ADAPTER SavedSystemAdapterObject; USHORT NumOpens; - USHORT CFHangXTicks; + USHORT CFHangXTicks; ULONG RequestCount; ULONG IndicatedPacketsCount; ULONG PhysicalMediumType; @@ -5060,14 +5060,14 @@ AdapterType) NDISAPI -VOID +VOID DDKAPI NdisMSetAttributesEx( IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_HANDLE MiniportAdapterContext, IN UINT CheckForHangTimeInSeconds OPTIONAL, IN ULONG AttributeFlags, - IN NDIS_INTERFACE_TYPE AdapterType); + IN NDIS_INTERFACE_TYPE AdapterType); /* * VOID @@ -5227,7 +5227,7 @@ NTSTATUS DDKAPI NdisUpcaseUnicodeString( - OUT PUNICODE_STRING DestinationString, + OUT PUNICODE_STRING DestinationString, IN PUNICODE_STRING SourceString); _____ Modified: trunk/reactos/w32api/include/ddk/ndistapi.h --- trunk/reactos/w32api/include/ddk/ndistapi.h 2005-05-09 01:46:57 UTC (rev 15172) +++ trunk/reactos/w32api/include/ddk/ndistapi.h 2005-05-09 01:50:07 UTC (rev 15173) @@ -603,9 +603,9 @@ #define LINETRANSLATERESULT_VOICEDETECT 0x00000400 #endif -#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000) +#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000) #define LINETRANSLATERESULT_NOTRANSLATION 0x00000800 -#endif +#endif typedef struct _NDIS_VAR_DATA_DESC { @@ -956,52 +956,52 @@ typedef struct _VAR_STRING { ULONG ulTotalSize; ULONG ulNeededSize; - ULONG ulUsedSize; + ULONG ulUsedSize; ULONG ulStringFormat; ULONG ulStringSize; ULONG ulStringOffset; } VAR_STRING, *PVAR_STRING; -typedef struct _NDIS_TAPI_ANSWER { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; +typedef struct _NDIS_TAPI_ANSWER { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; -typedef struct _NDIS_TAPI_CLOSE { +typedef struct _NDIS_TAPI_CLOSE { IN ULONG ulRequestID; IN HDRV_LINE hdLine; } NDIS_TAPI_CLOSE, *PNDIS_TAPI_CLOSE; -typedef struct _NDIS_TAPI_CLOSE_CALL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; -} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; +typedef struct _NDIS_TAPI_CLOSE_CALL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; +} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; -typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulMediaModes; - IN LINE_CALL_PARAMS LineCallParams; -} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; +typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulMediaModes; + IN LINE_CALL_PARAMS LineCallParams; +} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; -typedef struct _NDIS_TAPI_DROP { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; +typedef struct _NDIS_TAPI_DROP { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; -typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { - IN ULONG ulRequestID; -} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; +typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { + IN ULONG ulRequestID; +} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; -typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulAppSpecific; -} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; +typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulAppSpecific; +} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; typedef struct _NDIS_TAPI_SET_CALL_PARAMS { IN ULONG ulRequestID; @@ -1011,49 +1011,49 @@ IN ULONG ulMaxRate; IN BOOLEAN bSetLineDialParams; IN LINE_DIAL_PARAMS LineDialParams; -} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; +} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; -typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulMediaModes; +typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulMediaModes; } NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION, *PNDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION; -typedef struct _NDIS_TAPI_SET_DEV_CONFIG { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - IN ULONG ulDeviceConfigSize; - IN UCHAR DeviceConfig[1]; -} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; +typedef struct _NDIS_TAPI_SET_DEV_CONFIG { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + IN ULONG ulDeviceConfigSize; + IN UCHAR DeviceConfig[1]; +} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; -typedef struct _NDIS_TAPI_SET_MEDIA_MODE { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulMediaMode; -} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; +typedef struct _NDIS_TAPI_SET_MEDIA_MODE { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulMediaMode; +} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; -typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulLineStates; - IN ULONG ulAddressStates; -} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; +typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulLineStates; + IN ULONG ulAddressStates; +} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; -typedef struct _NDIS_TAPI_ACCEPT { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; +typedef struct _NDIS_TAPI_ACCEPT { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; -typedef struct _NDIS_TAPI_DIAL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulDestAddressSize; - IN CHAR szDestAddress[1]; -} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; +typedef struct _NDIS_TAPI_DIAL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulDestAddressSize; + IN CHAR szDestAddress[1]; +} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; typedef struct _NDIS_TAPI_EVENT { IN HTAPI_LINE htLine; @@ -1064,156 +1064,156 @@ IN ULONG ulParam3; } NDIS_TAPI_EVENT, *PNDIS_TAPI_EVENT; -typedef struct _NDIS_TAPI_OPEN { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN HTAPI_LINE htLine; - OUT HDRV_LINE hdLine; -} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; +typedef struct _NDIS_TAPI_OPEN { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN HTAPI_LINE htLine; + OUT HDRV_LINE hdLine; +} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; -typedef struct _NDIS_TAPI_SECURE_CALL { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; -} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; +typedef struct _NDIS_TAPI_SECURE_CALL { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; +} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; -typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulExtVersion; -} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; +typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulExtVersion; +} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; -typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - IN ULONG ulUserUserInfoSize; - IN UCHAR UserUserInfo[1]; -} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; +typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + IN ULONG ulUserUserInfoSize; + IN UCHAR UserUserInfo[1]; +} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; -typedef struct _NDIS_TAPI_CONFIG_DIALOG { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulDeviceClassSize; - IN ULONG ulDeviceClassOffset; - IN ULONG ulLibraryNameTotalSize; - OUT ULONG ulLibraryNameNeededSize; - OUT CHAR szLibraryName[1]; -} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; +typedef struct _NDIS_TAPI_CONFIG_DIALOG { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulDeviceClassSize; + IN ULONG ulDeviceClassOffset; + IN ULONG ulLibraryNameTotalSize; + OUT ULONG ulLibraryNameNeededSize; + OUT CHAR szLibraryName[1]; +} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; -typedef struct _NDIS_TAPI_DEV_SPECIFIC { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulAddressID; - IN HDRV_CALL hdCall; - IN OUT ULONG ulParamsSize; - IN OUT UCHAR Params[1]; -} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; +typedef struct _NDIS_TAPI_DEV_SPECIFIC { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulAddressID; + IN HDRV_CALL hdCall; + IN OUT ULONG ulParamsSize; + IN OUT UCHAR Params[1]; +} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; -typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { - IN ULONG ulRequestID; - IN ULONG ulDeviceID; - IN ULONG ulAddressID; - IN ULONG ulExtVersion; - OUT LINE_ADDRESS_CAPS LineAddressCaps; -} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; +typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { + IN ULONG ulRequestID; + IN ULONG ulDeviceID; + IN ULONG ulAddressID; + IN ULONG ulExtVersion; + OUT LINE_ADDRESS_CAPS LineAddressCaps; +} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; -typedef struct _NDIS_TAPI_GET_ADDRESS_ID { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - OUT ULONG ulAddressID; - IN ULONG ulAddressMode; - IN ULONG ulAddressSize; - IN CHAR szAddress[1]; -} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; +typedef struct _NDIS_TAPI_GET_ADDRESS_ID { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + OUT ULONG ulAddressID; + IN ULONG ulAddressMode; + IN ULONG ulAddressSize; + IN CHAR szAddress[1]; +} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; -typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { - IN ULONG ulRequestID; - IN HDRV_LINE hdLine; - IN ULONG ulAddressID; - OUT LINE_ADDRESS_STATUS LineAddressStatus; -} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; +typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { + IN ULONG ulRequestID; + IN HDRV_LINE hdLine; + IN ULONG ulAddressID; + OUT LINE_ADDRESS_STATUS LineAddressStatus; +} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; -typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { - IN ULONG ulRequestID; - IN HDRV_CALL hdCall; - OUT ULONG ulAddressID; -} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; +typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { + IN ULONG ulRequestID; + IN HDRV_CALL hdCall; + OUT ULONG ulAddressID; +} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; -typedef struct _NDIS_TAPI_GET_CALL_INFO { - ULONG ulRequestID; - IN HDRV_CALL hdCall; - OUT LINE_CALL_INFO LineCallInfo; -} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO; +typedef struct _NDIS_TAPI_GET_CALL_INFO { + ULONG ulRequestID; + IN HDRV_CALL hdCall; [truncated at 1000 lines; 5535 more skipped]

19 years, 4 months

[sedwards] 15172: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/lib/kernel32/debug/break.c Modified: trunk/reactos/lib/kernel32/debug/output.c Modified: trunk/reactos/lib/kernel32/except/except.c Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/copy.c Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/curdir.c Modified: trunk/reactos/lib/kernel32/file/delete.c Modified: trunk/reactos/lib/kernel32/file/deviceio.c Modified: trunk/reactos/lib/kernel32/file/dir.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/file/hardlink.c Modified: trunk/reactos/lib/kernel32/file/iocompl.c Modified: trunk/reactos/lib/kernel32/file/lfile.c Modified: trunk/reactos/lib/kernel32/file/lock.c Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/rw.c Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/mem/global.c Modified: trunk/reactos/lib/kernel32/mem/isbad.c Modified: trunk/reactos/lib/kernel32/mem/local.c Modified: trunk/reactos/lib/kernel32/mem/procmem.c Modified: trunk/reactos/lib/kernel32/mem/resnotify.c Modified: trunk/reactos/lib/kernel32/mem/section.c Modified: trunk/reactos/lib/kernel32/misc/atom.c Modified: trunk/reactos/lib/kernel32/misc/chartype.c Modified: trunk/reactos/lib/kernel32/misc/comm.c Modified: trunk/reactos/lib/kernel32/misc/computername.c Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/dllmain.c Modified: trunk/reactos/lib/kernel32/misc/errormsg.c Modified: trunk/reactos/lib/kernel32/misc/handle.c Modified: trunk/reactos/lib/kernel32/misc/lang.c Modified: trunk/reactos/lib/kernel32/misc/lcformat.c Modified: trunk/reactos/lib/kernel32/misc/ldr.c Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/misc/profile.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/lib/kernel32/misc/sysinfo.c Modified: trunk/reactos/lib/kernel32/misc/time.c Modified: trunk/reactos/lib/kernel32/misc/timerqueue.c Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c Modified: trunk/reactos/lib/kernel32/misc/version.c Modified: trunk/reactos/lib/kernel32/process/cmdline.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/job.c Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/kernel32/process/session.c Modified: trunk/reactos/lib/kernel32/string/lstring.c Modified: trunk/reactos/lib/kernel32/synch/critical.c Modified: trunk/reactos/lib/kernel32/synch/intrlck.c Modified: trunk/reactos/lib/kernel32/synch/timer.c Modified: trunk/reactos/lib/kernel32/synch/wait.c Modified: trunk/reactos/lib/kernel32/thread/fiber.c Modified: trunk/reactos/lib/kernel32/thread/fls.c Modified: trunk/reactos/lib/kernel32/thread/thread.c Modified: trunk/reactos/lib/kernel32/thread/tls.c _____ Modified: trunk/reactos/lib/kernel32/debug/break.c --- trunk/reactos/lib/kernel32/debug/break.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/debug/break.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -19,7 +19,7 @@ BOOL WINAPI DebugBreakProcess(HANDLE Process) { NTSTATUS nErrCode = DbgUiIssueRemoteBreakin(Process); - + if(!NT_SUCCESS(nErrCode)) { SetLastErrorByStatus(nErrCode); _____ Modified: trunk/reactos/lib/kernel32/debug/output.c --- trunk/reactos/lib/kernel32/debug/output.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/debug/output.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -25,7 +25,7 @@ PSID psidSystem = NULL; PSID psidAdministrators = NULL; PSID psidEveryone = NULL; - + /* buffer for the DACL */ PVOID pDaclBuf = NULL; @@ -42,7 +42,7 @@ /* security descriptor of the mutex */ SECURITY_DESCRIPTOR sdMutexSecurity; - + /* attributes of the mutex object we'll create */ SECURITY_ATTRIBUTES saMutexAttribs = { @@ -115,7 +115,7 @@ 0, &psidAdministrators ); - + /* failure */ if(!NT_SUCCESS(nErrCode)) __leave; @@ -134,7 +134,7 @@ 0, &psidEveryone ); - + /* failure */ if(!NT_SUCCESS(nErrCode)) __leave; @@ -193,7 +193,7 @@ /* create the security descriptor */ nErrCode = RtlCreateSecurityDescriptor - ( + ( &sdMutexSecurity, SECURITY_DESCRIPTOR_REVISION ); @@ -230,7 +230,7 @@ #if 0 } #endif - + return hMutex; } @@ -311,13 +311,13 @@ { /* synchronize with other invocations of OutputDebugString */ WaitForSingleObject(hDBMonMutex, INFINITE); - + /* buffer of the system-wide debug message monitor */ hDBMonBuffer = OpenFileMappingW(SECTION_MAP_WRITE, FALSE, L"DBWIN_BUFFER"); - + /* couldn't open the buffer: send the string to the kernel debugger */ if(hDBMonBuffer == NULL) break; - + /* map the buffer */ pDBMonBuffer = MapViewOfFile ( @@ -327,16 +327,16 @@ 0, 0 ); - + /* couldn't map the buffer: send the string to the kernel debugger */ if(pDBMonBuffer == NULL) break; - + /* open the event signaling that the buffer can be accessed */ hDBMonBufferReady = OpenEventW(SYNCHRONIZE, FALSE, L"DBWIN_BUFFER_READY"); - + /* couldn't open the event: send the string to the kernel debugger */ if(hDBMonBufferReady == NULL) break; - + /* open the event to be signaled when the buffer has been filled */ hDBMonDataReady = OpenEventW(EVENT_MODIFY_STATE, FALSE, L"DBWIN_DATA_READY"); @@ -395,13 +395,13 @@ nRoundLen = PAGE_SIZE - sizeof(DWORD) - 1; else nRoundLen = nOutputStringLen; - + /* copy the current block into the buffer */ memcpy(pDBMonBuffer->Buffer, _OutputString, nOutputStringLen); - + /* null-terminate the current block */ pDBMonBuffer->Buffer[nOutputStringLen] = 0; - + /* signal that the data contains meaningful data and can be read */ SetEvent(hDBMonDataReady); } @@ -410,19 +410,19 @@ { /* output in blocks of 512 characters */ CHAR a_cBuffer[512]; - + /* write a maximum of 511 bytes */ if(nOutputStringLen > (sizeof(a_cBuffer) - 1)) nRoundLen = sizeof(a_cBuffer) - 1; else nRoundLen = nOutputStringLen; - + /* copy the current block */ memcpy(a_cBuffer, _OutputString, nRoundLen); - + /* null-terminate the current block */ a_cBuffer[nRoundLen] = 0; - + /* send the current block to the kernel debugger */ DbgPrint("%s", a_cBuffer); } @@ -490,7 +490,7 @@ { /* output the converted string */ OutputDebugStringA(strOut.Buffer); - + /* free the converted string */ RtlFreeAnsiString(&strOut); } _____ Modified: trunk/reactos/lib/kernel32/except/except.c --- trunk/reactos/lib/kernel32/except/except.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/except/except.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -23,7 +23,7 @@ { NTSTATUS Status; UINT ErrMode; - + Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, (PVOID)&ErrMode, @@ -34,22 +34,22 @@ SetLastErrorByStatus(Status); return 0; } - + return ErrMode; } /* * @implemented */ -UINT +UINT STDCALL SetErrorMode(UINT uMode) { UINT PrevErrMode; NTSTATUS Status; - + PrevErrMode = GetErrorMode(); - + Status = NtSetInformationProcess(NtCurrentProcess(), ProcessDefaultHardErrorMode, (PVOID)&uMode, @@ -83,7 +83,7 @@ * The address can point to anywhere within the module. */ static const char* -_module_name_from_addr(const void* addr, void **module_start_addr, +_module_name_from_addr(const void* addr, void **module_start_addr, char* psz, size_t nChars) { MEMORY_BASIC_INFORMATION mbi; @@ -200,12 +200,12 @@ } /* - * Returning EXCEPTION_EXECUTE_HANDLER means that the code in + * Returning EXCEPTION_EXECUTE_HANDLER means that the code in * the __except block will be executed. Normally this will end up in a * Terminate process. */ - return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_EXECUTE_HANDLER; } @@ -252,7 +252,7 @@ { ExceptionRecord.NumberParameters = nNumberOfArguments; for ( nNumberOfArguments = 0; - (nNumberOfArguments < ExceptionRecord.NumberParameters); + (nNumberOfArguments < ExceptionRecord.NumberParameters); nNumberOfArguments ++ ) { _____ Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -34,10 +34,10 @@ LPSTR nametab = NULL; DWORD Read, Ret; int i; - + Ret = BINARY_OS216; CurPos = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); - + /* read modref table */ if((SetFilePointer(hFile, mz->e_lfanew + ne->ne_modtab, NULL, FILE_BEGIN) == -1) || (!(modtab = HeapAlloc(GetProcessHeap(), 0, ne->ne_cmod * sizeof(WORD)))) || @@ -46,7 +46,7 @@ { goto broken; } - + /* read imported names table */ if((SetFilePointer(hFile, mz->e_lfanew + ne->ne_imptab, NULL, FILE_BEGIN) == -1) || (!(nametab = HeapAlloc(GetProcessHeap(), 0, ne->ne_enttab - ne->ne_imptab))) || @@ -55,7 +55,7 @@ { goto broken; } - + for(i = 0; i < ne->ne_cmod; i++) { LPSTR module; @@ -67,10 +67,10 @@ goto done; } } - + broken: DPRINT("InternalIsOS2OrOldWin(): Binary file seems to be broken\n"); - + done: HeapFree(GetProcessHeap(), 0, modtab); HeapFree(GetProcessHeap(), 0, nametab); @@ -100,14 +100,14 @@ } Header; char magic[4]; DWORD Read; - + if((SetFilePointer(hFile, 0, NULL, FILE_BEGIN) == -1) || (!ReadFile(hFile, &Header, sizeof(Header), &Read, NULL) || (Read != sizeof(Header)))) { return BINARY_UNKNOWN; } - + if(!memcmp(Header.elf.magic, "\177ELF", sizeof(Header.elf.magic))) { /* FIXME: we don't bother to check byte order, architecture, etc. */ @@ -120,7 +120,7 @@ } return BINARY_UNKNOWN; } - + /* Mach-o File with Endian set to Big Endian or Little Endian*/ if(Header.macho.magic == 0xFEEDFACE || Header.macho.magic == 0xECAFDEEF) @@ -133,7 +133,7 @@ } return BINARY_UNKNOWN; } - + /* Not ELF, try DOS */ if(Header.mz.e_magic == IMAGE_DOS_SIGNATURE) { @@ -150,7 +150,7 @@ { return BINARY_DOS; } - + /* Reading the magic field succeeded so * we will try to determine what type it is. */ @@ -162,14 +162,14 @@ { return BINARY_DOS; } - + /* FIXME - detect 32/64 bit */ - + if(FileHeader.Characteristics & IMAGE_FILE_DLL) return BINARY_PE_DLL32; return BINARY_PE_EXE32; } - + if(!memcmp(magic, "NE", 1)) { /* This is a Windows executable (NE) header. This can @@ -185,7 +185,7 @@ /* Couldn't read header, so abort. */ return BINARY_DOS; } - + switch(ne.ne_exetyp) { case 2: @@ -213,29 +213,29 @@ { HANDLE hFile; DWORD BinType; - + if(!lpApplicationName || !lpBinaryType) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + hFile = CreateFileW(lpApplicationName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if(hFile == INVALID_HANDLE_VALUE) { return FALSE; } - + BinType = InternalGetBinaryType(hFile); CloseHandle(hFile); - + switch(BinType) { case BINARY_UNKNOWN: { WCHAR *dot; - + /* * guess from filename */ @@ -288,7 +288,7 @@ return FALSE; } } - + DPRINT1("Invalid binary type returned!\n", BinType); return FALSE; } @@ -305,16 +305,16 @@ ) { PWCHAR ApplicationNameW; - + if(!lpApplicationName || !lpBinaryType) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + if (!(ApplicationNameW = FilenameA2W(lpApplicationName, FALSE))) return FALSE; - + return GetBinaryTypeW(ApplicationNameW, lpBinaryType); } _____ Modified: trunk/reactos/lib/kernel32/file/cnotify.c --- trunk/reactos/lib/kernel32/file/cnotify.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/cnotify.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -26,7 +26,7 @@ SetLastErrorByStatus(Status); return FALSE; } - + return TRUE; } @@ -101,16 +101,16 @@ - /* FIXME: We free the string alloced by RtlDosPathNameToNtPathName_U, but what + /* FIXME: We free the string alloced by RtlDosPathNameToNtPathName_U, but what * about the special case where the user can pass a \\?\ path? We must not free * the users buffer!. But should we even call RtlDosPathNameToNtPathName_U in that * case??? -Gunnar */ RtlFreeUnicodeString( &NtPathU); - - + + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); @@ -156,9 +156,9 @@ NULL,//Buffer, 0,//BufferLength, FILE_NOTIFY_CHANGE_SECURITY,//meaningless/ignored for subsequent calls, but must contain a valid flag - 0 //meaningless/ignored for subsequent calls + 0 //meaningless/ignored for subsequent calls ); - + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); @@ -170,8 +170,8 @@ extern VOID STDCALL -(ApcRoutine)(PVOID ApcContext, - struct _IO_STATUS_BLOCK* IoStatusBlock, +(ApcRoutine)(PVOID ApcContext, + struct _IO_STATUS_BLOCK* IoStatusBlock, ULONG Reserved); @@ -193,10 +193,10 @@ { NTSTATUS Status; IO_STATUS_BLOCK IoStatus; - + if (lpOverlapped ) lpOverlapped->Internal = STATUS_PENDING; - + Status = NtNotifyChangeDirectoryFile( hDirectory, lpOverlapped ? lpOverlapped->hEvent : NULL, @@ -207,18 +207,18 @@ nBufferLength, dwNotifyFilter, bWatchSubtree - ); - + ); + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); return FALSE; } - + /* NOTE: lpBytesReturned is undefined for asynch. operations */ *lpBytesReturned = IoStatus.Information; - + return TRUE; } _____ Modified: trunk/reactos/lib/kernel32/file/copy.c --- trunk/reactos/lib/kernel32/file/copy.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/copy.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -7,7 +7,7 @@ * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * 01/11/98 Created - * 07/02/99 Moved to seperate file + * 07/02/99 Moved to seperate file */ /* INCLUDES ****************************************************************/ @@ -53,7 +53,7 @@ { BytesCopied.QuadPart = 0; EndOfFileFound = FALSE; - CallbackReason = CALLBACK_STREAM_SWITCH; + CallbackReason = CALLBACK_STREAM_SWITCH; while (! EndOfFileFound && NT_SUCCESS(errCode) && (NULL == pbCancel || ! *pbCancel)) _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/create.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -36,9 +36,9 @@ { PWCHAR FileNameW; HANDLE FileHandle; - + DPRINT("CreateFileA(lpFileName %s)\n",lpFileName); - + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) return INVALID_HANDLE_VALUE; @@ -49,7 +49,7 @@ dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile); - + return FileHandle; } @@ -84,15 +84,15 @@ case CREATE_NEW: dwCreationDisposition = FILE_CREATE; break; - + case CREATE_ALWAYS: dwCreationDisposition = FILE_OVERWRITE_IF; break; - + case OPEN_EXISTING: dwCreationDisposition = FILE_OPEN; break; - + case OPEN_ALWAYS: dwCreationDisposition = FILE_OPEN_IF; break; @@ -100,7 +100,7 @@ case TRUNCATE_EXISTING: dwCreationDisposition = FILE_OVERWRITE; break; - + default: SetLastError(ERROR_INVALID_PARAMETER); return (INVALID_HANDLE_VALUE); @@ -116,7 +116,7 @@ SetLastError(ERROR_PATH_NOT_FOUND); return INVALID_HANDLE_VALUE; } - + DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); /* validate & translate the flags */ @@ -128,7 +128,7 @@ while waiting for file io to complete */ Flags |= FILE_SYNCHRONOUS_IO_NONALERT; } - + if(dwFlagsAndAttributes & FILE_FLAG_WRITE_THROUGH) Flags |= FILE_WRITE_THROUGH; @@ -137,13 +137,13 @@ if(dwFlagsAndAttributes & FILE_FLAG_RANDOM_ACCESS) Flags |= FILE_RANDOM_ACCESS; - + if(dwFlagsAndAttributes & FILE_FLAG_SEQUENTIAL_SCAN) Flags |= FILE_SEQUENTIAL_ONLY; - + if(dwFlagsAndAttributes & FILE_FLAG_DELETE_ON_CLOSE) Flags |= FILE_DELETE_ON_CLOSE; - + if(dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS) { if(dwDesiredAccess & GENERIC_ALL) @@ -167,7 +167,7 @@ Flags |= FILE_OPEN_NO_RECALL; FileAttributes = (dwFlagsAndAttributes & (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY)); - + /* handle may allways be waited on and querying attributes are allways allowed */ dwDesiredAccess |= SYNCHRONIZE | FILE_READ_ATTRIBUTES; @@ -212,7 +212,7 @@ return Reply.Data.GetInputHandleReply.InputHandle; } } - + if (hTemplateFile != NULL) { FILE_EA_INFORMATION EaInformation; @@ -239,7 +239,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return INVALID_HANDLE_VALUE; } - + Status = NtQueryEaFile(hTemplateFile, &IoStatusBlock, EaBuffer, @@ -249,7 +249,7 @@ 0, NULL, TRUE); - + if (NT_SUCCESS(Status)) { /* we successfully read the extended attributes, break the loop @@ -263,7 +263,7 @@ 0, EaBuffer); EaBuffer = NULL; - + if (Status != STATUS_BUFFER_TOO_SMALL) { /* unless we just allocated not enough memory, break the loop @@ -296,7 +296,7 @@ ObjectAttributes.SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; } - + if(!(dwFlagsAndAttributes & FILE_FLAG_POSIX_SEMANTICS)) ObjectAttributes.Attributes |= OBJ_CASE_INSENSITIVE; @@ -314,7 +314,7 @@ EaLength); RtlFreeUnicodeString(&NtPathU); - + /* free the extended attributes buffer if allocated */ if (EaBuffer != NULL) { @@ -340,14 +340,14 @@ { SetLastErrorByStatus (Status); } - + return INVALID_HANDLE_VALUE; } - + /* create with OPEN_ALWAYS (FILE_OPEN_IF) returns info = FILE_OPENED or FILE_CREATED create with CREATE_ALWAYS (FILE_OVERWRITE_IF) returns info = FILE_OVERWRITTEN or FILE_CREATED - */ + */ if (dwCreationDisposition == FILE_OPEN_IF) { SetLastError(IoStatusBlock.Information == FILE_OPENED ? ERROR_ALREADY_EXISTS : 0); _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -49,7 +49,7 @@ SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; } - + return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); } @@ -123,7 +123,7 @@ /* * @implemented * - * NOTE: Windows returns a dos/short (8.3) path + * NOTE: Windows returns a dos/short (8.3) path */ DWORD STDCALL @@ -221,7 +221,7 @@ UINT uSize ) { - return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); + return FilenameU2A_FitOrFail(lpBuffer, uSize, &SystemDirectory); } @@ -264,7 +264,7 @@ UINT uSize ) { - return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); + return FilenameU2A_FitOrFail(lpBuffer, uSize, &WindowsDirectory); } _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/delete.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -29,7 +29,7 @@ ) { PWCHAR FileNameW; - + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) return FALSE; _____ Modified: trunk/reactos/lib/kernel32/file/deviceio.c --- trunk/reactos/lib/kernel32/file/deviceio.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/deviceio.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -31,7 +31,7 @@ { BOOL FsIoCtl; NTSTATUS Status; - + FsIoCtl = ((dwIoControlCode >> 16) == FILE_DEVICE_FILE_SYSTEM); if (lpBytesReturned != NULL) @@ -42,7 +42,7 @@ if (lpOverlapped != NULL) { PVOID ApcContext; - + lpOverlapped->Internal = STATUS_PENDING; ApcContext = (((ULONG_PTR)lpOverlapped->hEvent & 0x1) ? NULL : lpOverlapped); @@ -88,7 +88,7 @@ else { IO_STATUS_BLOCK Iosb; - + if (FsIoCtl) { Status = NtFsControlFile(hDevice, @@ -165,18 +165,18 @@ { if (!bWait) { - /* can't use SetLastErrorByStatus(STATUS_PENDING) here, + /* can't use SetLastErrorByStatus(STATUS_PENDING) here, since STATUS_PENDING translates to ERROR_IO_PENDING */ SetLastError(ERROR_IO_INCOMPLETE); return FALSE; } - + hObject = lpOverlapped->hEvent ? lpOverlapped->hEvent : hFile; /* Wine delivers pending APC's while waiting, but Windows does not, nor do we... */ WaitStatus = WaitForSingleObject(hObject, INFINITE); - + if (WaitStatus == WAIT_FAILED) { DPRINT("Wait failed!\n"); @@ -186,7 +186,7 @@ } *lpNumberOfBytesTransferred = lpOverlapped->InternalHigh; - + if (!NT_SUCCESS(lpOverlapped->Internal)) { SetLastErrorByStatus(lpOverlapped->Internal); _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-05-09 01:46:46 UTC (rev 15171) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-05-09 01:46:57 UTC (rev 15172) @@ -35,7 +35,7 @@ ) { PWCHAR PathNameW; - + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) return FALSE; @@ -60,7 +60,7 @@ if (!(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, TRUE))) return FALSE; - + if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, FALSE))) { RtlFreeHeap (RtlGetProcessHeap (), @@ -68,7 +68,7 @@ TemplateDirectoryW); return FALSE; } - + ret = CreateDirectoryExW (TemplateDirectoryW, NewDirectoryW, lpSecurityAttributes); @@ -178,7 +178,7 @@ SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; } - + InitializeObjectAttributes(&ObjectAttributes, &NtTemplatePathU, OBJ_CASE_INSENSITIVE, @@ -204,7 +204,7 @@ SetLastErrorByStatus (Status); return FALSE; } - + for (;;) { Status = NtQueryInformationFile(TemplateHandle, @@ -222,7 +222,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; break; } - + Status = NtQueryEaFile(TemplateHandle, &IoStatusBlock, EaBuffer, @@ -260,13 +260,13 @@ break; } } - + NtClose(TemplateHandle); - + RtlFreeHeap (RtlGetProcessHeap (), 0, NtTemplatePathU.Buffer); - + if (!NT_SUCCESS(Status)) { /* free the he extended attributes buffer */ @@ -298,7 +298,7 @@ 0, EaBuffer); } - + SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; } @@ -355,7 +355,7 @@ ) { PWCHAR PathNameW; - + DPRINT("RemoveDirectoryA(%s)\n",lpPathName); if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) @@ -428,7 +428,7 @@ sizeof(FILE_DISPOSITION_INFORMATION), FileDispositionInformation); NtClose(DirectoryHandle); - + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus (Status); @@ -469,27 +469,27 @@ return 0; ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); - + if (!ret) return 0; - + if (ret > MAX_PATH) { SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; } - + ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); - + if (ret < nBufferLength && lpFilePart) { /* if the path closed with '\', FilePart is NULL */ - if (!FilePartW) + if (!FilePartW) *lpFilePart=NULL; else *lpFilePart = (FilePartW - BufferW) + lpBuffer; } - + DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); @@ -555,13 +555,13 @@ if (!ret) return 0; - + if (ret > MAX_PATH) { SetLastError(ERROR_FILENAME_EXCED_RANGE); return 0; } - + return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); } @@ -861,7 +861,7 @@ } else { - Name = RtlAllocateHeap(GetProcessHeap(), + Name = RtlAllocateHeap(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, (wcslen(lpFileName) + wcslen(lpExtension) + 1) * sizeof(WCHAR)); @@ -965,9 +965,9 @@ ) { UNICODE_STRING PathName; - + RtlInitUnicodeString(&PathName, lpPathName); - + RtlEnterCriticalSection(&DllLock); if(PathName.Length > 0) { @@ -988,7 +988,7 @@ } DllDirectory.Length = 0; DllDirectory.MaximumLength = PathName.Length + sizeof(WCHAR); - + RtlCopyUnicodeString(&DllDirectory, &PathName); } } @@ -1011,13 +1011,13 @@ ) { PWCHAR PathNameW=NULL; - [truncated at 1000 lines; 5947 more skipped]

19 years, 4 months

[sedwards] 15171: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-05-09 01:44:13 UTC (rev 15170) +++ trunk/reactos/lib/syssetup/install.c 2005-05-09 01:46:46 UTC (rev 15171) @@ -82,11 +82,11 @@ { PROCESS_INFORMATION ProcInfo; STARTUPINFO si; - + ZeroMemory(&si, sizeof(STARTUPINFO)); si.cb = sizeof(STARTUPINFO); - - if(CreateProcess(NULL, _T("vmwinst.exe"), NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, + + if(CreateProcess(NULL, _T("vmwinst.exe"), NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &ProcInfo)) { WaitForSingleObject(ProcInfo.hProcess, INFINITE); @@ -237,7 +237,7 @@ { case WM_INITDIALOG: SendDlgItemMessage(hWnd, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, - MAKELPARAM(0, 300)); + MAKELPARAM(0, 300)); SetTimer(hWnd, 0, 50, NULL); return TRUE; _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-05-09 01:44:13 UTC (rev 15170) +++ trunk/reactos/lib/syssetup/wizard.c 2005-05-09 01:46:46 UTC (rev 15171) @@ -108,8 +108,8 @@ PVOID GplTextLocked; PCHAR GplText; DWORD Size; - + switch (uMsg) { case WM_INITDIALOG: @@ -1128,11 +1128,11 @@ DWORD PrevSize; TOKEN_PRIVILEGES priv, previouspriv; BOOL Ret = FALSE; - + /* * enable the SeSystemtimePrivilege privilege */ - + if(OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken)) @@ -1156,7 +1156,7 @@ * we successfully enabled it, we're permitted to change the system time */ Ret = SetLocalTime(&SetupData->SystemTime); - + /* * for the sake of security, restore the previous status again */ @@ -1173,7 +1173,7 @@ } CloseHandle(hToken); } - + return Ret; } @@ -1302,7 +1302,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), 0); SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, 0, - MAKELPARAM(0, 300)); + MAKELPARAM(0, 300)); SetTimer(hwndDlg, 0, 50, NULL); break; @@ -1448,7 +1448,7 @@ ahpsp[5] = CreatePropertySheetPage(&psp); - /* Create the Process page + /* Create the Process page psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROCESSTITLE); psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PROCESSSUBTITLE);

19 years, 4 months

[sedwards] 15170: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/environment.c Modified: trunk/reactos/lib/userenv/internal.h Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/resources.h Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.c _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/desktop.c 2005-05-09 01:44:13 UTC (rev 15170) @@ -363,7 +363,7 @@ psl->lpVtbl->Release(psl); Ole32.fn.CoUninitialize(); - + UnloadDynamicImports(&Ole32); DPRINT ("AddDesktopItemW() done\n"); _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/environment.c 2005-05-09 01:44:13 UTC (rev 15170) @@ -51,9 +51,9 @@ DstValue.Length = 0; DstValue.MaximumLength = Length; - DstValue.Buffer = Buffer = LocalAlloc(LPTR, + DstValue.Buffer = Buffer = LocalAlloc(LPTR, Length); - + if (DstValue.Buffer == NULL) { DPRINT1("LocalAlloc() failed\n"); @@ -102,7 +102,7 @@ &DstValue); if (Buffer) LocalFree(Buffer); - + if (!NT_SUCCESS(Status)) { DPRINT1("RtlSetEnvironmentVariable() failed (Status %lx)\n", Status); _____ Modified: trunk/reactos/lib/userenv/internal.h --- trunk/reactos/lib/userenv/internal.h 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/internal.h 2005-05-09 01:44:13 UTC (rev 15170) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/misc.c 2005-05-09 01:44:13 UTC (rev 15170) @@ -108,7 +108,7 @@ /* Dynamic DLL loading interface **********************************************/ /* OLE32.DLL import table */ -DYN_MODULE DynOle32 = +DYN_MODULE DynOle32 = { L"ole32.dll", { _____ Modified: trunk/reactos/lib/userenv/resources.h --- trunk/reactos/lib/userenv/resources.h 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/resources.h 2005-05-09 01:44:13 UTC (rev 15170) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries _____ Modified: trunk/reactos/lib/userenv/setup.c --- trunk/reactos/lib/userenv/setup.c 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/setup.c 2005-05-09 01:44:13 UTC (rev 15170) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries _____ Modified: trunk/reactos/lib/userenv/userenv.c --- trunk/reactos/lib/userenv/userenv.c 2005-05-09 01:43:41 UTC (rev 15169) +++ trunk/reactos/lib/userenv/userenv.c 2005-05-09 01:44:13 UTC (rev 15170) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries

19 years, 4 months

[sedwards] 15169: strip whitespace from end of lines

by sedwards＠svn.reactos.com

strip whitespace from end of lines Modified: trunk/reactos/lib/advapi32/crypt/crypt.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_md4.c Modified: trunk/reactos/lib/advapi32/crypt/crypt_md5.c Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/advapi32/service/sctrl.c Modified: trunk/reactos/lib/advapi32/service/undoc.c Modified: trunk/reactos/lib/advapi32/token/privilege.c Modified: trunk/reactos/lib/advapi32/token/token.c Modified: trunk/reactos/lib/advapi32/winetests/crypt.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_lmhash.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_md4.c Modified: trunk/reactos/lib/advapi32/winetests/crypt_md5.c Modified: trunk/reactos/lib/advapi32/winetests/registry.c Modified: trunk/reactos/lib/advapi32/winetests/security.c _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt.c --- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -270,7 +270,7 @@ SetLastError(NTE_BAD_PROV_TYPE); return FALSE; } - + if (!phProv) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1001,19 +1001,19 @@ { DWORD numkeys; WCHAR *provNameW; - + RegQueryInfoKeyW(hKey, NULL, NULL, NULL, &numkeys, pcbProvName, NULL, NULL, NULL, NULL, NULL, NULL); - + if (!(provNameW = CRYPT_Alloc(*pcbProvName * sizeof(WCHAR)))) CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); - + RegEnumKeyExW(hKey, dwIndex, provNameW, pcbProvName, NULL, NULL, NULL, NULL); (*pcbProvName)++; *pcbProvName *= sizeof(WCHAR); - + CRYPT_Free(provNameW); - + if (dwIndex >= numkeys) CRYPT_ReturnLastError(ERROR_NO_MORE_ITEMS); } @@ -1022,7 +1022,7 @@ DWORD size = sizeof(DWORD); DWORD result; HKEY subkey; - + result = RegEnumKeyW(hKey, dwIndex, pszProvName, *pcbProvName / sizeof(WCHAR)); if (result) CRYPT_ReturnLastError(result); @@ -1123,7 +1123,7 @@ *pdwProvType += (*(--ch) - '0') * 10; *pdwProvType += (*(--ch) - '0') * 100; CRYPT_Free(keyname); - + result = RegQueryValueExA(hSubkey, "TypeName", NULL, &dwType, (LPBYTE)pszTypeName, pcbTypeName); if (result) CRYPT_ReturnLastError(result); @@ -1162,7 +1162,7 @@ /*********************************************************************** ******* * CryptExportKey (ADVAPI32.@) - * + * * Exports a cryptographic key from a CSP. * * PARAMS @@ -1280,18 +1280,18 @@ CRYPT_ReturnLastError(NTE_PROV_TYPE_NOT_DEF); } CRYPT_Free(keyname); - - result = RegQueryValueExA(hKey, "Name", NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + + result = RegQueryValueExA(hKey, "Name", NULL, NULL, (LPBYTE)pszProvName, pcbProvName); if (result) { if (result != ERROR_MORE_DATA) SetLastError(NTE_PROV_TYPE_ENTRY_BAD); else SetLastError(result); - + return FALSE; } - + RegCloseKey(hKey); return TRUE; } @@ -1498,7 +1498,7 @@ /*********************************************************************** ******* * CryptHashSessionKey (ADVAPI32.@) * - * PARAMS + * PARAMS * hHash [I] Handle to the hash object. * hKey [I] Handle to the key to be hashed. * dwFlags [I] Can be CRYPT_LITTLE_ENDIAN. @@ -1729,7 +1729,7 @@ if (dwFlags & ~(CRYPT_MACHINE_DEFAULT | CRYPT_USER_DEFAULT | CRYPT_DELETE_DEFAULT) || dwFlags == CRYPT_DELETE_DEFAULT) CRYPT_ReturnLastError(NTE_BAD_FLAGS); - + if (!(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT))) CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); if (RegOpenKeyA((dwFlags & CRYPT_USER_DEFAULT) ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, @@ -1739,7 +1739,7 @@ CRYPT_ReturnLastError(NTE_BAD_PROVIDER); } CRYPT_Free(keyname); - + if (dwFlags & CRYPT_DELETE_DEFAULT) { RegDeleteValueA(hTypeKey, "Name"); @@ -1759,14 +1759,14 @@ CRYPT_ReturnLastError(NTE_BAD_PROVIDER); } CRYPT_Free(keyname); - + if (RegSetValueExA(hTypeKey, "Name", 0, REG_SZ, (LPBYTE)pszProvName, strlen(pszProvName) + 1)) { RegCloseKey(hTypeKey); RegCloseKey(hProvKey); return FALSE; } - + RegCloseKey(hProvKey); } RegCloseKey(hTypeKey); _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_md4.c --- trunk/reactos/lib/advapi32/crypt/crypt_md4.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/crypt/crypt_md4.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -221,7 +221,7 @@ } /* - * Final wrapup - pad to 64-byte boundary with the bit pattern + * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) */ VOID WINAPI MD4Final(MD4_CTX *ctx) _____ Modified: trunk/reactos/lib/advapi32/crypt/crypt_md5.c --- trunk/reactos/lib/advapi32/crypt/crypt_md5.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/crypt/crypt_md5.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -231,7 +231,7 @@ } /* - * Final wrapup - pad to 64-byte boundary with the bit pattern + * Final wrapup - pad to 64-byte boundary with the bit pattern * 1 0* (64-bit count of bits processed, MSB-first) */ VOID WINAPI MD5Final( MD5_CTX *ctx ) _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -1229,7 +1229,7 @@ /*********************************************************************** ******* * RegEnumValueW [ADVAPI32.@] * @implemented - * + * * PARAMS * hkey [I] Handle to key to query * index [I] Index of value to query @@ -1260,7 +1260,7 @@ /* NT only checks count, not val_count */ if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - + status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(status)) { @@ -1690,7 +1690,7 @@ DPRINT("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); - + Status = MapDefaultKey (&KeyHandle, hKey); if (!NT_SUCCESS(Status)) { @@ -1738,13 +1738,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; LONG ErrorCode; NTSTATUS Status; - + /* check parameters */ if (hToken == NULL || dwOptions != 0 || phkResult == NULL) { return ERROR_INVALID_PARAMETER; } - + /* * Get the user sid from the token */ @@ -1789,14 +1789,14 @@ /* the information appears to have changed?! try again */ goto ReadTokenSid; } - + /* NOTE - as opposed to all other registry functions windows does indeed change the last error code in case the caller supplied a invalid handle for example! */ ErrorCode = RtlNtStatusToDosError (Status); return ErrorCode; } - + /* * Build the absolute path for the user's registry in the form * "\Registry\User\<SID>_Classes" @@ -1814,7 +1814,7 @@ { return RtlNtStatusToDosError (Status); } - + /* allocate enough memory for the entire key string */ UserClassesKeyRoot.Length = 0; UserClassesKeyRoot.MaximumLength = UserSidString.Length + @@ -1828,7 +1828,7 @@ RtlFreeUnicodeString(&UserSidString); return RtlNtStatusToDosError (Status); } - + /* build the string */ RtlAppendUnicodeToString(&UserClassesKeyRoot, UserClassesKeyPrefix); @@ -1836,7 +1836,7 @@ &UserSidString); RtlAppendUnicodeToString(&UserClassesKeyRoot, UserClassesKeySuffix); - + DPRINT("RegOpenUserClassesRoot: Absolute path: %wZ\n", &UserClassesKeyRoot); /* @@ -1848,19 +1848,19 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - + Status = NtOpenKey((PHANDLE)phkResult, samDesired, &ObjectAttributes); - + RtlFreeUnicodeString(&UserSidString); RtlFreeUnicodeString(&UserClassesKeyRoot); - + if (!NT_SUCCESS(Status)) { return RtlNtStatusToDosError (Status); } - + return ERROR_SUCCESS; } @@ -3037,7 +3037,7 @@ { cbData++; } - + RtlInitAnsiString (&AnsiString, NULL); AnsiString.Buffer = (PSTR)lpData; @@ -3116,7 +3116,7 @@ RtlInitUnicodeString (&ValueName, L""); } pValueName = &ValueName; - + if (((dwType == REG_SZ) || (dwType == REG_MULTI_SZ) || (dwType == REG_EXPAND_SZ)) && @@ -3155,12 +3155,12 @@ { LONG ret; HKEY hSubKey; - + if (dwType != REG_SZ) { return ERROR_INVALID_PARAMETER; } - + if (lpSubKey != NULL && lpSubKey[0] != '\0') { ret = RegCreateKeyA(hKey, @@ -3174,14 +3174,14 @@ } else hSubKey = hKey; - + ret = RegSetValueExA(hSubKey, NULL, 0, REG_SZ, (CONST BYTE*)lpData, strlen(lpData) + 1); - + if (hSubKey != hKey) { RegCloseKey(hSubKey); _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -53,7 +53,7 @@ * * RETURNS * Success: TRUE. pSecurityDescriptor contains the requested information. - * Failure: FALSE. lpnLengthNeeded contains the required space to return the info. + * Failure: FALSE. lpnLengthNeeded contains the required space to return the info. * * NOTES * The information returned is constrained by the callers access rights and @@ -476,7 +476,7 @@ UNICODE_STRING NameW; ANSI_STRING NameA; BOOL Ret; - + /* apparently Win doesn't check whether lpSize is valid at all! */ NameW.Length = 0; @@ -487,23 +487,23 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } - + NameA.Length = 0; NameA.MaximumLength = ((*lpSize) < 0xFFFF ? (USHORT)(*lpSize) : 0xFFFF); NameA.Buffer = lpszName; - + Ret = GetUserNameW(NameW.Buffer, lpSize); if(Ret) { RtlUnicodeStringToAnsiString(&NameA, &NameW, FALSE); NameA.Buffer[NameA.Length] = '\0'; - + *lpSize = NameA.Length + 1; } - + LocalFree(NameW.Buffer); - + return Ret; } @@ -634,18 +634,18 @@ UNICODE_STRING NameW, ReferencedDomainNameW, SystemNameW; DWORD szName, szReferencedDomainName; BOOL Ret; - + /* * save the buffer sizes the caller passed to us, as they may get modified and * we require the original values when converting back to ansi */ szName = *cchName; szReferencedDomainName = *cchReferencedDomainName; - + /* * allocate buffers for the unicode strings to receive */ - + if(szName > 0) { NameW.Length = 0; @@ -659,7 +659,7 @@ } else NameW.Buffer = NULL; - + if(szReferencedDomainName > 0) { ReferencedDomainNameW.Length = 0; @@ -677,11 +677,11 @@ } else ReferencedDomainNameW.Buffer = NULL; - + /* * convert the system name to unicode - if present */ - + if(lpSystemName != NULL) { ANSI_STRING SystemNameA; @@ -691,11 +691,11 @@ } else SystemNameW.Buffer = NULL; - + /* * it's time to call the unicode version */ - + Ret = LookupAccountSidW(SystemNameW.Buffer, lpSid, NameW.Buffer, @@ -713,15 +713,15 @@ if(lpName != NULL) { ANSI_STRING NameA; - + NameA.Length = 0; NameA.MaximumLength = ((szName <= 0xFFFF) ? (USHORT)szName : 0xFFFF); NameA.Buffer = lpName; - + RtlUnicodeStringToAnsiString(&NameA, &NameW, FALSE); NameA.Buffer[NameA.Length] = '\0'; } - + if(lpReferencedDomainName != NULL) { ANSI_STRING ReferencedDomainNameA; @@ -735,7 +735,7 @@ ReferencedDomainNameA.Buffer[ReferencedDomainNameA.Length] = '\0'; } } - + /* * free previously allocated buffers */ @@ -752,7 +752,7 @@ { LocalFree(ReferencedDomainNameW.Buffer); } - + return Ret; } @@ -1196,19 +1196,19 @@ * GetSecurityInfoExW EXPORTED */ DWORD WINAPI GetSecurityInfoExA( - HANDLE hObject, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, + HANDLE hObject, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, LPCSTR lpProvider, - LPCSTR lpProperty, - PACTRL_ACCESSA *ppAccessList, - PACTRL_AUDITA *ppAuditList, - LPSTR *lppOwner, + LPCSTR lpProperty, + PACTRL_ACCESSA *ppAccessList, + PACTRL_AUDITA *ppAuditList, + LPSTR *lppOwner, LPSTR *lppGroup ) { DPRINT1("GetSecurityInfoExA stub!\n"); - return ERROR_BAD_PROVIDER; + return ERROR_BAD_PROVIDER; } @@ -1216,19 +1216,19 @@ * GetSecurityInfoExW EXPORTED */ DWORD WINAPI GetSecurityInfoExW( - HANDLE hObject, - SE_OBJECT_TYPE ObjectType, - SECURITY_INFORMATION SecurityInfo, + HANDLE hObject, + SE_OBJECT_TYPE ObjectType, + SECURITY_INFORMATION SecurityInfo, LPCWSTR lpProvider, - LPCWSTR lpProperty, - PACTRL_ACCESSW *ppAccessList, - PACTRL_AUDITW *ppAuditList, - LPWSTR *lppOwner, + LPCWSTR lpProperty, + PACTRL_ACCESSW *ppAccessList, + PACTRL_AUDITW *ppAuditList, + LPWSTR *lppOwner, LPWSTR *lppGroup ) { DPRINT1("GetSecurityInfoExW stub!\n"); - return ERROR_BAD_PROVIDER; + return ERROR_BAD_PROVIDER; } _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -1,5 +1,5 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/service/sctrl.c _____ Modified: trunk/reactos/lib/advapi32/service/undoc.c --- trunk/reactos/lib/advapi32/service/undoc.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/service/undoc.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -1,5 +1,5 @@ /* $Id$ - * + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/service/undoc.c _____ Modified: trunk/reactos/lib/advapi32/token/privilege.c --- trunk/reactos/lib/advapi32/token/privilege.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/token/privilege.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/token/token.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -261,7 +261,7 @@ HANDLE NewToken; NTSTATUS Status; SECURITY_QUALITY_OF_SERVICE Sqos; - + Sqos.Length = sizeof(SECURITY_QUALITY_OF_SERVICE); Sqos.ImpersonationLevel = ImpersonationLevel; Sqos.ContextTrackingMode = 0; @@ -285,7 +285,7 @@ } ObjectAttributes.SecurityQualityOfService = &Sqos; - + Status = NtDuplicateToken (ExistingTokenHandle, dwDesiredAccess, &ObjectAttributes, @@ -334,26 +334,26 @@ DWORD i; PTOKEN_GROUPS lpGroups = NULL; TOKEN_TYPE TokenInformation; - + if (IsMember == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - + if (ExistingTokenHandle == NULL) { /* Get impersonation token of the calling thread */ if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &ExistingTokenHandle)) return FALSE; - + if (!DuplicateToken(ExistingTokenHandle, SecurityAnonymous, &AccessToken)) { CloseHandle(ExistingTokenHandle); goto ByeBye; } CloseHandle(ExistingTokenHandle); - ReleaseToken = TRUE; + ReleaseToken = TRUE; } else { @@ -369,7 +369,7 @@ else AccessToken = ExistingTokenHandle; } - + *IsMember = FALSE; /* Search in groups of the token */ if (!GetTokenInformation(AccessToken, TokenGroups, NULL, 0, &dwSize)) @@ -391,13 +391,13 @@ /* FIXME: Search in users of the token? */ DPRINT1("CheckTokenMembership() partially implemented!\n"); Result = TRUE; - + ByeBye: if (lpGroups != NULL) HeapFree(GetProcessHeap(), 0, lpGroups); if (ReleaseToken) CloseHandle(AccessToken); - + return Result; } _____ Modified: trunk/reactos/lib/advapi32/winetests/crypt.c --- trunk/reactos/lib/advapi32/winetests/crypt.c 2005-05-09 01:43:25 UTC (rev 15168) +++ trunk/reactos/lib/advapi32/winetests/crypt.c 2005-05-09 01:43:41 UTC (rev 15169) @@ -108,7 +108,7 @@ static void init_environment(void) { HCRYPTPROV hProv; - + /* Ensure that container "wine_test_keyset" does exist */ if (!pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) { @@ -155,39 +155,39 @@ BOOL result; HCRYPTPROV hProv; - /* Provoke all kinds of error conditions (which are easy to provoke). + /* Provoke all kinds of error conditions (which are easy to provoke). * The order of the error tests seems to match Windows XP's rsaenh.dll CSP, * but since this is likely to change between CSP versions, we don't check * this. Please don't change the order of tests. */ result = pCryptAcquireContextA(&hProv, NULL, NULL, 0, 0); ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); - + result = pCryptAcquireContextA(&hProv, NULL, NULL, 1000, 0); ok(!result && GetLastError()==NTE_BAD_PROV_TYPE, "%ld\n", GetLastError()); result = pCryptAcquireContextA(&hProv, NULL, NULL, NON_DEF_PROV_TYPE, 0); ok(!result && GetLastError()==NTE_PROV_TYPE_NOT_DEF, "%ld\n", GetLastError()); - + result = pCryptAcquireContextA(&hProv, szKeySet, szNonExistentProv, PROV_RSA_FULL, 0); ok(!result && GetLastError()==NTE_KEYSET_NOT_DEF, "%ld\n", GetLastError()); result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, NON_DEF_PROV_TYPE, 0); ok(!result && GetLastError()==NTE_PROV_TYPE_NO_MATCH, "%ld\n", GetLastError()); - + /* This test fails under Win2k SP4: result = TRUE, GetLastError() == ERROR_INVALID_PARAMETER SetLastError(0xdeadbeef); result = pCryptAcquireContextA(NULL, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%d/%ld\n", result, GetLastError()); */ - + /* Last not least, try to really acquire a context. */ hProv = 0; SetLastError(0xdeadbeef); result = pCryptAcquireContextA(&hProv, szKeySet, szRsaBaseProv, PROV_RSA_FULL, 0); ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); - if (hProv) + if (hProv) pCryptReleaseContext(hProv, 0); /* Try again, witch an empty ("\0") szProvider parameter */ @@ -196,7 +196,7 @@ result = pCryptAcquireContextA(&hProv, szKeySet, "", PROV_RSA_FULL, 0); ok(result && (GetLastError() == ERROR_ENVVAR_NOT_FOUND || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_RING2_STACK_IN_USE || GetLastError() == NTE_FAIL), "%d/%ld\n", result, GetLastError()); - if (hProv) + if (hProv) pCryptReleaseContext(hProv, 0); } @@ -209,17 +209,17 @@ BYTE temp; DWORD dwLen, dwTemp; - /* This is to document incorrect api usage in the + /* This is to document incorrect api usage in the * "Uru - Ages beyond Myst Demo" installer as reported by Paul Vriens. * - * The installer destroys a hash object after having released the context - * with which the hash was created. This is not allowed according to MSDN, - * since CryptReleaseContext destroys all hash and key objects belonging to - * the respective context. However, while wine used to crash, Windows is more + * The installer destroys a hash object after having released the context + * with which the hash was created. This is not allowed according to MSDN, + * since CryptReleaseContext destroys all hash and key objects belonging to + * the respective context. However, while wine used to crash, Windows is more * robust here and returns an ERROR_INVALID_PARAMETER code. */ - - result = pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, + + result = pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok (result, "%08lx\n", GetLastError()); if (!result) return; @@ -239,15 +239,15 @@ result = pCryptDestroyKey(hKey2); ok (result, "%ld\n", GetLastError()); - dwTemp = CRYPT_MODE_ECB; + dwTemp = CRYPT_MODE_ECB; result = pCryptSetKeyParam(hKey2, KP_MODE, (BYTE*)&dwTemp, sizeof(DWORD)); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); - - result = pCryptAcquireContextA(&hProv2, szBadKeySet, NULL, PROV_RSA_FULL, + + result = pCryptAcquireContextA(&hProv2, szBadKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); ok (result, "%ld\n", GetLastError()); if (!result) return; - + result = pCryptReleaseContext(hProv, 0); ok (result, "%ld\n", GetLastError()); if (!result) return; @@ -303,7 +303,7 @@ dwLen = 1; result = pCryptGetProvParam(hProv, 0, &temp, &dwLen, 0); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); - + result = pCryptGetUserKey(hProv, 0, &hKey2); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); @@ -336,37 +336,37 @@ result = pCryptDestroyHash(hHash); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); - + result = pCryptDestroyKey(hKey); ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); } -static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, +static BOOL FindProvRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszProvName, DWORD *pcbProvName, DWORD *pdwProvCount) { HKEY hKey; HKEY subkey; DWORD size = sizeof(DWORD); - + if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider", &hKey)) return FALSE; - - RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, + + RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwProvCount, pcbProvName, NULL, NULL, NULL, NULL, NULL, NULL); (*pcbProvName)++; - + if (!(*pszProvName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbProvName)))) return FALSE; - + RegEnumKeyEx(hKey, dwIndex, *pszProvName, pcbProvName, NULL, NULL, NULL, NULL); (*pcbProvName)++; RegOpenKey(hKey, *pszProvName, &subkey); RegQueryValueEx(subkey, "Type", NULL, NULL, (BYTE*)pdwProvType, &size); - + RegCloseKey(subkey); RegCloseKey(hKey); - + return TRUE; } @@ -378,7 +378,7 @@ DWORD dwType; DWORD provCount; DWORD dwIndex = 0; - + /* actual results */ CHAR *provider = NULL; DWORD providerLen; @@ -387,24 +387,24 @@ BOOL result; DWORD notNull = 5; DWORD notZeroFlags = 5; - + if(!pCryptEnumProvidersA) { trace("skipping CryptEnumProviders tests\n"); return; } - + if (!FindProvRegVals(dwIndex, &dwType, &pszProvName, &cbName, &provCount)) return; - + /* check pdwReserved flag for NULL */ result = pCryptEnumProvidersA(dwIndex, &notNull, 0, &type, NULL, &providerLen); ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "%ld\n", GetLastError()); - + /* check dwFlags == 0 */ result = pCryptEnumProvidersA(dwIndex, NULL, notZeroFlags, &type, NULL, &providerLen); ok(!result && GetLastError()==NTE_BAD_FLAGS, "%ld\n", GetLastError()); - + /* alloc provider to half the size required * cbName holds the size required */ providerLen = cbName / 2; @@ -417,7 +417,7 @@ LocalFree(provider); - /* loop through the providers to get the number of providers + /* loop through the providers to get the number of providers * after loop ends, count should be provCount + 1 so subtract 1 * to get actual number of providers */ count = 0; @@ -425,48 +425,48 @@ ; count--; ok(count==provCount, "expected %i, got %i\n", (int)provCount, (int)count); - + /* loop past the actual number of providers to get the error * ERROR_NO_MORE_ITEMS */ for (count = 0; count < provCount + 1; count++) result = pCryptEnumProvidersA(count, NULL, 0, &type, NULL, &providerLen); - ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", + ok(!result && GetLastError()==ERROR_NO_MORE_ITEMS, "expected %i, got %ld\n", ERROR_NO_MORE_ITEMS, GetLastError()); - + /* check expected versus actual values returned */ result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, NULL, &providerLen); ok(result && providerLen==cbName, "expected %i, got %i\n", (int)cbName, (int)providerLen); if (!(provider = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, providerLen)))) return; - + result = pCryptEnumProvidersA(dwIndex, NULL, 0, &type, provider, &providerLen); - ok(result && type==dwType, "expected %ld, got %ld\n", + ok(result && type==dwType, "expected %ld, got %ld\n", dwType, type); ok(result && !strcmp(pszProvName, provider), "expected %s, got %s\n", pszProvName, provider); - ok(result && cbName==providerLen, "expected %ld, got %ld\n", + ok(result && cbName==providerLen, "expected %ld, got %ld\n", cbName, providerLen); LocalFree(provider); } -static BOOL FindProvTypesRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszTypeName, +static BOOL FindProvTypesRegVals(DWORD dwIndex, DWORD *pdwProvType, LPSTR *pszTypeName, DWORD *pcbTypeName, DWORD *pdwTypeCount) { HKEY hKey; HKEY hSubKey; PSTR ch; - + if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types", &hKey)) return FALSE; - + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, pdwTypeCount, pcbTypeName, NULL, NULL, NULL, NULL, NULL, NULL)) return FALSE; (*pcbTypeName)++; - + if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) return FALSE; - + if (RegEnumKeyEx(hKey, dwIndex, *pszTypeName, pcbTypeName, NULL, NULL, NULL, NULL)) return FALSE; (*pcbTypeName)++; @@ -475,22 +475,22 @@ *pdwProvType = *(--ch) - '0'; *pdwProvType += (*(--ch) - '0') * 10; *pdwProvType += (*(--ch) - '0') * 100; - + if (RegOpenKey(hKey, *pszTypeName, &hSubKey)) return FALSE; - + if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, NULL, pcbTypeName)) return FALSE; if (!(*pszTypeName = ((LPSTR)LocalAlloc(LMEM_ZEROINIT, *pcbTypeName)))) return FALSE; - + if (RegQueryValueEx(hSubKey, "TypeName", NULL, NULL, *pszTypeName, pcbTypeName)) return FALSE; - + RegCloseKey(hSubKey); RegCloseKey(hKey); - + return TRUE; } @@ -501,7 +501,7 @@ LPSTR pszTypeName = NULL; DWORD cbTypeName; DWORD dwTypeCount; - + /* actual values */ DWORD index = 0; DWORD provType; @@ -511,29 +511,29 @@ DWORD result; DWORD notNull = 5; DWORD notZeroFlags = 5; - + if(!pCryptEnumProviderTypesA) { trace("skipping CryptEnumProviderTypes tests\n"); return; } - + if (!FindProvTypesRegVals(index, &dwProvType, &pszTypeName, &cbTypeName, &dwTypeCount)) { trace("could not find provider types in registry, skipping the test\n"); return; } - + /* check pdwReserved for NULL */ result = pCryptEnumProviderTypesA(index, &notNull, 0, &provType, typeName, &typeNameSize); - ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", + ok(!result && GetLastError()==ERROR_INVALID_PARAMETER, "expected %i, got %ld\n", ERROR_INVALID_PARAMETER, GetLastError()); - + /* check dwFlags == zero */ result = pCryptEnumProviderTypesA(index, NULL, notZeroFlags, &provType, typeName, &typeNameSize); ok(!result && GetLastError()==NTE_BAD_FLAGS, "expected %i, got %ld\n", ERROR_INVALID_PARAMETER, GetLastError()); - + /* alloc provider type to half the size required * cbTypeName holds the size required */ typeNameSize = cbTypeName / 2; @@ -547,10 +547,10 @@ ok(!result && GetLastError()==ERROR_MORE_DATA, "expected 0/ERROR_MORE_DATA, got %d/%08lx\n", result, GetLastError()); */ - + LocalFree(typeName); - - /* loop through the provider types to get the number of provider types + + /* loop through the provider types to get the number of provider types * after loop ends, count should be dwTypeCount + 1 so subtract 1 * to get actual number of provider types */ typeCount = 0; [truncated at 1000 lines; 338 more skipped]

19 years, 4 months

← Newer
1
...
51
52
53
54
55
56
57
...
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