Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 01/02: [USBSTOR] General refactoring. Remove unused structures and unused fields in device extensions. Replaced magic numbers with constants

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9b97aededc058f415d32… commit a9b97aededc058f415d32f761095e89e1bd93a7d Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sun Nov 10 01:05:47 2019 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Jun 12 16:55:27 2020 +0300 [USBSTOR] General refactoring. Remove unused structures and unused fields in device extensions. Replaced magic numbers with constants --- drivers/usb/usbstor/CMakeLists.txt | 3 - drivers/usb/usbstor/fdo.c | 14 +- drivers/usb/usbstor/misc.c | 8 +- drivers/usb/usbstor/pdo.c | 118 +++++------------ drivers/usb/usbstor/scsi.c | 12 -- drivers/usb/usbstor/usbstor.h | 258 ++++++++----------------------------- 6 files changed, 93 insertions(+), 320 deletions(-) diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt index eaaee54a62f..95ee0c18c58 100644 --- a/drivers/usb/usbstor/CMakeLists.txt +++ b/drivers/usb/usbstor/CMakeLists.txt @@ -1,7 +1,4 @@ -add_definitions(-DDEBUG_MODE) -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - list(APPEND SOURCE descriptor.c disk.c diff --git a/drivers/usb/usbstor/fdo.c b/drivers/usb/usbstor/fdo.c index 7b5dfc04c9f..15af86f095a 100644 --- a/drivers/usb/usbstor/fdo.c +++ b/drivers/usb/usbstor/fdo.c @@ -42,7 +42,7 @@ USBSTOR_FdoHandleDeviceRelations( IN PFDO_DEVICE_EXTENSION DeviceExtension, IN OUT PIRP Irp) { - ULONG DeviceCount = 0; + INT32 DeviceCount = 0; LONG Index; PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; @@ -61,7 +61,7 @@ USBSTOR_FdoHandleDeviceRelations( } } - DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? (DeviceCount-1) * sizeof(PDEVICE_OBJECT) : 0)); + DeviceRelations = ExFreePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount-1) * sizeof(PDEVICE_OBJECT), USB_STOR_TAG); if (!DeviceRelations) { Irp->IoStatus.Information = 0; @@ -106,7 +106,7 @@ USBSTOR_FdoHandleRemoveDevice( DPRINT("Handling FDO removal %p\n", DeviceObject); // FIXME: wait for devices finished processing - for (Index = 0; Index < 16; Index++) + for (Index = 0; Index < USB_MAXCHILDREN; Index++) { if (DeviceExtension->ChildPDO[Index] != NULL) { @@ -198,17 +198,15 @@ USBSTOR_FdoHandleStartDevice( ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); DPRINT("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); - if (InterfaceDesc->bInterfaceProtocol != 0x50) + if (InterfaceDesc->bInterfaceProtocol != USB_PROTOCOL_BULK) { DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); return STATUS_NOT_SUPPORTED; } - if (InterfaceDesc->bInterfaceSubClass == 0x04) // UFI subclass + if (InterfaceDesc->bInterfaceSubClass == USB_SUBCLASS_UFI) { - // FIXME: need to pad CDBs to 12 byte - // mode select commands must be translated from 1AH / 15h to 5AH / 55h - DPRINT1("[USBSTOR] Error: need to pad CDBs\n"); + DPRINT1("USB Floppy devices are not supported\n"); return STATUS_NOT_SUPPORTED; } diff --git a/drivers/usb/usbstor/misc.c b/drivers/usb/usbstor/misc.c index 3dbbf160813..040ca568d94 100644 --- a/drivers/usb/usbstor/misc.c +++ b/drivers/usb/usbstor/misc.c @@ -208,10 +208,9 @@ USBSTOR_GetMaxLUN( PUCHAR Buffer; NTSTATUS Status; - Buffer = (PUCHAR)AllocateItem(NonPagedPool, sizeof(UCHAR)); + Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, sizeof(UCHAR), USB_STOR_TAG); if (!Buffer) { - FreeItem(Buffer); return STATUS_INSUFFICIENT_RESOURCES; } @@ -221,7 +220,7 @@ USBSTOR_GetMaxLUN( if (NT_SUCCESS(Status)) { - if (*Buffer > 0xF) + if (*Buffer > MAX_LUN) { // invalid response documented in usb mass storage specification Status = STATUS_DEVICE_DATA_ERROR; @@ -243,7 +242,7 @@ USBSTOR_GetMaxLUN( Status = STATUS_SUCCESS; } - FreeItem(Buffer); + ExFreePoolWithTag(Buffer, USB_STOR_TAG); return Status; } @@ -258,6 +257,7 @@ USBSTOR_ResetDevice( return Status; } +// if somebody wants to add UFI support, here is a useful function #if 0 BOOLEAN USBSTOR_IsFloppy( diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c index d02c9504583..50996e396c6 100644 --- a/drivers/usb/usbstor/pdo.c +++ b/drivers/usb/usbstor/pdo.c @@ -15,107 +15,53 @@ #include <debug.h> +static LPCSTR USBSTOR_GetDeviceType( - IN PINQUIRYDATA InquiryData, - IN UCHAR IsFloppy) + IN PINQUIRYDATA InquiryData) { - if (InquiryData->DeviceType == 0) - { - if (IsFloppy) - { - // floppy device - return "SFloppy"; - } - - // direct access device - return "Disk"; - } - switch (InquiryData->DeviceType) { - case 1: - { + case DIRECT_ACCESS_DEVICE: + return "Disk"; + case SEQUENTIAL_ACCESS_DEVICE: // sequential device, i.e magnetic tape return "Sequential"; - } - case 4: - { - // write once device + case WRITE_ONCE_READ_MULTIPLE_DEVICE: return "Worm"; - } - case 5: - { - // CDROM device + case READ_ONLY_DIRECT_ACCESS_DEVICE: return "CdRom"; - } - case 7: - { - // optical memory device + case OPTICAL_DEVICE: return "Optical"; - } - case 8: - { - // medium change device + case MEDIUM_CHANGER: return "Changer"; - } default: - { - // other device return "Other"; - } } } +static LPCSTR USBSTOR_GetGenericType( - IN PINQUIRYDATA InquiryData, - IN UCHAR IsFloppy) + IN PINQUIRYDATA InquiryData) { - if (InquiryData->DeviceType == 0) - { - if (IsFloppy) - { - // floppy device - return "GenSFloppy"; - } - - // direct access device - return "GenDisk"; - } - switch (InquiryData->DeviceType) { - case 1: - { + case DIRECT_ACCESS_DEVICE: + return "GenDisk"; + case SEQUENTIAL_ACCESS_DEVICE: // sequential device, i.e magnetic tape return "GenSequential"; - } - case 4: - { - // write once device + case WRITE_ONCE_READ_MULTIPLE_DEVICE: return "GenWorm"; - } - case 5: - { - // CDROM device + case READ_ONLY_DIRECT_ACCESS_DEVICE: return "GenCdRom"; - } - case 7: - { - // optical memory device + case OPTICAL_DEVICE: return "GenOptical"; - } - case 8: - { - // medium change device + case MEDIUM_CHANGER: return "GenChanger"; - } default: - { - // other device return "UsbstorOther"; - } } } @@ -210,7 +156,7 @@ USBSTOR_PdoHandleQueryDeviceText( DeviceDescription.Length = 0; DeviceDescription.MaximumLength = (USHORT)(Offset * sizeof(WCHAR)); - DeviceDescription.Buffer = (LPWSTR)AllocateItem(PagedPool, DeviceDescription.MaximumLength); + DeviceDescription.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceDescription.MaximumLength, USB_STOR_TAG); if (!DeviceDescription.Buffer) { Irp->IoStatus.Information = 0; @@ -248,7 +194,7 @@ USBSTOR_PdoHandleQueryDeviceId( ASSERT(DeviceExtension->InquiryData); InquiryData = DeviceExtension->InquiryData; - DeviceType = USBSTOR_GetDeviceType(InquiryData, DeviceExtension->IsFloppy); + DeviceType = USBSTOR_GetDeviceType(InquiryData); // lets create device string Offset = sprintf(&Buffer[Offset], "USBSTOR\\"); @@ -265,7 +211,7 @@ USBSTOR_PdoHandleQueryDeviceId( // allocate DeviceId string DeviceId.Length = 0; DeviceId.MaximumLength = (USHORT)((strlen((PCHAR)Buffer) + 1) * sizeof(WCHAR)); - DeviceId.Buffer = (LPWSTR)AllocateItem(PagedPool, DeviceId.MaximumLength); + DeviceId.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceId.MaximumLength, USB_STOR_TAG); if (!DeviceId.Buffer) { Irp->IoStatus.Information = 0; @@ -338,8 +284,8 @@ USBSTOR_PdoHandleQueryHardwareId( ASSERT(FDODeviceExtension->DeviceDescriptor); InquiryData = PDODeviceExtension->InquiryData; - DeviceType = USBSTOR_GetDeviceType(InquiryData, PDODeviceExtension->IsFloppy); - GenericType = USBSTOR_GetGenericType(InquiryData, PDODeviceExtension->IsFloppy); + DeviceType = USBSTOR_GetDeviceType(InquiryData); + GenericType = USBSTOR_GetGenericType(InquiryData); ASSERT(GenericType); @@ -418,7 +364,7 @@ USBSTOR_PdoHandleQueryHardwareId( TotalLength = Id1Length + Id2Length + Id3Length + Id4Length + Id5Length + Id6Length + Id7Length + 1; - Buffer = (LPWSTR)AllocateItem(PagedPool, TotalLength * sizeof(WCHAR)); + Buffer = ExAllocatePoolWithTag(PagedPool, TotalLength * sizeof(WCHAR), USB_STOR_TAG); if (!Buffer) { Irp->IoStatus.Information = 0; @@ -458,13 +404,13 @@ USBSTOR_PdoHandleQueryCompatibleId( PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; ASSERT(FDODeviceExtension->DeviceDescriptor); - DeviceType = USBSTOR_GetDeviceType(PDODeviceExtension->InquiryData, PDODeviceExtension->IsFloppy); + DeviceType = USBSTOR_GetDeviceType(PDODeviceExtension->InquiryData); // format instance id Length = sprintf(Buffer, "USBSTOR\\%s", DeviceType) + 1; Length += sprintf(&Buffer[Length], "USBSTOR\\%s", "RAW") + 2; - InstanceId = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), USB_STOR_TAG); if (!InstanceId) { Irp->IoStatus.Information = 0; @@ -508,7 +454,7 @@ USBSTOR_PdoHandleQueryInstanceId( Length = wcslen(Buffer) + 1; - InstanceId = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), USB_STOR_TAG); if (!InstanceId) { Irp->IoStatus.Information = 0; @@ -542,7 +488,7 @@ USBSTOR_PdoHandleDeviceRelations( return Irp->IoStatus.Status; } - DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS)); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), USB_STOR_TAG); if (!DeviceRelations) { return STATUS_INSUFFICIENT_RESOURCES; @@ -953,13 +899,9 @@ USBSTOR_CreatePDO( return Status; } - if (PDODeviceExtension->InquiryData->DeviceType == DIRECT_ACCESS_DEVICE || PDODeviceExtension->InquiryData->DeviceType == READ_ONLY_DIRECT_ACCESS_DEVICE) - { - PDODeviceExtension->IsFloppy = FALSE; // TODO: implement the actual check - } - else + if (PDODeviceExtension->InquiryData->DeviceType != DIRECT_ACCESS_DEVICE && + PDODeviceExtension->InquiryData->DeviceType != READ_ONLY_DIRECT_ACCESS_DEVICE) { - // we work only with DIRECT_ACCESS_DEVICE for now return STATUS_NOT_SUPPORTED; } diff --git a/drivers/usb/usbstor/scsi.c b/drivers/usb/usbstor/scsi.c index be27921bd3a..946065649dd 100644 --- a/drivers/usb/usbstor/scsi.c +++ b/drivers/usb/usbstor/scsi.c @@ -137,7 +137,6 @@ USBSTOR_CSWCompletionRoutine( PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; PSCSI_REQUEST_BLOCK Request; - PUFI_CAPACITY_RESPONSE Response; Context = (PIRP_CONTEXT)Ctx; @@ -191,17 +190,6 @@ USBSTOR_CSWCompletionRoutine( Request->SrbStatus |= SRB_STATUS_AUTOSENSE_VALID; } - // read capacity needs special work - if (Request->Cdb[0] == SCSIOP_READ_CAPACITY) - { - // get output buffer - Response = (PUFI_CAPACITY_RESPONSE)Request->DataBuffer; - - // store in pdo - PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); - PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); - } - Irp->IoStatus.Status = USBSTOR_SrbStatusToNtStatus(Request); } else if (Context->csw.Status == CSW_STATUS_COMMAND_FAILED) diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 16bd314b56c..9e8b50e5701 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -8,22 +8,6 @@ #include <classpnp.h> #define USB_STOR_TAG 'sbsu' -#define USB_MAXCHILDREN (16) -#define USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH 0x10000 - -#define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) -#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) - -#define HTONL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) - - -#define NTOHL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ - ((((unsigned long)(n) & 0xFF00)) << 8) | \ - ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ - ((((unsigned long)(n) & 0xFF000000)) >> 24)) #ifndef BooleanFlagOn #define BooleanFlagOn(Flags, SingleFlag) ((BOOLEAN)((((Flags) & (SingleFlag)) != 0))) @@ -33,9 +17,50 @@ #define SrbGetCdb(srb) ((PCDB)(srb->Cdb)) #endif +// Storage subclass codes + +#define USB_SUBCLASS_RBC 0x01 // Typically, flash devices +#define USB_SUBCLASS_8020 0x02 // CD-ROM +#define USB_SUBCLASS_QIC 0x03 // QIC-157 Tapes +#define USB_SUBCLASS_UFI 0x04 // Floppy +#define USB_SUBCLASS_8070 0x05 // Removable media +#define USB_SUBCLASS_SCSI 0x06 // Transparent +#define USB_SUBCLASS_LOCKABLE 0x07 // Password-protected + +#define USB_SUBCLASS_ISD200 0xF0 // ISD200 ATA +#define USB_SUBCLASS_CYP_ATACB 0xF1 // Cypress ATACB +#define USB_SUBCLASS_VENDOR 0xFF // Use vendor specific + +// Storage protocol codes + +#define USB_PROTOCOL_CBI 0x00 // Control/Bulk/Interrupt +#define USB_PROTOCOL_CB 0x01 // Control/Bulk w/o interrupt +#define USB_PROTOCOL_BULK 0x50 // bulk only +#define USB_PROTOCOL_UAS 0x62 // USB Attached SCSI +#define USB_PROTOCOL_USBAT 0x80 // SCM-ATAPI bridge +#define USB_PROTOCOL_EUSB_SDDR09 0x81 // SCM-SCSI bridge for SDDR-09 +#define USB_PROTOCOL_SDDR55 0x82 // SDDR-55 (made up) + +#define USB_PROTOCOL_DPCM_USB 0xF0 // Combination CB/SDDR09 +#define USB_PROTOCOL_FREECOM 0xF1 // Freecom +#define USB_PROTOCOL_DATAFAB 0xF2 // Datafab chipsets +#define USB_PROTOCOL_JUMPSHOT 0xF3 // Lexar Jumpshot +#define USB_PROTOCOL_ALAUDA 0xF4 // Alauda chipsets +#define USB_PROTOCOL_KARMA 0xF5 // Rio Karma +#define USB_PROTOCOL_VENDOR 0xFF // Use vendor specific + +// Mass storage class-specific commands + +#define USB_BULK_GET_MAX_LUN 0xFE +#define USB_BULK_RESET_DEVICE 0xFF + #define USB_RECOVERABLE_ERRORS (USBD_STATUS_STALL_PID | USBD_STATUS_DEV_NOT_RESPONDING \ | USBD_STATUS_ENDPOINT_HALTED | USBD_STATUS_NO_BANDWIDTH) +#define USB_MAXCHILDREN 16 +#define MAX_LUN 0xF +#define USBSTOR_DEFAULT_MAX_TRANSFER_LENGTH 0x10000 + typedef struct __COMMON_DEVICE_EXTENSION__ { BOOLEAN IsFDO; @@ -61,7 +86,7 @@ typedef struct UCHAR BulkInPipeIndex; // bulk in pipe index UCHAR BulkOutPipeIndex; // bulk out pipe index UCHAR MaxLUN; // max lun for device - PDEVICE_OBJECT ChildPDO[16]; // max 16 child pdo devices + PDEVICE_OBJECT ChildPDO[USB_MAXCHILDREN]; // max 16 child pdo devices KSPIN_LOCK IrpListLock; // irp list lock LIST_ENTRY IrpListHead; // irp list head ULONG IrpPendingCount; // count of irp pending @@ -79,24 +104,17 @@ typedef struct typedef struct { USBSTOR_COMMON_DEVICE_EXTENSION Common; - PDEVICE_OBJECT LowerDeviceObject; // points to FDO + UCHAR LUN; // lun id + BOOLEAN Claimed; // indicating if it has been claimed by upper driver + PDEVICE_OBJECT LowerDeviceObject; // points to FDO PINQUIRYDATA InquiryData; // USB SCSI inquiry data - PUCHAR FormatData; // USB SCSI Read Format Capacity Data - UCHAR Claimed; // indicating if it has been claimed by upper driver - ULONG BlockLength; // length of block - ULONG LastLogicBlockAddress; // last block address PDEVICE_OBJECT *PDODeviceObject; // entry in pdo list PDEVICE_OBJECT Self; // self - UCHAR MediumTypeCode; // floppy medium type code - UCHAR IsFloppy; // is device floppy }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; -// -// max lun command identifier -// -#define USB_BULK_GET_MAX_LUN 0xFE -#define USB_BULK_RESET_DEVICE 0xFF +#define CBW_SIGNATURE 0x43425355 +#define CSW_SIGNATURE 0x53425355 #include <pshpack1.h> typedef struct @@ -112,12 +130,6 @@ typedef struct C_ASSERT(sizeof(CBW) == 31); - -#define CBW_SIGNATURE 0x43425355 -#define CSW_SIGNATURE 0x53425355 - -#define MAX_LUN 0xF - #define CSW_STATUS_COMMAND_PASSED 0x00 #define CSW_STATUS_COMMAND_FAILED 0x01 #define CSW_STATUS_PHASE_ERROR 0x02 @@ -130,168 +142,7 @@ typedef struct UCHAR Status; // CSW status }CSW, *PCSW; -//-------------------------------------------------------------------------------------------------------------------------------------------- -// -// UFI read cmd -// -typedef struct -{ - UCHAR Code; // operation code - UCHAR LUN; // lun - UCHAR LogicalBlockByte0; // lba byte 0 - UCHAR LogicalBlockByte1; // lba byte 1 - UCHAR LogicalBlockByte2; // lba byte 2 - UCHAR LogicalBlockByte3; // lba byte 3 - UCHAR Reserved; // reserved 0x00 - UCHAR ContiguousLogicBlocksByte0; // msb contiguous logic blocks byte - UCHAR ContiguousLogicBlocksByte1; // msb contiguous logic blocks - UCHAR Reserved1[3]; // reserved 0x00 -}UFI_READ_WRITE_CMD; - -C_ASSERT(sizeof(UFI_READ_WRITE_CMD) == 12); - -#define UFI_READ_WRITE_CMD_LEN (0xA) - -//-------------------------------------------------------------------------------------------------------------------------------------------- -// -// 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 Capacity command response -// -typedef struct -{ - ULONG LastLogicalBlockAddress; // last logical block address - ULONG BlockLength; // block length in bytes -}UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; - -#define UFI_READ_CAPACITY_CMD_LEN 0xA -C_ASSERT(sizeof(UFI_CAPACITY_RESPONSE) == 8); - -//-------------------------------------------------------------------------------------------------------------------------------------------- -// -// UFI sense mode cmd -// -typedef struct -{ - UCHAR Code; // operation code - UCHAR LUN; // lun address - UCHAR PageCode:6; // page code selector - UCHAR PC:2; // type of parameters to be returned - UCHAR Reserved[4]; // reserved 0x00 - USHORT AllocationLength; // parameters length - UCHAR Reserved1[3]; -}UFI_SENSE_CMD, *PUFI_SENSE_CMD; - -C_ASSERT(sizeof(UFI_SENSE_CMD) == 12); - -#define UFI_SENSE_CMD_LEN (6) - -typedef struct -{ - USHORT ModeDataLength; // length of parameters for sense cmd - UCHAR MediumTypeCode; // 00 for mass storage, 0x94 for floppy - UCHAR WP:1; // write protect bit - UCHAR Reserved1:2; // reserved 00 - UCHAR DPOFUA:1; // should be zero - UCHAR Reserved2:4; // reserved - UCHAR Reserved[4]; // reserved -}UFI_MODE_PARAMETER_HEADER, *PUFI_MODE_PARAMETER_HEADER; - - -C_ASSERT(sizeof(UFI_MODE_PARAMETER_HEADER) == 8); - -typedef struct -{ - UCHAR PC; - UCHAR PageLength; - UCHAR Reserved1; - UCHAR ITM; - UCHAR Flags; - UCHAR Reserved[3]; -}UFI_TIMER_PROTECT_PAGE, *PUFI_TIMER_PROTECT_PAGE; -C_ASSERT(sizeof(UFI_TIMER_PROTECT_PAGE) == 8); - -//-------------------------------------------------------------------------------------------------------------------------------------------- -// -// UFI read capacity cmd -// - -typedef struct -{ - UCHAR Code; - UCHAR LUN; - UCHAR Reserved[5]; - UCHAR AllocationLengthMsb; - UCHAR AllocationLengthLsb; - UCHAR Reserved1[3]; -}UFI_READ_FORMAT_CAPACITY, *PUFI_READ_FORMAT_CAPACITY; - -C_ASSERT(sizeof(UFI_READ_FORMAT_CAPACITY) == 12); - -#define UFI_READ_FORMAT_CAPACITY_CMD_LEN (10) - -typedef struct -{ - UCHAR Reserved1; - UCHAR Reserved2; - UCHAR Reserved3; - UCHAR CapacityLength; -}UFI_CAPACITY_FORMAT_HEADER, *PUFI_CAPACITY_FORMAT_HEADER; - -C_ASSERT(sizeof(UFI_CAPACITY_FORMAT_HEADER) == 4); - -typedef struct -{ - ULONG BlockCount; - UCHAR Code; - UCHAR BlockLengthByte0; - UCHAR BlockLengthByte1; - UCHAR BlockLengthByte2; -}UFI_CAPACITY_DESCRIPTOR, *PUFI_CAPACITY_DESCRIPTOR; - -#define UNFORMATTED_MEDIA_CODE_DESCRIPTORY_TYPE (1) -#define FORMAT_MEDIA_CODE_DESCRIPTOR_TYPE (2) -#define CARTRIDGE_MEDIA_CODE_DESCRIPTOR_TYPE (3) - - - - -//-------------------------------------------------------------------------------------------------------------------------------------------- -// -// UFI test unit command -// - -typedef struct -{ - UCHAR Code; // operation code 0x00 - UCHAR LUN; // lun - UCHAR Reserved[10]; // reserved 0x00 -}UFI_TEST_UNIT_CMD, *PUFI_TEST_UNIT_CMD; - -C_ASSERT(sizeof(UFI_TEST_UNIT_CMD) == 12); - -#define UFI_TEST_UNIT_CMD_LEN (6) - -//------------------------------------------------------------------------------------------------------------------------------------------- -typedef struct -{ - UCHAR Bytes[16]; -}UFI_UNKNOWN_CMD, *PUFI_UNKNOWN_CMD; +#include <poppack.h> typedef struct { @@ -387,12 +238,6 @@ USBSTOR_ResetDevice( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension); -BOOLEAN -USBSTOR_IsFloppy( - IN PUCHAR Buffer, - IN ULONG BufferLength, - OUT PUCHAR MediumTypeCode); - //--------------------------------------------------------------------- // // descriptor.c routines @@ -482,7 +327,10 @@ USBSTOR_QueueTerminateRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -/* error.c */ +//--------------------------------------------------------------------- +// +// error.c routines +// NTSTATUS USBSTOR_GetEndpointStatus( IN PDEVICE_OBJECT DeviceObject, @@ -511,4 +359,4 @@ NTAPI USBSTOR_QueueResetDevice( IN PFDO_DEVICE_EXTENSION FDODeviceExtension); -#endif /* _USBSTOR_H_ */ +#endif // _USBSTOR_H_

4 years, 6 months

[reactos] 03/03: [README.FSD] Add 'disk_new' entry

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb2515d521045f235f34f… commit cb2515d521045f235f34fabc291a9f39f92d765c Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 10 10:09:14 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jun 12 10:04:03 2020 +0200 [README.FSD] Add 'disk_new' entry Follow-up to 022f4b2 (r55555). --- media/doc/README.FSD | 1 + 1 file changed, 1 insertion(+) diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 3ba848fb4ff..5071e3cc1f5 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -20,6 +20,7 @@ The following FSD are shared with: https://github.com/Microsoft/Windows-driver-s drivers/filesystems/cdfs # Synced to f73e552 drivers/filesystems/fastfat_new # Synced to 2817004 +drivers/storage/class/disk_new # Forked. (Imported on 2012.01.26 (r55211, from Windows XP DDK), merged to trunk on 2012.02.12 (r55555).) drivers/storage/floppy_new # Synced to 8fb512a The following FSD are shared with: ??? ('nfs41 project'. See CORE-8204.)

4 years, 6 months

[reactos] 02/03: [README.FSD] Add 'nfs41 project' entries

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6d551525b22d01c6d5c5… commit f6d551525b22d01c6d5c5db7bad8cc377df72e79 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 6 20:09:03 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jun 12 10:04:03 2020 +0200 [README.FSD] Add 'nfs41 project' entries CORE-8204 --- media/doc/README.FSD | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 8f411366b99..3ba848fb4ff 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -22,6 +22,13 @@ drivers/filesystems/cdfs # Synced to f73e552 drivers/filesystems/fastfat_new # Synced to 2817004 drivers/storage/floppy_new # Synced to 8fb512a +The following FSD are shared with: ??? ('nfs41 project'. See CORE-8204.) + +base/services/nfsd # ??? (Imported on 2017.06.19.) +dll/3rdparty/libtirpc # ??? (Imported on 2017.06.18.) +dll/np/nfs # ??? (Imported on 2017.06.18.) +drivers/filesystems/nfs # ??? (Imported on 2017.06.18.) + The following FS libs are shared with: https://github.com/dosfstools/dosfstools sdk/lib/fslib/vfatlib/check # Synced to 4.1

4 years, 6 months

[reactos] 01/03: [README.FSD] Remove obsolete 'reactos/' directory

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2367bd2af85f92c7303ae… commit 2367bd2af85f92c7303ae6dcd20a09a2dda12d35 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Jun 6 20:04:15 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Jun 12 10:04:03 2020 +0200 [README.FSD] Remove obsolete 'reactos/' directory --- media/doc/README.FSD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/media/doc/README.FSD b/media/doc/README.FSD index cc671e5639a..8f411366b99 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -3,24 +3,25 @@ The following FSD are shared with: https://github.com/maharmstone/btrfs. -reactos/drivers/filesystems/btrfs # Synced to 1.7.2 -reactos/dll/shellext/shellbtrfs # Synced to 1.7.2 -reactos/sdk/lib/fslib/btrfslib # Synced to 1.7.2 +dll/shellext/shellbtrfs # Synced to 1.7.2 +drivers/filesystems/btrfs # Synced to 1.7.2 +sdk/lib/fslib/btrfslib # Synced to 1.7.2 The following FSD are shared with: http://www.ext2fsd.com/ -reactos/drivers/filesystems/ext2 # Synced to 0.69 +drivers/filesystems/ext2 # Synced to 0.69 The following FSD are shared with: http://www.acc.umu.se/~bosse/ -reactos/drivers/filesystems/ffs # Synced to 0.5.2 -reactos/drivers/filesystems/reiserfs # Synced to 0.26 +drivers/filesystems/ffs # Synced to 0.5.2 +drivers/filesystems/reiserfs # Synced to 0.26 The following FSD are shared with: https://github.com/Microsoft/Windows-driver-samples -reactos/drivers/filesystems/fastfat_new # Synced to 2817004 -reactos/drivers/filesystems/cdfs # Synced to f73e552 -reactos/drivers/storage/floppy_new # Synced to 8fb512a +drivers/filesystems/cdfs # Synced to f73e552 +drivers/filesystems/fastfat_new # Synced to 2817004 +drivers/storage/floppy_new # Synced to 8fb512a The following FS libs are shared with: https://github.com/dosfstools/dosfstools -reactos/sdk/lib/fslib/vfatlib/check # Synced to 4.1 + +sdk/lib/fslib/vfatlib/check # Synced to 4.1

4 years, 6 months

[reactos] 01/01: [FREELDR] Add display controller detection for Xbox

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=415c737cc3920ab291415… commit 415c737cc3920ab2914158be19b810ecd96ca196 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jun 9 22:02:09 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jun 9 22:02:09 2020 +0300 [FREELDR] Add display controller detection for Xbox Also add system identifier here. [BOOTDATA] Fix some typos CORE-16216 --- boot/bootdata/txtsetup.sif | 4 +- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 54 ++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 9c1bcc410eb..f8a80842196 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -266,7 +266,7 @@ ntoskrnl.exe = 1,,,,,,,2,,,,1,2 hal.dll = 1,,,,,,,2,,,,1,2 [Display] -;<id> = <user friendly name>,<spare>,<service key name>,<height>,<width>,<bpp> +;<id> = <user friendly name>,<spare>,<service key name>,<width>,<height>,<bpp> vga = "VGA Display (640x480x4)",,Vga,640,480,4 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16 @@ -298,7 +298,7 @@ xbox = "Original Xbox NV2A Framebuffer (640x480x32)",,XboxVmp,640,48 ;<id> = <pnp id string> vga = "VGA Display" vbe = "VBE Display" -xboxvmp = "NV2A Framebuffer" +xbox = "NV2A Framebuffer" [Keyboard] Default = "XT-, AT- or extended keyboard (83-105 keys)" diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index 3735f18982b..6f54188e3f0 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -21,6 +21,8 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); +extern PVOID FrameBuffer; +extern ULONG FrameBufferSize; BOOLEAN XboxFindPciBios(PPCI_REGISTRY_INFO BusData) @@ -160,6 +162,56 @@ XboxGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) return PartialResourceList; } +static VOID +DetectDisplayController(PCONFIGURATION_COMPONENT_DATA BusKey) +{ + CHAR Buffer[80]; + PCONFIGURATION_COMPONENT_DATA ControllerKey; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + ULONG Size; + + if (FrameBufferSize == 0) + return; + + strcpy(Buffer, "NV2A Framebuffer"); + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST); + PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); + if (PartialResourceList == NULL) + { + ERR("Failed to allocate resource descriptor\n"); + return; + } + memset(PartialResourceList, 0, Size); + + /* Initialize resource descriptor */ + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; + + /* Set Memory */ + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeMemory; + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + PartialDescriptor->u.Memory.Start.LowPart = (ULONG_PTR)FrameBuffer & 0x0FFFFFFF; + PartialDescriptor->u.Memory.Length = FrameBufferSize; + + FldrCreateComponentKey(BusKey, + ControllerClass, + DisplayController, + 0x0, + 0x0, + 0xFFFFFFFF, + Buffer, + PartialResourceList, + Size, + &ControllerKey); + + TRACE("Created key: DisplayController\\0\n"); +} + static VOID DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) @@ -202,6 +254,7 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); DetectSerialPorts(BusKey, XboxGetSerialPort, MAX_XBOX_COM_PORTS); + DetectDisplayController(BusKey); /* FIXME: Detect more ISA devices */ } @@ -232,6 +285,7 @@ XboxHwDetect(VOID) /* Create the 'System' key */ FldrCreateSystemKey(&SystemKey); + FldrSetIdentifier(SystemKey, "Original Xbox (PC/AT like)"); GetHarddiskConfigurationData = XboxGetHarddiskConfigurationData; FindPciBios = XboxFindPciBios;

4 years, 6 months

[reactos] 01/01: [SECUR32_WINETEST] Update for new WineHQ certificate

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f6442ffbe3e576c37b65… commit 9f6442ffbe3e576c37b65c8674ba1c2e7d21b2aa Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Jun 8 19:41:32 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Jun 8 20:32:52 2020 +0200 [SECUR32_WINETEST] Update for new WineHQ certificate Cherry-pick https://source.winehq.org/git/wine.git/commit/16254af818095216e10aee4d9032a… CORE-17088 --- modules/rostests/winetests/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/secur32/schannel.c b/modules/rostests/winetests/secur32/schannel.c index 217dbe8dfaa..315133659fe 100644 --- a/modules/rostests/winetests/secur32/schannel.c +++ b/modules/rostests/winetests/secur32/schannel.c @@ -564,7 +564,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

4 years, 6 months

[reactos] 01/01: [WININET_WINETEST][URLMON_WINETEST][SHELL32_APITEST] Skip some tests Due to hangs on test machines ROSTESTS-357 ROSTESTS-358 CORE-17057

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d424a0e08818b28e81c8b… commit d424a0e08818b28e81c8bf12a330804c663d199c Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Jun 8 03:43:43 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon Jun 8 03:43:43 2020 +0300 [WININET_WINETEST][URLMON_WINETEST][SHELL32_APITEST] Skip some tests Due to hangs on test machines ROSTESTS-357 ROSTESTS-358 CORE-17057 --- modules/rostests/apitests/shell32/DragDrop.cpp | 6 ++++++ modules/rostests/apitests/shell32/testlist.c | 2 +- modules/rostests/winetests/urlmon/url.c | 6 ++++++ modules/rostests/winetests/wininet/http.c | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/DragDrop.cpp b/modules/rostests/apitests/shell32/DragDrop.cpp index 46ab8bb1c72..3d5d3d82ce1 100644 --- a/modules/rostests/apitests/shell32/DragDrop.cpp +++ b/modules/rostests/apitests/shell32/DragDrop.cpp @@ -383,6 +383,12 @@ static void DoTestEntry(const TEST_ENTRY *pEntry) START_TEST(DragDrop) { + if (!winetest_interactive) + { + skip("Skipping the test due to crash. CORE-17057\n"); + return; + } + HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok_int(SUCCEEDED(hr), TRUE); diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 74c90e013c6..4818673e1eb 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -40,7 +40,7 @@ const struct test winetest_testlist[] = { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, { "CUserNotification", func_CUserNotification }, - // { "DragDrop", func_DragDrop }, disabled due to CORE-17057 + { "DragDrop", func_DragDrop }, { "ExtractIconEx", func_ExtractIconEx }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu }, diff --git a/modules/rostests/winetests/urlmon/url.c b/modules/rostests/winetests/urlmon/url.c index 1aef981b830..de8f04bef3d 100644 --- a/modules/rostests/winetests/urlmon/url.c +++ b/modules/rostests/winetests/urlmon/url.c @@ -3924,6 +3924,12 @@ START_TEST(url) { HMODULE hurlmon; + if (!winetest_interactive) + { + win_skip("Skipping urlmon:url due to hang ROSTESTS-358\n"); + return; + } + hurlmon = GetModuleHandleA("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); diff --git a/modules/rostests/winetests/wininet/http.c b/modules/rostests/winetests/wininet/http.c index 7b7ccd265ad..09646b18996 100644 --- a/modules/rostests/winetests/wininet/http.c +++ b/modules/rostests/winetests/wininet/http.c @@ -7801,6 +7801,13 @@ static void test_concurrent_header_access(void) START_TEST(http) { HMODULE hdll; + + if (!winetest_interactive) + { + win_skip("Skipping wininet:http due to hang ROSTESTS-357\n"); + return; + } + hdll = GetModuleHandleA("wininet.dll"); if(!GetProcAddress(hdll, "InternetGetCookieExW")) {

4 years, 6 months

[reactos] 05/05: [VSSAPI] Add missing wrapper for ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z and _VSSAPI_CreateVssBackupComponents@4 in msvc.s, to fix MSVC compilation

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1761bedb823d8ac7aa915… commit 1761bedb823d8ac7aa91540f857a2df491d18ead Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Mar 26 16:47:16 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 7 19:45:05 2020 +0200 [VSSAPI] Add missing wrapper for ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z and _VSSAPI_CreateVssBackupComponents@4 in msvc.s, to fix MSVC compilation --- dll/win32/vssapi/msvc.s | 7 +++++++ dll/win32/vssapi/vssapi.spec | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/vssapi/msvc.s b/dll/win32/vssapi/msvc.s index 15121c10e8a..c65d6ae960e 100644 --- a/dll/win32/vssapi/msvc.s +++ b/dll/win32/vssapi/msvc.s @@ -20,4 +20,11 @@ DEFINE_THISCALL_WRAPPER ?Initialize@CVssWriter@@QAGJU_GUID@@PBGW4VSS_USAGE_TYPE@ DEFINE_THISCALL_WRAPPER ?Subscribe@CVssWriter@@QAGJK@Z, _VSSAPI_CVssWriter_Subscribe@8 DEFINE_THISCALL_WRAPPER ?Unsubscribe@CVssWriter@@QAGJXZ, _VSSAPI_CVssWriter_Unsubscribe@4 +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:PROC +ALIAS <&alias> = <&orig> +ENDM + +DEFINE_ALIAS ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z, _VSSAPI_CreateVssBackupComponents@4 + END diff --git a/dll/win32/vssapi/vssapi.spec b/dll/win32/vssapi/vssapi.spec index 6e3f1ade503..7698cba3372 100644 --- a/dll/win32/vssapi/vssapi.spec +++ b/dll/win32/vssapi/vssapi.spec @@ -7,7 +7,8 @@ @ cdecl -arch=i386 ??1CVssWriter@@UAE@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ -@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents +@ stdcall -arch=i386 ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents +@ stdcall -arch=amd64 ?CreateVssBackupComponents@@YAJPEAPEAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ

4 years, 6 months

[reactos] 04/05: [VSSAPI] Import Wine commits "Stub CreateVssBackupComponentsInternal + ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z" https://source.winehq.org/git/wine.git/commit/ce9b5a7e1782828f0a84d31eff73cf643ea4fe85 https://source.winehq.org/git/wine.git/commit/767c94bc5c0b9cdef0465b0fec555d846331fb03 CORE-9511.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23a1f8d335ce39f81a01c… commit 23a1f8d335ce39f81a01cee25a232eb44dca3507 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Mar 25 21:23:37 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 7 19:45:05 2020 +0200 [VSSAPI] Import Wine commits "Stub CreateVssBackupComponentsInternal + ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z" https://source.winehq.org/git/wine.git/commit/ce9b5a7e1782828f0a84d31eff73c… https://source.winehq.org/git/wine.git/commit/767c94bc5c0b9cdef0465b0fec555… CORE-9511. --- dll/win32/vssapi/main.c | 17 +++++++++++++++++ dll/win32/vssapi/vssapi.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dll/win32/vssapi/main.c b/dll/win32/vssapi/main.c index acb24003397..f6c311de4ae 100644 --- a/dll/win32/vssapi/main.c +++ b/dll/win32/vssapi/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "vss.h" #include "vswriter.h" +#include "vsbackup.h" #include "wine/asm.h" #include "wine/debug.h" @@ -94,3 +95,19 @@ HRESULT __thiscall VSSAPI_CVssWriter_Unsubscribe( struct CVssWriter *writer ) return S_OK; } DEFINE_THISCALL_WRAPPER( VSSAPI_CVssWriter_Unsubscribe, 4 ) + +HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup) +{ + FIXME("%p\n", backup); + return E_NOTIMPL; +} + +/****************************************************************** + * ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z + */ +HRESULT WINAPI VSSAPI_CreateVssBackupComponents( IVssBackupComponents **backup ) +{ + FIXME( "%p\n", backup ); + + return CreateVssBackupComponentsInternal(backup); +} diff --git a/dll/win32/vssapi/vssapi.spec b/dll/win32/vssapi/vssapi.spec index 3c6ec60e356..6e3f1ade503 100644 --- a/dll/win32/vssapi/vssapi.spec +++ b/dll/win32/vssapi/vssapi.spec @@ -7,7 +7,7 @@ @ cdecl -arch=i386 ??1CVssWriter@@UAE@XZ(ptr) VSSAPI_CVssWriter_dtor @ stub ?AreComponentsSelected@CVssJetWriter@@IBG_NXZ @ stub ?AreComponentsSelected@CVssWriter@@IBG_NXZ -@ stub ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z +@ stdcall ?CreateVssBackupComponents@@YGJPAPAVIVssBackupComponents@@@Z(ptr) VSSAPI_CreateVssBackupComponents @ stub ?CreateVssExamineWriterMetadata@@YGJPAGPAPAVIVssExamineWriterMetadata@@@Z @ stub ?CreateVssSnapshotSetDescription@@YGJU_GUID@@JPAPAVIVssSnapshotSetDescription@@@Z @ stub ?GetBackupType@CVssJetWriter@@IBG?AW4_VSS_BACKUP_TYPE@@XZ @@ -70,7 +70,7 @@ @ cdecl -arch=i386 ?Subscribe@CVssWriter@@QAGJK@Z(ptr long) VSSAPI_CVssWriter_Subscribe @ stub ?Uninitialize@CVssJetWriter@@QAGXXZ @ cdecl -arch=i386 ?Unsubscribe@CVssWriter@@QAGJXZ(ptr) VSSAPI_CVssWriter_Unsubscribe -@ stub CreateVssBackupComponentsInternal +@ stdcall CreateVssBackupComponentsInternal(ptr) @ stub CreateVssExamineWriterMetadataInternal @ stub CreateVssExpressWriterInternal @ stub CreateWriter

4 years, 6 months

[reactos] 03/05: [PSDK] Import vsbackup.idl from Wine and enable it in CMakeLists.txt Required by vssapi stubs CORE-9511.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3904423d8feba0006245c… commit 3904423d8feba0006245c89db5af461276e9eb85 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Mar 25 21:09:17 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jun 7 19:45:05 2020 +0200 [PSDK] Import vsbackup.idl from Wine and enable it in CMakeLists.txt Required by vssapi stubs CORE-9511. --- sdk/include/psdk/CMakeLists.txt | 1 + sdk/include/psdk/vsbackup.idl | 108 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/sdk/include/psdk/CMakeLists.txt b/sdk/include/psdk/CMakeLists.txt index a30e7cd47cf..36540fa1317 100644 --- a/sdk/include/psdk/CMakeLists.txt +++ b/sdk/include/psdk/CMakeLists.txt @@ -126,6 +126,7 @@ list(APPEND SOURCE urlmon.idl vmr9.idl # vmrender.idl + vsbackup.idl vss.idl vswriter.idl wbemcli.idl diff --git a/sdk/include/psdk/vsbackup.idl b/sdk/include/psdk/vsbackup.idl new file mode 100644 index 00000000000..446d1f98e3d --- /dev/null +++ b/sdk/include/psdk/vsbackup.idl @@ -0,0 +1,108 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "vswriter.idl"; +import "vss.idl"; + +interface IVssAsync; +interface IVssEnumObject; +interface IVssExamineWriterMetadata; +interface IVssWriterComponentsExt; + +cpp_quote("#ifdef _cplusplus") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") +cpp_quote("HRESULT WINAPI CreateVssBackupComponentsInternal(IVssBackupComponents **backup);") +cpp_quote("#ifdef _cplusplus") +cpp_quote("}") +cpp_quote("#endif") + +cpp_quote("static inline HRESULT CreateVssBackupComponents(IVssBackupComponents **backup)") +cpp_quote(" { return CreateVssBackupComponentsInternal(backup); }") + +[ + uuid("665c1d5f-c218-414d-a05d-7fef5f9d5c86"), + local +] +interface IVssBackupComponents : IUnknown +{ + HRESULT GetWriterComponentsCount([out] UINT *components); + HRESULT GetWriterComponents([in] UINT index, [out] IVssWriterComponentsExt **writer); + HRESULT InitializeForBackup( [in, optional, defaultvalue(NULL)] BSTR bstrXML); + HRESULT SetBackupState([in] BOOL select_components, [in] BOOL state, + [in] VSS_BACKUP_TYPE type, [in, defaultvalue(FALSE)] BOOL partial_support); + HRESULT InitializeForRestore([in] BSTR xml); + HRESULT SetRestoreState([in] VSS_RESTORE_TYPE restore); + HRESULT GatherWriterMetadata([out] IVssAsync **async); + HRESULT GetWriterMetadataCount([out] UINT *count); + HRESULT GetWriterMetadata([in] UINT index, [out] VSS_ID *instance, [out] IVssExamineWriterMetadata **metadata); + HRESULT FreeWriterMetadata(); + HRESULT AddComponent([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR wszLogicalPath, + [in] LPCWSTR name); + HRESULT PrepareForBackup([out] IVssAsync **async); + HRESULT AbortBackup(); + HRESULT GatherWriterStatus([out] IVssAsync **async); + HRESULT GetWriterStatusCount([out] UINT *count); + HRESULT FreeWriterStatus(); + HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, + [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); + HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] LPCWSTR options); + HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, + [in] LPCWSTR name, [in] BOOL selected_restore); + HRESULT SetRestoreOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR options); + HRESULT SetAdditionalRestores([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] BOOL additional); + HRESULT SetPreviousBackupStamp([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] LPCWSTR stamp); + HRESULT SaveAsXML([in] BSTR *xml); + HRESULT BackupComplete([out] IVssAsync **async); + HRESULT AddAlternativeLocationMapping([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, + [in] LPCWSTR name, [in] LPCWSTR path, [in] LPCWSTR filespec, [in] BOOL recursive, [in] LPCWSTR destination); + HRESULT AddRestoreSubcomponent([in] VSS_ID id, [in] VSS_COMPONENT_TYPE type, [in] LPCWSTR logical, [in] LPCWSTR name, + [in] LPCWSTR path, [in] LPCWSTR sub_name, [in] BOOL repair); + HRESULT SetFileRestoreStatus([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, + [in] VSS_FILE_RESTORE_STATUS status); + HRESULT AddNewTarget([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] LPCWSTR path, [in] LPCWSTR filename, [in] BOOL recursive, [in] LPCWSTR alternate); + HRESULT SetRangesFilePath([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR logical, [in] LPCWSTR component, + [in] UINT partial, [in] LPCWSTR ranges); + HRESULT PreRestore([out] IVssAsync **async); + HRESULT PostRestore([out] IVssAsync **async); + HRESULT SetContext([in] LONG context); + HRESULT StartSnapshotSet([out] VSS_ID *id); + HRESULT AddToSnapshotSet([in] VSS_PWSZ volume,[in] VSS_ID id,[out] VSS_ID *snapshot); + HRESULT DoSnapshotSet([out] IVssAsync ** async); + HRESULT DeleteSnapshots([in] VSS_ID object, [in] VSS_OBJECT_TYPE type, [in] BOOL force, [in] LONG *snapshots, [in] VSS_ID *id); + HRESULT ImportSnapshots([out] IVssAsync **async); + HRESULT BreakSnapshotSet([in] VSS_ID snapshot); + HRESULT GetSnapshotProperties([in] VSS_ID snapshot, [out] VSS_SNAPSHOT_PROP *prop); + HRESULT Query([in] VSS_ID queried, [in] VSS_OBJECT_TYPE queried_type, [in] VSS_OBJECT_TYPE returned_type, [in] IVssEnumObject **enums); + HRESULT IsVolumeSupported([in] VSS_ID provider, [in] VSS_PWSZ volume,[in] BOOL *supported); + HRESULT DisableWriterClasses([in] const VSS_ID *writer_id, [in] UINT class_id); + HRESULT EnableWriterClasses([in] const VSS_ID *classid, [in] UINT id); + HRESULT DisableWriterInstances([in] const VSS_ID *instance, [in] UINT id); + HRESULT ExposeSnapshot([in] VSS_ID snapshot, [in] VSS_PWSZ path, [in] LONG attributes, + [in] VSS_PWSZ expose, [out] VSS_PWSZ *exposed); + HRESULT RevertToSnapshot([in] VSS_ID snapshot, [in] BOOL force); + HRESULT QueryRevertStatus([in] VSS_PWSZ volume, [out] IVssAsync **async); +};

4 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020