Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51608: [USBSTOR] - Implement retrieving drive capacity - Use constant from scsi.h instead of defining own format - Don't reset returned parameters length to zero, as ioctl handler migh...
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 16:25:01 2011 New Revision: 51608 URL: http://svn.reactos.org/svn/reactos?rev=51608&view=rev Log: [USBSTOR] - Implement retrieving drive capacity - Use constant from scsi.h instead of defining own format - Don't reset returned parameters length to zero, as ioctl handler might set it Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -18,12 +18,70 @@ IN OUT PSCSI_REQUEST_BLOCK Request, IN PPDO_DEVICE_EXTENSION PDODeviceExtension) { - DPRINT1("USBSTOR_HandleExecuteSCSI\n"); - - DbgBreakPoint(); - - Request->SrbStatus = SRB_STATUS_ERROR; - return STATUS_NOT_SUPPORTED; + PCDB pCDB; + NTSTATUS Status; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); + + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // sanity checks + // + ASSERT(Request->DataBuffer); + + if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) + { + // + // retrieve capacity extended structure + // + Status = USBSTOR_SendCapacityCmd(DeviceObject, (PREAD_CAPACITY_DATA_EX)Request->DataBuffer, NULL); + } + else + { + // + // sanity check + // + ASSERT(Request->DataTransferLength == sizeof(READ_CAPACITY_DATA)); + + // + // retrieve capacity + // + Status = USBSTOR_SendCapacityCmd(DeviceObject, NULL, (PREAD_CAPACITY_DATA)Request->DataBuffer); + } + DPRINT1("USBSTOR_SendCapacityCmd %x\n", Status); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = Request->DataTransferLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve capacity + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else + { + UNIMPLEMENTED; + Request->SrbStatus = SRB_STATUS_ERROR; + Status = STATUS_NOT_SUPPORTED; + DbgBreakPoint(); + } + + return Status; } NTSTATUS @@ -63,7 +121,7 @@ { DPRINT1("SRB_FUNCTION_EXECUTE_SCSI\n"); Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Irp, Request, PDODeviceExtension); - + break; } case SRB_FUNCTION_RELEASE_DEVICE: { @@ -411,14 +469,13 @@ } } - - NTSTATUS USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + NTSTATUS Status; // // get current stack location @@ -430,17 +487,48 @@ // // query property // - return USBSTOR_HandleQueryProperty(DeviceObject, Irp); - } - - DPRINT1("USBSTOR_HandleDeviceControl IoControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); - DPRINT1("USBSTOR_HandleDeviceControl InputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); - DPRINT1("USBSTOR_HandleDeviceControl OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); - DPRINT1("USBSTOR_HandleDeviceControl InputBuffer %x\n", IoStack->Parameters.DeviceIoControl.Type3InputBuffer); - DPRINT1("USBSTOR_HandleDeviceControl SystemBuffer %x\n", Irp->AssociatedIrp.SystemBuffer); - DPRINT1("USBSTOR_HandleDeviceControl UserBuffer %x\n", Irp->UserBuffer); - DPRINT1("USBSTOR_HandleDeviceControl MdlAddress %x\n", Irp->MdlAddress); - - - return STATUS_NOT_SUPPORTED; + Status = USBSTOR_HandleQueryProperty(DeviceObject, Irp); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_GET_ADDRESS) + { + // + // query get scsi address + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_GET_ADDRESS NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH) + { + // + // query scsi pass through + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_SCSI_PASS_THROUGH_DIRECT) + { + // + // query scsi pass through direct + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_SCSI_PASS_THROUGH_DIRECT NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER) + { + // + // query serial number + // + DPRINT1("USBSTOR_HandleDeviceControl IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER NOT implemented\n"); + Status = STATUS_NOT_SUPPORTED; + } + else + { + // + // unsupported + // + DPRINT("USBSTOR_HandleDeviceControl IoControl %x not supported\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + } + + return Status; } Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -300,7 +300,6 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PCBW OutControl; - // // get PDO device extension // @@ -322,7 +321,7 @@ // initialize inquiry cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); - Cmd.Code = UFI_INQURIY_CODE; + Cmd.Code = SCSIOP_INQUIRY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); @@ -404,3 +403,123 @@ // return Status; } + +NTSTATUS +USBSTOR_SendCapacityCmd( + IN PDEVICE_OBJECT DeviceObject, + OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, + OUT PREAD_CAPACITY_DATA CapacityData) +{ + UFI_INQUIRY_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PUFI_CAPACITY_RESPONSE Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate capacity response + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, sizeof(UFI_CAPACITY_RESPONSE)); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize inquiry cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); + Cmd.Code = SCSIOP_INQUIRY; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); + + // + // now send inquiry cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now send inquiry response + // + Status = USBSTOR_SendData(DeviceObject, sizeof(UFI_CAPACITY_RESPONSE), Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + DPRINT1("LastLogicalBlockAddress %lu\n", Response->LastLogicalBlockAddress); + DPRINT1("BlockLength %lu\n", Response->BlockLength); + DPRINT1("Medium Length %lu\n", Response->BlockLength * Response->LastLogicalBlockAddress); + + // + // store response + // + if (CapacityDataEx) + { + CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; + CapacityDataEx->BytesPerBlock = Response->BlockLength; + } + else + { + CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; + CapacityData->BytesPerBlock = Response->BlockLength; + } + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +} + Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Fri May 6 16:25:01 2011 @@ -141,9 +141,16 @@ // Status = USBSTOR_HandleDeviceControl(DeviceObject, Irp); - Irp->IoStatus.Information = 0; + // + // complete request + // Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // done + // + return Status; } @@ -160,7 +167,6 @@ // Status = USBSTOR_HandleInternalDeviceControl(DeviceObject, Irp); - Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 6 16:25:01 2011 @@ -14,6 +14,7 @@ #include <stdio.h> #include <wdmguid.h> #include <classpnp.h> +#include <scsi.h> #define USB_STOR_TAG 'sbsu' #define USB_MAXCHILDREN (16) @@ -101,7 +102,6 @@ C_ASSERT(sizeof(UFI_INQUIRY_CMD) == 12); -#define UFI_INQURIY_CODE 0x12 #define UFI_INQUIRY_CMD_LEN 0x6 // @@ -122,6 +122,34 @@ C_ASSERT(sizeof(UFI_INQUIRY_RESPONSE) == 36); +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI read capacity cmd +// +typedef struct +{ + UCHAR Code; // operation code 0x25 + UCHAR LUN; // lun address + UCHAR LBA[4]; // logical block address, should be zero + UCHAR Reserved1[2]; // reserved 0x00 + UCHAR PMI; // PMI = 0x00 + UCHAR Reserved2[3]; // reserved 0x00 +}UFI_CAPACITY_CMD, *PUFI_CAPACITY_CMD; + +C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); + +#define UFI_CAPACITY_CMD_LEN 0xA //FIXME support length 16 too if requested + +// +// UFI Read Capcacity command response +// +typedef struct +{ + ULONG LastLogicalBlockAddress; // last logical block address + ULONG BlockLength; // block length in bytes +}UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; + + //--------------------------------------------------------------------- // // fdo.c routines @@ -214,6 +242,11 @@ USBSTOR_SendInquiryCmd( IN PDEVICE_OBJECT DeviceObject); +NTSTATUS +USBSTOR_SendCapacityCmd( + IN PDEVICE_OBJECT DeviceObject, + OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, + OUT PREAD_CAPACITY_DATA CapacityData); //--------------------------------------------------------------------- //

1 0

[janderwald] 51607: [USBSTOR] - Implement retrieving adapter descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Implement retrieving device descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Next Function to imp...
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 13:29:27 2011 New Revision: 51607 URL: http://svn.reactos.org/svn/reactos?rev=51607&view=rev Log: [USBSTOR] - Implement retrieving adapter descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Implement retrieving device descriptor (IOCTL_STORAGE_QUERY_PROPERTY) - Next Function to implement is SRB_FUNCTION_EXECUTE_SCSI Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 13:29:27 2011 @@ -143,6 +143,276 @@ return Status; } +ULONG +USBSTOR_GetFieldLength( + IN PUCHAR Name, + IN ULONG MaxLength) +{ + ULONG Index; + ULONG LastCharacterPosition = 0; + + // + // scan the field and return last positon which contains a valid character + // + for(Index = 0; Index < MaxLength; Index++) + { + if (Name[Index] != ' ') + { + // + // trim white spaces from field + // + LastCharacterPosition = Index; + } + } + + // + // convert from zero based index to length + // + return LastCharacterPosition + 1; +} + +NTSTATUS +USBSTOR_HandleQueryProperty( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PSTORAGE_PROPERTY_QUERY PropertyQuery; + PSTORAGE_DESCRIPTOR_HEADER DescriptorHeader; + PSTORAGE_ADAPTER_DESCRIPTOR AdapterDescriptor; + ULONG FieldLengthVendor, FieldLengthProduct, FieldLengthRevision, TotalLength; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUFI_INQUIRY_RESPONSE InquiryData; + PSTORAGE_DEVICE_DESCRIPTOR DeviceDescriptor; + PUCHAR Buffer; + + DPRINT1("USBSTOR_HandleQueryProperty\n"); + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity check + // + ASSERT(IoStack->Parameters.DeviceIoControl.InputBufferLength >= sizeof(STORAGE_PROPERTY_QUERY)); + ASSERT(Irp->AssociatedIrp.SystemBuffer); + + // + // get property query + // + PropertyQuery = (PSTORAGE_PROPERTY_QUERY)Irp->AssociatedIrp.SystemBuffer; + + // + // check property type + // + if (PropertyQuery->PropertyId != StorageDeviceProperty && + PropertyQuery->PropertyId != StorageAdapterProperty) + { + // + // only device property / adapter property are supported + // + return STATUS_INVALID_PARAMETER_1; + } + + // + // check query type + // + if (PropertyQuery->QueryType == PropertyExistsQuery) + { + // + // device property / adapter property is supported + // + return STATUS_SUCCESS; + } + + if (PropertyQuery->QueryType != PropertyStandardQuery) + { + // + // only standard query and exists query are supported + // + return STATUS_INVALID_PARAMETER_2; + } + + // + // check if it is a device property + // + if (PropertyQuery->PropertyId == StorageDeviceProperty) + { + DPRINT1("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension); + + // + // get inquiry data + // + InquiryData = (PUFI_INQUIRY_RESPONSE)PDODeviceExtension->InquiryData; + ASSERT(InquiryData); + + // + // compute extra parameters length + // + FieldLengthVendor = USBSTOR_GetFieldLength(InquiryData->Vendor, 8); + FieldLengthProduct = USBSTOR_GetFieldLength(InquiryData->Product, 16); + FieldLengthRevision = USBSTOR_GetFieldLength(InquiryData->Revision, 4); + + // + // FIXME handle serial number + // + + // + // total length required is sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLength + 3 extra null bytes - 1 + // -1 due STORAGE_DEVICE_DESCRIPTOR contains one byte length of parameter data + // + TotalLength = sizeof(STORAGE_DEVICE_DESCRIPTOR) + FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 2; + + // + // check if output buffer is long enough + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < TotalLength) + { + // + // buffer too small + // + DescriptorHeader = (PSTORAGE_DESCRIPTOR_HEADER)Irp->AssociatedIrp.SystemBuffer; + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // + // return required size + // + DescriptorHeader->Version = TotalLength; + DescriptorHeader->Size = TotalLength; + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + return STATUS_SUCCESS; + } + + // + // get device descriptor + // + DeviceDescriptor = (PSTORAGE_DEVICE_DESCRIPTOR)Irp->AssociatedIrp.SystemBuffer; + + // + // initialize device descriptor + // + DeviceDescriptor->Version = TotalLength; + DeviceDescriptor->Size = TotalLength; + DeviceDescriptor->DeviceType = InquiryData->DeviceType; + DeviceDescriptor->DeviceTypeModifier = (InquiryData->RMB & 0x7F); + DeviceDescriptor->RemovableMedia = FALSE; //FIXME check if floppy + DeviceDescriptor->CommandQueueing = FALSE; + DeviceDescriptor->BusType = BusTypeUsb; + DeviceDescriptor->VendorIdOffset = sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR); + DeviceDescriptor->ProductIdOffset = DeviceDescriptor->VendorIdOffset + FieldLengthVendor + 1; + DeviceDescriptor->ProductRevisionOffset = DeviceDescriptor->ProductIdOffset + FieldLengthProduct + 1; + DeviceDescriptor->SerialNumberOffset = 0; //FIXME + DeviceDescriptor->RawPropertiesLength = FieldLengthVendor + FieldLengthProduct + FieldLengthRevision + 3; + + // + // copy descriptors + // + Buffer = (PUCHAR)((ULONG_PTR)DeviceDescriptor + sizeof(STORAGE_DEVICE_DESCRIPTOR) - sizeof(UCHAR)); + + // + // copy vendor + // + RtlCopyMemory(Buffer, InquiryData->Vendor, FieldLengthVendor); + Buffer[FieldLengthVendor] = '\0'; + Buffer += FieldLengthVendor + 1; + + // + // copy product + // + RtlCopyMemory(Buffer, InquiryData->Product, FieldLengthProduct); + Buffer[FieldLengthProduct] = '\0'; + Buffer += FieldLengthProduct + 1; + + // + // copy revision + // + RtlCopyMemory(Buffer, InquiryData->Revision, FieldLengthRevision); + Buffer[FieldLengthRevision] = '\0'; + Buffer += FieldLengthRevision + 1; + + // + // TODO: copy revision + // + + DPRINT("Vendor %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->VendorIdOffset)); + DPRINT("Product %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductIdOffset)); + DPRINT("Revision %s\n", (LPCSTR)((ULONG_PTR)DeviceDescriptor + DeviceDescriptor->ProductRevisionOffset)); + + // + // done + // + Irp->IoStatus.Information = TotalLength; + return STATUS_SUCCESS; + } + else + { + // + // adapter property query request + // + DPRINT1("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) + { + // + // buffer too small + // + DescriptorHeader = (PSTORAGE_DESCRIPTOR_HEADER)Irp->AssociatedIrp.SystemBuffer; + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(STORAGE_DESCRIPTOR_HEADER)); + + // + // return required size + // + DescriptorHeader->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + DescriptorHeader->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + + Irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); + return STATUS_SUCCESS; + } + + // + // get adapter descriptor, information is returned in the same buffer + // + AdapterDescriptor = (PSTORAGE_ADAPTER_DESCRIPTOR)Irp->AssociatedIrp.SystemBuffer; + + // + // fill out descriptor + // + AdapterDescriptor->Version = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + AdapterDescriptor->Size = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + AdapterDescriptor->MaximumTransferLength = MAXULONG; //FIXME compute some sane value + AdapterDescriptor->MaximumPhysicalPages = 25; //FIXME compute some sane value + AdapterDescriptor->AlignmentMask = 0; + AdapterDescriptor->AdapterUsesPio = FALSE; + AdapterDescriptor->AdapterScansDown = FALSE; + AdapterDescriptor->CommandQueueing = FALSE; + AdapterDescriptor->AcceleratedTransfer = FALSE; + AdapterDescriptor->BusType = BusTypeUsb; + AdapterDescriptor->BusMajorVersion = 0x2; //FIXME verify + AdapterDescriptor->BusMinorVersion = 0x00; //FIXME + + // + // store returned length + // + Irp->IoStatus.Information = sizeof(STORAGE_ADAPTER_DESCRIPTOR); + + // + // done + // + return STATUS_SUCCESS; + } +} + + + NTSTATUS USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -154,6 +424,14 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_QUERY_PROPERTY) + { + // + // query property + // + return USBSTOR_HandleQueryProperty(DeviceObject, Irp); + } DPRINT1("USBSTOR_HandleDeviceControl IoControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); DPRINT1("USBSTOR_HandleDeviceControl InputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.InputBufferLength); @@ -163,7 +441,6 @@ DPRINT1("USBSTOR_HandleDeviceControl UserBuffer %x\n", Irp->UserBuffer); DPRINT1("USBSTOR_HandleDeviceControl MdlAddress %x\n", Irp->MdlAddress); - //IOCTL_STORAGE_QUERY_PROPERTY return STATUS_NOT_SUPPORTED; }

1 0

[gedmurphy] 51606: Create a branch for Thomas Faber's work on creating a kernel mode test suite for the Google Summer of Code project
by gedmurphy＠svn.reactos.org 06 May '11

06 May '11

Author: gedmurphy Date: Fri May 6 13:25:33 2011 New Revision: 51606 URL: http://svn.reactos.org/svn/reactos?rev=51606&view=rev Log: Create a branch for Thomas Faber's work on creating a kernel mode test suite for the Google Summer of Code project Added: branches/GSoC_2011/KMTestSuite/ (props changed) - copied from r51164, trunk/rostests/ Propchange: branches/GSoC_2011/KMTestSuite/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri May 6 13:25:33 2011 @@ -1,0 +1,4 @@ +GNUmakefile +*.vcproj +*.user +*.cbp Propchange: branches/GSoC_2011/KMTestSuite/ ------------------------------------------------------------------------------ svn:mergeinfo = /branches/ros-amd64-bringup/rostests:44459,44462,44537

1 0

[tkreuzer] 51605: [GDI FONT DRIVER] - Don't return FM_INFO_RETURNS_OUTLINES, we don't support it yet - In FtfdCreateFontInstance distinguish between scaling transformation and generic transformatio...
by tkreuzer＠svn.reactos.org 06 May '11

06 May '11

Author: tkreuzer Date: Fri May 6 10:38:36 2011 New Revision: 51605 URL: http://svn.reactos.org/svn/reactos?rev=51605&view=rev Log: [GDI FONT DRIVER] - Don't return FM_INFO_RETURNS_OUTLINES, we don't support it yet - In FtfdCreateFontInstance distinguish between scaling transformation and generic transformations, handle the former - Calculate font size and a number of other coordinates in device space when instantiating a font - Return these transformed coordinates in FtfdQueryMaxExtents Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Fri May 6 10:38:36 2011 @@ -107,7 +107,7 @@ if (pface->cRuns > 1) pifi->flInfo |= FM_INFO_NOT_CONTIGUOUS; if (pface->ulFontFormat != FMT_FNT) - pifi->flInfo |= FM_INFO_RETURNS_OUTLINES | FM_INFO_ARB_XFORMS; + pifi->flInfo |= /*FM_INFO_RETURNS_OUTLINES |*/ FM_INFO_ARB_XFORMS; pifi->flInfo |= FM_INFO_RIGHT_HANDED; // FIXME: how to determine? /* Font style */ @@ -734,7 +734,6 @@ if (ppjTable) *ppjTable = pjTable; if (pcjTable) *pcjTable = cjTable; - /* Check if we shall copy data */ if (pjBuf) { Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Fri May 6 10:38:36 2011 @@ -80,12 +80,30 @@ PFTFD_FACE apface[1]; } FTFD_FILE, *PFTFD_FILE; +typedef union _FTFD_DEVICEMETRICS +{ + POINTL aptl[7]; + struct + { + POINTFIX ptfxMaxAscender; + POINTFIX ptfxMaxDescender; + POINTL ptlUnderline1; + POINTL ptlStrikeout; + POINTL ptlULThickness; + POINTL ptlSOThickness; + SIZEL sizlMax; + }; +} FTFD_DEVICEMETRICS; + typedef struct { FONTOBJ *pfo; PFTFD_FILE pfile; + PFTFD_FACE pface; ULONG iFace; FT_Face ftface; + FD_XFORM fdxQuantized; + FTFD_DEVICEMETRICS metrics; HGLYPH hgSelected; ULONG cjSelected; } FTFD_FONT, *PFTFD_FONT; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Fri May 6 10:38:36 2011 @@ -9,6 +9,8 @@ /** Private Interface *********************************************************/ +#define FLOATL_1 0x3f800000 + #define GLYPHBITS_SIZE(cx, cy, bpp) \ (FIELD_OFFSET(GLYPHBITS, aj) + ((((cx * bpp) + 31) >> 5) * cy * 4)) @@ -18,10 +20,17 @@ FONTOBJ *pfo) { PFTFD_FILE pfile = (PFTFD_FILE)pfo->iFile; + PFTFD_FACE pface = pfile->apface[pfo->iFace - 1]; PFTFD_FONT pfont; XFORMOBJ* pxo; + XFORML xform; + FLOATOBJ_XFORM foxform; FT_Error fterror; FT_Face ftface; + FT_Matrix ftmatrix; + ULONG iComplexity; + LONG xScale, yScale; + FTFD_DEVICEMETRICS *pmetrics; /* Allocate a font structure */ pfont = EngAllocMem(0, sizeof(FTFD_FONT), 0); @@ -34,6 +43,7 @@ pfont->pfo = pfo; pfont->pfile = pfile; pfont->iFace = pfo->iFace; + pfont->pface = pface; pfont->hgSelected = -1; /* Create a freetype face */ @@ -53,24 +63,108 @@ pfont->ftface = ftface; pxo = FONTOBJ_pxoGetXform(pfo); - - // divide into scaling and rotation / shearing - - fterror = FT_Set_Char_Size(ftface, - 0, - 16 * 64, - pfo->sizLogResPpi.cx, - pfo->sizLogResPpi.cy); - if (fterror) - { - /* Failure! */ - DbgPrint("Error setting face size\n"); - return NULL; - } - - /* Set non-orthogonal transformation */ - // FT_Set_Transform - + if (!pxo) + { + // unhandled yet + __debugbreak(); + } + + /* Get a FLOATOBJ_XFORM matrix */ + iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &foxform); + if (iComplexity == DDI_ERROR) + { + __debugbreak(); + } + + /* Check if there is rotation / shearing (cannot use iComplexity!?) */ + if (foxform.eM12.ul1 != 0 || foxform.eM12.ul2 != 0 || + foxform.eM21.ul1 != 0 || foxform.eM21.ul2 != 0) + { + __debugbreak(); + // FIXME: need to calculate scaling + + /* initialize a matrix */ + ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / + pfo->sizLogResPpi.cx; + ftmatrix.xy = 0x00000000; + ftmatrix.yx = 0x00000000; + ftmatrix.yy = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / + pfo->sizLogResPpi.cy; + + /* Apply the XFORMOBJ to the matrix */ + XFORMOBJ_bApplyXform(pxo, XF_LTOL, 2, &ftmatrix, &ftmatrix); + + /* Set non-orthogonal transformation */ + // FT_Set_Transform + + } + else + { + /* The font sizes are calculated from the em height, multiplied with + * the diagonal matrix coefficients. Since the given xform translates + * into pixels and we need points (FT_Set_Char_Size allows higher + * precision than FT_Set_Pixel_Sizes), we multiply with 72 / dpi. + * The value is multiplied with 64 to yield a 26.6 fixed float. */ + xScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cx; + FLOATOBJ_MulLong(&foxform.eM11, xScale); + yScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cy; + FLOATOBJ_MulLong(&foxform.eM22, yScale); + + /* Get the final scaling values in 26.6 fixed float format */ + xScale = FLOATOBJ_GetLong(&foxform.eM11); + yScale = FLOATOBJ_GetLong(&foxform.eM22); + + /* Set the x and y character size for the font */ + fterror = FT_Set_Char_Size(ftface, + xScale, + yScale, + pfo->sizLogResPpi.cx, + pfo->sizLogResPpi.cy); + if (fterror) + { + /* Failure! */ + DbgPrint("Error setting face size\n"); + return NULL; + } + + } + + // FIXME: quantize to 16.16 fixpoint + XFORMOBJ_iGetXform(pxo, &xform); + pfont->fdxQuantized.eXX = xform.eM11; + pfont->fdxQuantized.eXY = xform.eM12; + pfont->fdxQuantized.eYX = xform.eM21; + pfont->fdxQuantized.eYY = xform.eM22; + + /* Prepare required coordinates in font space */ + pmetrics = &pfont->metrics; + pmetrics->ptfxMaxAscender.x = 0; + pmetrics->ptfxMaxAscender.y = ftface->bbox.yMax << 4; // FIXME: not exact + pmetrics->ptfxMaxDescender.x = 0; + pmetrics->ptfxMaxDescender.y = -ftface->bbox.yMin << 4; // FIXME: not exact + pmetrics->ptlUnderline1.x = 0; + pmetrics->ptlUnderline1.y = -pface->ifiex.ifi.fwdUnderscorePosition; + pmetrics->ptlStrikeout.x = 0; + pmetrics->ptlStrikeout.y = -pface->ifiex.ifi.fwdStrikeoutPosition;; + pmetrics->ptlULThickness.x = 0; + pmetrics->ptlULThickness.y = pface->ifiex.ifi.fwdUnderscoreSize; + pmetrics->ptlSOThickness.x = 0; + pmetrics->ptlSOThickness.y = pface->ifiex.ifi.fwdStrikeoutSize; + pmetrics->sizlMax.cx = ftface->bbox.xMax - ftface->bbox.xMin; + pmetrics->sizlMax.cy = ftface->bbox.yMax - ftface->bbox.yMin; + + /* Transform all coordinates into device space */ + if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 7, pmetrics->aptl, pmetrics->aptl)) + { + __debugbreak(); + } + + /* Fixup some minimum values */ + if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; + if (pmetrics->ptlSOThickness.y <= 0) pmetrics->ptlSOThickness.y = 1; + +DbgPrint("Created font with %ld (%ld)\n", yScale, yScale/64); +//__debugbreak(); /* Set the pvProducer member of the fontobj */ pfo->pvProducer = pfont; @@ -93,8 +187,6 @@ return pfont; } -#define FLOATL_1 0x3f800000 - ULONG NTAPI FtfdQueryMaxExtents( @@ -103,7 +195,10 @@ ULONG cjSize) { PFTFD_FONT pfont = FtfdGetFontInstance(pfo); + PFTFD_FACE pface = pfont->pface; + FT_Face ftface = pfont->ftface; ULONG cjMaxWidth, cjMaxBitmapSize; + XFORMOBJ *pxo; DbgPrint("FtfdQueryMaxExtents\n"); @@ -116,57 +211,60 @@ return FD_ERROR; } - //xScale = pfont->xScale; - //yScale = pfont->yScale; - - /* Fill FD_DEVICEMETRICS */ + /* Get the XFORMOBJ */ + pxo = FONTOBJ_pxoGetXform(pfo); + + /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; + + /* Baseline vectors */ pfddm->pteBase.x = FLOATL_1; pfddm->pteBase.y = 0; pfddm->pteSide.x = 0; - pfddm->pteSide.y = FLOATL_1; - pfddm->ptlUnderline1.x = 0; - pfddm->ptlUnderline1.y = 1; - pfddm->ptlStrikeout.x = 0; - pfddm->ptlStrikeout.y = -4; - pfddm->ptlULThickness.x = 0; - pfddm->ptlULThickness.y = 1; - pfddm->ptlSOThickness.x = 0; - pfddm->ptlSOThickness.y = 1; + pfddm->pteSide.y = 0xbf800000; //-FLOATL_1; + + /* Transform the baseline vectors */ + //XFORMOBJ_bApplyXformToFloat(pxo, 2, &pfddm->pteBase); + + /* Fixed width advance */ + if (ftface->face_flags & FT_FACE_FLAG_FIXED_WIDTH) + pfddm->lD = ftface->max_advance_width; + else + pfddm->lD = 0; + + /* Copy the values from the font structure */ + pfddm->fxMaxAscender = pfont->metrics.ptfxMaxAscender.y; + pfddm->fxMaxDescender = pfont->metrics.ptfxMaxDescender.y; + pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; + pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; + pfddm->ptlULThickness = pfont->metrics.ptlULThickness; + pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; + pfddm->cxMax = pfont->metrics.sizlMax.cx; + pfddm->cyMax = pfont->metrics.sizlMax.cy; + + /* Calculate Width in bytes */ + cjMaxWidth = ((pfddm->cxMax + 7) >> 3); + + /* Calculate size of the bitmap, rounded to DWORDs */ + cjMaxBitmapSize = ((cjMaxWidth * pfddm->cyMax) + 3) & ~3; + + /* cjGlyphMax is the full size of the GLYPHBITS structure */ + pfddm->cjGlyphMax = FIELD_OFFSET(GLYPHBITS, aj) + cjMaxBitmapSize; + + /* Copy the quantized matrix from the font structure */ + pfddm->fdxQuantized = pfont->fdxQuantized; + + pfddm->lNonLinearExtLeading = 0x00000000; + pfddm->lNonLinearIntLeading = 0x00000010; + pfddm->lNonLinearMaxCharWidth = 0x80000000; + pfddm->lNonLinearAvgCharWidth = 0x80000000; + pfddm->lMinA = 0; pfddm->lMinC = 0; pfddm->lMinD = 0; - -#if 0 - if (pfont->ulAngle == 90 || pfont->ulAngle == 270) - { - pfddm->cxMax = xScale * GETVAL(pFontInfo->dfPixHeight); - pfddm->cyMax = yScale * GETVAL(pFontInfo->dfMaxWidth); - pfddm->fxMaxAscender = yScale * GETVAL(pFontInfo->dfAscent) << 4; - pfddm->fxMaxDescender = (pfddm->cyMax << 4) - pfddm->fxMaxAscender; - } - else - { - pfddm->cxMax = xScale * GETVAL(pFontInfo->dfMaxWidth); - pfddm->cyMax = yScale * GETVAL(pFontInfo->dfPixHeight); - pfddm->fxMaxAscender = yScale * GETVAL(pFontInfo->dfAscent) << 4; - pfddm->fxMaxDescender = (pfddm->cyMax << 4) - pfddm->fxMaxAscender; - } -#endif - - pfddm->lD = pfddm->cxMax; - - /* Calculate Width in bytes */ - cjMaxWidth = ((pfddm->cxMax + 7) >> 3); - - /* Calculate size of the bitmap, rounded to DWORDs */ - cjMaxBitmapSize = ((cjMaxWidth * pfddm->cyMax) + 3) & ~3; - - /* cjGlyphMax is the full size of the GLYPHBITS structure */ - pfddm->cjGlyphMax = FIELD_OFFSET(GLYPHBITS, aj) + cjMaxBitmapSize; - - /* NOTE: fdxQuantized and NonLinear... stay unchanged */ - } + } + +__debugbreak(); /* Return the size of the structure */ return sizeof(FD_DEVICEMETRICS); @@ -211,8 +309,6 @@ PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; -if (hg > 1) __debugbreak(); - pgd->gdf.pgb = pvGlyphData; pgd->hg = hg; @@ -247,9 +343,6 @@ //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0; - -if (hg > 1) __debugbreak(); - } VOID @@ -261,15 +354,14 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; - -if (hg > 1) __debugbreak(); pgb->ptlOrigin.x = 0; pgb->ptlOrigin.y = 0; pgb->sizlBitmap.cx = ftglyph->bitmap.width; pgb->sizlBitmap.cy = ftglyph->bitmap.rows; -if (hg > 1) __debugbreak(); + DbgPrint("QueryGlyphBits for hg=%lx, cjSize=%ld\n", hg, cjSize); + } VOID @@ -425,7 +517,7 @@ } else { - DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); + //DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); pusWidths[i] = (USHORT)advance >> 12; } } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Fri May 6 10:38:36 2011 @@ -45,7 +45,7 @@ - FtfdCreateFontInstance: 80% - handle XFORM (create a matrix and set freetype xform) - FtfdGetFontInstance: 100% done -- FtfdQueryMaxExtents: 10% done +- FtfdQueryMaxExtents: 80% done - FtfdLoadGlyph: 80% done - hande accelerator flags for bitmap / outline

1 0

[ilardig] 51604: [SHELL32] Update Italian & Spanish translations.
by ilardig＠svn.reactos.org 05 May '11

05 May '11

Author: ilardig Date: Thu May 5 21:28:57 2011 New Revision: 51604 URL: http://svn.reactos.org/svn/reactos?rev=51604&view=rev Log: [SHELL32] Update Italian & Spanish translations. Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 5 21:28:57 2011 @@ -774,6 +774,6 @@ IDS_FILE_DETAILS "Detalles para el tipo de archivo '%s'" IDS_FILE_DETAILSADV "Los archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipos de archivos" + IDS_COLUMN_EXTENSION "Extensiones" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu May 5 21:28:57 2011 @@ -772,6 +772,6 @@ IDS_FILE_DETAILS "Dettagli per l'estensione '%s'" IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo '%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su Avanzate." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipi di file" + IDS_COLUMN_EXTENSION "Estensioni" +END

1 0

[sserapion] 51603: - fix build after header changes
by sserapion＠svn.reactos.org 05 May '11

05 May '11

Author: sserapion Date: Thu May 5 21:10:41 2011 New Revision: 51603 URL: http://svn.reactos.org/svn/reactos?rev=51603&view=rev Log: - fix build after header changes Modified: branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c Modified: branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu May 5 21:10:41 2011 @@ -392,7 +392,7 @@ case PolicyModificationInformation: case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: - case PolicyEfsInformation: + case PolicyDnsDomainInformationInt: { FIXME("category not implemented\n"); return STATUS_UNSUCCESSFUL;

1 0

[osiejka] 51602: [SHELL32] - Translation update
by osiejka＠svn.reactos.org 05 May '11

05 May '11

Author: osiejka Date: Thu May 5 21:09:37 2011 New Revision: 51602 URL: http://svn.reactos.org/svn/reactos?rev=51602&view=rev Log: [SHELL32] - Translation update Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu May 5 21:09:37 2011 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * ReactOS shell32 fork translation updated by Caemyr - - * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010) + * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010, May 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -769,6 +769,6 @@ IDS_FILE_DETAILS "Szczegó³y dla rozszerzenia '%s'" IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' s¹ typu '%s'. Aby zmieniæ ustawienia, które dotycz¹ wszystkich plików '%s', kliknij przycisk Zaawansowane." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Typy plików" + IDS_COLUMN_EXTENSION "Rozszerzenia" +END

1 0

[sserapion] 51601: -define necesary constants -remove all references to non-existant SECPKG_INTERFACE_VERSIONs
by sserapion＠svn.reactos.org 05 May '11

05 May '11

Author: sserapion Date: Thu May 5 20:37:44 2011 New Revision: 51601 URL: http://svn.reactos.org/svn/reactos?rev=51601&view=rev Log: -define necesary constants -remove all references to non-existant SECPKG_INTERFACE_VERSIONs Modified: branches/sspi-bringup/rostests/winetests/msi/source.c branches/sspi-bringup/rostests/winetests/rpcrt4/server.c branches/sspi-bringup/rostests/winetests/schannel/main.c Modified: branches/sspi-bringup/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/msi/source.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -27,6 +27,7 @@ #include <msidefs.h> #include <msi.h> #include <sddl.h> +#define SECURITY_WIN32 #include <secext.h> #include "wine/test.h" Modified: branches/sspi-bringup/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/rpcrt4/server.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -19,6 +19,7 @@ */ #include <windows.h> +#define SECURITY_WIN32 #include <secext.h> #include <rpcdce.h> #include "wine/test.h" Modified: branches/sspi-bringup/rostests/winetests/schannel/main.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/schannel/main.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/schannel/main.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -34,16 +34,12 @@ /* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ #define SECPKG_FUNCTION_TABLE_SIZE_1 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + SetExtendedInformation) +#define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetContextAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ +#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - ChangeAccountPassword) -#define SECPKG_FUNCTION_TABLE_SIZE_4 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - QueryMetaData) -#define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_4 sizeof(SECPKG_FUNCTION_TABLE) static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); @@ -137,10 +133,6 @@ size = SECPKG_FUNCTION_TABLE_SIZE_3; else if (Version == SECPKG_INTERFACE_VERSION_4) size = SECPKG_FUNCTION_TABLE_SIZE_4; - else if (Version == SECPKG_INTERFACE_VERSION_5) - size = SECPKG_FUNCTION_TABLE_SIZE_5; - else if (Version == SECPKG_INTERFACE_VERSION_6) - size = SECPKG_FUNCTION_TABLE_SIZE_6; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL;

1 0

[gschneider] 51600: [charmap] [eventvwr] [reactos] [syssetup] - Igor Paliychuk <mansonigor at gmail dot com>: Update RU and UA resources
by gschneider＠svn.reactos.org 05 May '11

05 May '11

Author: gschneider Date: Thu May 5 20:36:07 2011 New Revision: 51600 URL: http://svn.reactos.org/svn/reactos?rev=51600&view=rev Log: [charmap] [eventvwr] [reactos] [syssetup] - Igor Paliychuk <mansonigor at gmail dot com>: Update RU and UA resources Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -14,21 +14,21 @@ CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 + CONTROL "Ðàñøèðåííûé âèä",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:",IDC_STATIC,8,8,48,8 + LTEXT "Íàáîð ñèìâîëîâ:",IDC_STATIC,8,8,55,8 COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:",IDC_STATIC,8,28,50,8 + LTEXT "Ãðóïïèðîâàòü çà:",IDC_STATIC,8,28,50,8 COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 + PUSHBUTTON "Íàéòè",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL - LTEXT "Search for:",IDC_STATIC,8,48,42,8 - LTEXT "Unicode:",IDC_STATIC,200,8,30,8 + LTEXT "Èñêàòü:",IDC_STATIC,8,48,42,8 + LTEXT "Þíèêîä:",IDC_STATIC,200,8,30,8 EDITTEXT IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL END @@ -47,5 +47,5 @@ BEGIN IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíî ðàñïðîñòðàíÿåìîé; Âû ìîæåòå ðàñïðîñòðàíÿòü åå ïîâòîðíî è (èëè) èçìåíÿòü, ñîáëþäàÿ óñëîâèÿ Îòêðûòîãî ëèöåíçèîííîãî ñîãëàøåíèÿ GNU, îïóáëèêîâàííîãî Ôîíäîì ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî îáåñïå÷åíèÿ; ëèáî ðåäàêöèè 2 Ñîãëàøåíèÿ, ëèáî (íà âàøå óñìîòðåíèå) ëþáîé ðåäàêöèè, âûïóùåííîé ïîçæå.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ â íàäåæäå íà òî, ÷òî îíà îêàæåòñÿ ïîëåçíîé, íî ÁÅÇ ÊÀÊÈÕ-ËÈÁÎ ÃÀÐÀÍÒÈÉ, âêëþ÷àÿ ïîäðàçóìåâàåìóþ ãàðàíòèþ ÊÀ×ÅÑÒÂÀ ëèáî ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÎÏÐÅÄÅËÅÍÍÛÕ ÖÅËÅÉ. Ïîäðîáíîñòè ñîäåðæàòñÿ â Îòêðûòîì ëèöåíçèîííîì ñîãëàøåíèè GNU.\r\n\r\nÂìåñòå ñ ýòîé ïðîãðàììîé äîëæåí ðàñïðîñòðàíÿòüñÿ ýêçåìïëÿð Îòêðûòîãî ëèöåíçèîííîãî ñîãëàøåíèÿ GNU, åñëè îí îòñóòñòâóåò, ñîîáùèòå îá ýòîì â Ôîíä ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî îáåñïå÷åíèÿ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "&Î ïðîãðàììå..." - IDS_TITLE "Character Map" + IDS_TITLE "Òàáëèöà ñèìâîëîâ" END Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -20,21 +20,21 @@ CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîï³þâàòè", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 + CONTROL "Ðîçøèðåíèé âèãëÿä",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:",IDC_STATIC,8,8,48,8 + LTEXT "Íàá³ð ñèìâîë³â:",IDC_STATIC,8,8,55,8 COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:",IDC_STATIC,8,28,50,8 + LTEXT "Ãðóïóâàòè çà:",IDC_STATIC,8,28,50,8 COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 + PUSHBUTTON "Çíàéòè",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL - LTEXT "Search for:",IDC_STATIC,8,48,42,8 - LTEXT "Unicode:",IDC_STATIC,200,8,30,8 + LTEXT "Øóêàòè:",IDC_STATIC,8,48,42,8 + LTEXT "Þí³êîä:",IDC_STATIC,200,8,30,8 EDITTEXT IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL END @@ -53,5 +53,5 @@ BEGIN IDS_LICENSE "Òàáëèöÿ ñèìâîë³â - â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ; Âè ìîæåòå ðîçïîâñþäæóâàòè ¿¿ òà çì³íþâàòè, äîòðèìóþ÷èñü óìîâè Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU, îïóáë³êîâàíî¿ Ôîíäîì â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; àáî ðåäàêö³¿ 2 Óãîäè, àáî áóäü-ÿêî¿ ðåäàêö³¿, âèïóùåíî¿ ï³çí³øå.\r\n\r\nÖÿ ïðîãðàìà ðîçïîâñþäæóºòüñÿ â íàä³¿ íà òå, ùî âîíà âèÿâèòüñÿ êîðèñíîþ, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É, âêëþ÷àþ÷è ÓßÂÍÎÞ ÃÀÐÀÍÒ²ªÞ ßÊÎÑÒ² àáî ÏÐÈÄÀÒÍÎÑÒ² äëÿ ïåâíèõ ö³ëåé. Ïîäðîáèö³ ì³ñòÿòüñÿ ó Â³äêðèò³é ë³öåíç³éí³é óãîä³ GNU.\r\n\r\nÐàçîì ç ö³ºþ ïðîãðàìîþ ïîâèíåí ïîøèðþâàòèñÿ ïðèì³ðíèê Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU. ßêùî â³í â³äñóòí³é, ïîâ³äîìòå ïðî öå â Ôîíä â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "&Ïðî ïðîãðàìó..." - IDS_TITLE "Character Map" + IDS_TITLE "Òàáëèöÿ Cèìâîë³â" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -105,19 +105,19 @@ STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNTYPE "Òèï" + IDS_COLUMNDATE "Äàòà" + IDS_COLUMNTIME "Âðåìÿ" + IDS_COLUMNSOURCE "Èñòî÷íèê" + IDS_COLUMNCATEGORY "Êàòåãîðèÿ" + IDS_COLUMNEVENT "Ñîáûòèå" + IDS_COLUMNUSER "Ïîëüçîâàòåëü" + IDS_COLUMNCOMPUTER "Êîìïüþòåð" + IDS_COLUMNEVENTDATA "Äàííûå ñîáûòèÿ" END STRINGTABLE BEGIN - IDS_NONE "None" + IDS_NONE "Íåòó" IDS_NOT_AVAILABLE "N/A" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -43,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Îãëÿäà÷ ïîä³é âåðñ³¿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Îãëÿäà÷ ïîä³é ReactOS âåðñ³¿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END @@ -118,6 +118,6 @@ STRINGTABLE BEGIN - IDS_NONE "None" + IDS_NONE "Íåìàº" IDS_NOT_AVAILABLE "N/A" END Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -71,18 +71,18 @@ LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³", IDC_STATIC, 10, 180 ,277, 20 END -IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 172, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ñòâîðåííÿ ðîçä³ëó" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Ñòâîðèòè òà â³äôîðìàòóâàòè ðîçä³ë äèñêó",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,131,22,9,13 + CONTROL "Ñòâîðèòè òà â³äôîðìàòóâàòè ðîçä³ë",IDC_STATIC,"Button",BS_GROUPBOX,7,5,156,57 LTEXT "Ðîçì³ð:",IDC_STATIC, 13,24,27,9 - EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP - LTEXT "Ãá",IDC_UNIT, 117,24,14,9 - LTEXT "Ôàéëîâà ñèñòåìà:",IDC_STATIC,13,46,35,9 - CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + EDITTEXT IDC_PARTSIZE,79,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "Ãá",IDC_UNIT, 144,24,14,9 + LTEXT "Ôàéëîâà ñèñòåìà:",IDC_STATIC,13,46,65,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,79,42,79,50 PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP PUSHBUTTON "&Ñêàñóâàòè",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -194,7 +194,7 @@ IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" IDS_CMT_DEVMGMT "Çàïóñòèòè Äèñïåò÷åð ïðèñòðî¿â" - IDS_CMT_EVENTVIEW "Çàïóñòèòè Ðåäàêòîð ïîä³é" + IDS_CMT_EVENTVIEW "Çàïóñòèòè Îãëÿäà÷ ïîä³é" IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" IDS_CMT_MSCONFIG "Çàïóñòèòè Ïðîãðàìó êîíô³ãóðàö³¿ ñèñòåìè" IDS_CMT_NOTEPAD "Çàïóñòèòè Òåêñòîâèé ðåäàêòîð" @@ -258,7 +258,7 @@ IDS_SHORT_DEVICE "Äèñïåò÷åð ïðèñòðî¿â.lnk" IDS_SHORT_DOWNLOADER "Ìåíåäæåð ïðîãðàì ReactOS.lnk" IDS_SHORT_DXDIAG "Ä³àãíîñòèêà ReactX.lnk" - IDS_SHORT_EVENTVIEW "Ðåäàêòîð ïîä³é.lnk" + IDS_SHORT_EVENTVIEW "Îãëÿäà÷ ïîä³é.lnk" IDS_SHORT_EXPLORER "Ïðîâ³äíèê ReactOS.lnk" IDS_SHORT_KBSWITCH "Ïåðåìèêà÷ ðîçêëàäêè êëàâ³àòóðè.lnk" IDS_SHORT_MAGNIFY "Åêðàííà ëóïà.lnk"

1 0

[sserapion] 51599: - define necessary constant for new headers. - remove usage of winternl.h from some rpcrt4 files. - remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have mad...
by sserapion＠svn.reactos.org 05 May '11

05 May '11

Author: sserapion Date: Thu May 5 20:33:21 2011 New Revision: 51599 URL: http://svn.reactos.org/svn/reactos?rev=51599&view=rev Log: - define necessary constant for new headers. - remove usage of winternl.h from some rpcrt4 files. - remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have made-up since i cannot find them in any public headers. Modified: branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c branches/sspi-bringup/reactos/dll/win32/wininet/http.c branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c Modified: branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/base/syste… ============================================================================== --- branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Thu May 5 20:33:21 2011 @@ -32,10 +32,7 @@ #include <windows.h> #include <userenv.h> #include <winwlx.h> -#include <cmfuncs.h> -#include <rtlfuncs.h> -#include <exfuncs.h> -#include <setypes.h> +#include <ntndk.h> #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> Modified: branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -1007,11 +1007,11 @@ NTSTATUS WINAPI LsaSetForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - BOOL CheckOnly, - PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) + IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, + IN BOOLEAN CheckOnly, + OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); return STATUS_NOT_IMPLEMENTED; Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -22,9 +22,11 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" +#include <ndk/ntndk.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -56,7 +58,7 @@ NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + RTL_RESOURCE rw_lock; unsigned int refs; } RpcContextHandle; Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -26,11 +26,11 @@ #include <string.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "winternl.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> + #include "wine/unicode.h" #include "rpc.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Thu May 5 20:33:21 2011 @@ -22,6 +22,7 @@ #define __WINE_RPC_BINDING_H #include "rpcndr.h" +#define SECURITY_WIN32 #include "security.h" #include "wine/list.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -31,6 +31,11 @@ #include <assert.h> #include <stdlib.h> #include <sys/types.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> @@ -74,12 +79,6 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "wininet.h" -#include "winternl.h" #include "wine/unicode.h" #include "rpc.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -37,12 +37,9 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "winuser.h" -#include "winnt.h" -#include "winternl.h" +#include <windows.h> +#include <ndk/ntndk.h> + #include "iptypes.h" #include "iphlpapi.h" #include "wine/unicode.h" Modified: branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#define SECURITY_WIN32 #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" @@ -110,11 +111,6 @@ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ NULL, /* ChangeAccountPassword */ - NULL, /* QueryMetaData */ - NULL, /* ExchangeMetaData */ - NULL, /* GetCredUIContext */ - NULL, /* UpdateCredentials */ - NULL, /* ValidateTargetInfo */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -146,11 +142,6 @@ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ NULL, /* ChangeAccountPassword */ - NULL, /* QueryMetaData */ - NULL, /* ExchangeMetaData */ - NULL, /* GetCredUIContext */ - NULL, /* UpdateCredentials */ - NULL, /* ValidateTargetInfo */ } }; @@ -162,7 +153,7 @@ { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_4; *pcTables = 2; *ppTables = secPkgFunctionTable; Modified: branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1] Thu May 5 20:33:21 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" allowwarnings="true"> +<module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" unicode="yes" allowwarnings="true"> <importlibrary definition="schannel.spec" /> <include base="schannel">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#define SECURITY_WIN32 #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" Modified: branches/sspi-bringup/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -61,6 +61,7 @@ #define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI #include "shlwapi.h" +#define SECURITY_WIN32 #include "sspi.h" #include "wincrypt.h" Modified: branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Thu May 5 20:33:21 2011 @@ -6,6 +6,7 @@ <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">include/reactos/libs/zlib</include> <define name="__WINESRC__" /> <define name="_WINE" /> @@ -23,6 +24,7 @@ <library>crypt32</library> <library>ws2_32</library> <library>pseh</library> + <library>zlib</library> <file>cookie.c</file> <file>dialogs.c</file> <file>ftp.c</file> Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -889,9 +889,9 @@ getnameinfo(const struct sockaddr FAR * sa, socklen_t salen, char FAR * host, - DWORD hostlen, + socklen_t hostlen, char FAR * serv, - DWORD servlen, + socklen_t servlen, INT flags) { UNIMPLEMENTED Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -902,9 +902,9 @@ getnameinfo(const struct sockaddr FAR *sa, socklen_t salen, char FAR *host, - DWORD hostlen, + socklen_t hostlen, char FAR *serv, - DWORD servlen, + socklen_t servlen, INT flags) { INT ErrorCode;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs