Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[hpoussin] 19092: - pciidex: Fix Hardware IDs returned for channel PDOs

by hpoussin＠svn.reactos.com

- pciidex: Fix Hardware IDs returned for channel PDOs - pciidex: Better test to see if the PCI controller is in compatible or native mode before getting channel resources - pciidex: Change IDE_DRIVE_IDENTIFY structure to IDENTIFY_DATA structure - pciide: Implement PciIdeUseDma - pciide: Tell that channel state is unknown instead of enabled Modified: trunk/reactos/drivers/storage/pciide/pciide.c Modified: trunk/reactos/drivers/storage/pciidex/fdo.c Modified: trunk/reactos/drivers/storage/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h Modified: trunk/reactos/drivers/storage/pciidex/pdo.c Modified: trunk/reactos/w32api/include/ddk/ide.h _____ Modified: trunk/reactos/drivers/storage/pciide/pciide.c --- trunk/reactos/drivers/storage/pciide/pciide.c 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/drivers/storage/pciide/pciide.c 2005-11-09 11:10:24 UTC (rev 19092) @@ -44,10 +44,7 @@ return ChannelDisabled; } - /* FIXME: I don't know where to find the enabled/disabled - * bits for channels, so assume they are always enabled - */ - return ChannelEnabled; + return ChannelStateUnknown; } BOOLEAN NTAPI @@ -74,15 +71,16 @@ return STATUS_SUCCESS; } -BOOLEAN NTAPI +ULONG NTAPI PciIdeUseDma( IN PVOID DeviceExtension, IN PUCHAR CdbCommand, IN PUCHAR Slave) { - DPRINT1("PciIdeUseDma(%p %p %p)\n", DeviceExtension, CdbCommand, Slave); + DPRINT("PciIdeUseDma(%p %p %p)\n", DeviceExtension, CdbCommand, Slave); - return FALSE; + /* Nothing should prevent us to use DMA */ + return 1; } NTSTATUS NTAPI @@ -99,7 +97,7 @@ ControllerProperties->IgnoreActiveBitForAtaDevice = FALSE; ControllerProperties->AlwaysClearBusMasterInterrupt = TRUE; ControllerProperties->PciIdeUseDma = PciIdeUseDma; - ControllerProperties->AlignmentRequirement = 1; /* FIXME */ + ControllerProperties->AlignmentRequirement = 1; ControllerProperties->DefaultPIO = 0; /* FIXME */ ControllerProperties->PciIdeUdmaModesSupported = NULL; /* optional */ _____ Modified: trunk/reactos/drivers/storage/pciidex/fdo.c --- trunk/reactos/drivers/storage/pciidex/fdo.c 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/drivers/storage/pciidex/fdo.c 2005-11-09 11:10:24 UTC (rev 19092) @@ -82,7 +82,6 @@ return Status; } -/* static NTSTATUS ReleaseBusInterface( IN PFDO_DEVICE_EXTENSION DeviceExtension) @@ -99,7 +98,6 @@ return Status; } -*/ NTSTATUS NTAPI PciIdeXAddDevice( @@ -109,6 +107,8 @@ PPCIIDEX_DRIVER_EXTENSION DriverExtension; PFDO_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT Fdo; + ULONG BytesRead; + PCI_COMMON_CONFIG PciConfig; NTSTATUS Status; DPRINT("PciIdeXAddDevice(%p %p)\n", DriverObject, Pdo); @@ -145,10 +145,28 @@ Status = GetBusInterface(DeviceExtension); if (!NT_SUCCESS(Status)) { - DPRINT("GetBusInterface() failed() failed with status 0x%08lx\n", Status); + DPRINT("GetBusInterface() failed with status 0x%08lx\n", Status); + IoDetachDevice(DeviceExtension->LowerDevice); return Status; } + BytesRead = (*DeviceExtension->BusInterface->GetBusData)( + DeviceExtension->BusInterface->Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT("BusInterface->GetBusData() failed()\n"); + ReleaseBusInterface(DeviceExtension); + IoDetachDevice(DeviceExtension->LowerDevice); + return STATUS_IO_DEVICE_ERROR; + } + + DeviceExtension->VendorId = PciConfig.VendorID; + DeviceExtension->DeviceId = PciConfig.DeviceID; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; @@ -156,7 +174,7 @@ static NTSTATUS NTAPI PciIdeXUdmaModesSupported( - IN IDE_DRIVE_IDENTIFY IdentifyData, + IN IDENTIFY_DATA IdentifyData, OUT PULONG BestXferMode, OUT PULONG CurrentXferMode) { @@ -317,7 +335,7 @@ } ChannelState = DeviceExtension->Properties.PciIdeChannelEnabled( DeviceExtension->MiniControllerExtension, i); - if (ChannelState != ChannelEnabled) + if (ChannelState == ChannelDisabled) { DPRINT("Channel %lu is disabled\n", i); continue; _____ Modified: trunk/reactos/drivers/storage/pciidex/miniport.c --- trunk/reactos/drivers/storage/pciidex/miniport.c 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/drivers/storage/pciidex/miniport.c 2005-11-09 11:10:24 UTC (rev 19092) @@ -67,7 +67,7 @@ { PFDO_DEVICE_EXTENSION FdoDeviceExtension; ULONG BytesRead = 0; - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status = STATUS_IO_DEVICE_ERROR; DPRINT("PciIdeXGetBusData(%p %p 0x%lx 0x%lx)\n", DeviceExtension, Buffer, ConfigDataOffset, BufferLength); _____ Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h --- trunk/reactos/drivers/storage/pciidex/pciidex.h 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/drivers/storage/pciidex/pciidex.h 2005-11-09 11:10:24 UTC (rev 19092) @@ -32,6 +32,8 @@ PHYSICAL_ADDRESS BusMasterPortBase; PDEVICE_OBJECT LowerDevice; PDEVICE_OBJECT Pdo[MAX_IDE_CHANNEL]; + USHORT VendorId; + USHORT DeviceId; PBYTE MiniControllerExtension[0]; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; _____ Modified: trunk/reactos/drivers/storage/pciidex/pdo.c --- trunk/reactos/drivers/storage/pciidex/pdo.c 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/drivers/storage/pciidex/pdo.c 2005-11-09 11:10:24 UTC (rev 19092) @@ -18,6 +18,7 @@ OUT ULONG_PTR* Information) { PPDO_DEVICE_EXTENSION DeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; WCHAR Buffer[256]; ULONG Index = 0; ULONG IdType; @@ -27,6 +28,7 @@ IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceExtension->ControllerFdo->DeviceExtension; switch (IdType) { @@ -40,26 +42,62 @@ { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + switch (FdoDeviceExtension->VendorId) + { + case 0x0e11: + Index += swprintf(&Buffer[Index], L"Compaq-%04x", FdoDeviceExtension->DeviceId) + 1; + break; + case 0x1039: + Index += swprintf(&Buffer[Index], L"SiS-%04x", FdoDeviceExtension->DeviceId) + 1; + break; + case 0x1050: + Index += swprintf(&Buffer[Index], L"WinBond-%04x", FdoDeviceExtension->DeviceId) + 1; + break; + case 0x1095: + Index += swprintf(&Buffer[Index], L"CMD-%04x", FdoDeviceExtension->DeviceId) + 1; + break; + case 0x8086: + { + switch (FdoDeviceExtension->DeviceId) + { + case 0x1230: + Index += swprintf(&Buffer[Index], L"Intel-PIIX") + 1; + break; + case 0x7010: + Index += swprintf(&Buffer[Index], L"Intel-PIIX3") + 1; + break; + case 0x7111: + Index += swprintf(&Buffer[Index], L"Intel-PIIX4") + 1; + break; + default: + Index += swprintf(&Buffer[Index], L"Intel-%04x", FdoDeviceExtension->DeviceId) + 1; + break; + } + break; + } + default: + break; + } if (DeviceExtension->Channel == 0) - Index += swprintf(&Buffer[Index], L"Primary_IDE_Channel"); + Index += swprintf(&Buffer[Index], L"Primary_IDE_Channel") + 1; else - Index += swprintf(&Buffer[Index], L"Secondary_IDE_Channel"); - Index++; + Index += swprintf(&Buffer[Index], L"Secondary_IDE_Channel") + 1; + Index += swprintf(&Buffer[Index], L"*PNP0600") + 1; Buffer[Index] = UNICODE_NULL; SourceString.Length = SourceString.MaximumLength = Index * sizeof(WCHAR); SourceString.Buffer = Buffer; break; } case BusQueryCompatibleIDs: + { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - Index += swprintf(&Buffer[Index], - L"*PNP0600"); - Index++; + Index += swprintf(&Buffer[Index], L"*PNP0600") + 1; Buffer[Index] = UNICODE_NULL; SourceString.Length = SourceString.MaximumLength = Index * sizeof(WCHAR); SourceString.Buffer = Buffer; break; + } case BusQueryInstanceID: { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); @@ -69,9 +107,7 @@ } default: DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); return STATUS_NOT_SUPPORTED; } @@ -94,21 +130,22 @@ PPDO_DEVICE_EXTENSION DeviceExtension; PFDO_DEVICE_EXTENSION FdoDeviceExtension; ULONG BaseIndex; + ULONG BytesRead; PCI_COMMON_CONFIG PciConfig; - NTSTATUS Status; NTSTATUS ret = STATUS_UNSUCCESSFUL; DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceExtension->ControllerFdo->DeviceExtension; BaseIndex = DeviceExtension->Channel * 2; - Status = PciIdeXGetBusData( - FdoDeviceExtension->MiniControllerExtension, + BytesRead = (*FdoDeviceExtension->BusInterface->GetBusData)( + FdoDeviceExtension->BusInterface->Context, + PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); - if (!NT_SUCCESS(Status)) - return Status; + if (BytesRead != PCI_COMMON_HDR_LENGTH) + return STATUS_IO_DEVICE_ERROR; /* We have found a known native pci ide controller */ if ((PciConfig.ProgIf & 0x80) && (PciConfig.u.type0.BaseAddresses[4] & PCI_ADDRESS_IO_SPACE)) @@ -122,17 +159,22 @@ *BusMasterPortBase = 0; } - if ((PciConfig.u.type0.BaseAddresses[BaseIndex + 0] & PCI_ADDRESS_IO_SPACE) && - (PciConfig.u.type0.BaseAddresses[BaseIndex + 1] & PCI_ADDRESS_IO_SPACE)) + if ((PciConfig.ProgIf >> BaseIndex) & 0x1) { - /* Channel is enabled */ - *CommandPortBase = PciConfig.u.type0.BaseAddresses[BaseIndex + 0] & PCI_ADDRESS_IO_ADDRESS_MASK; - *ControlPortBase = PciConfig.u.type0.BaseAddresses[BaseIndex + 1] & PCI_ADDRESS_IO_ADDRESS_MASK; - *InterruptVector = PciConfig.u.type0.InterruptLine; - ret = STATUS_SUCCESS; + /* Native mode */ + if ((PciConfig.u.type0.BaseAddresses[BaseIndex + 0] & PCI_ADDRESS_IO_SPACE) && + (PciConfig.u.type0.BaseAddresses[BaseIndex + 1] & PCI_ADDRESS_IO_SPACE)) + { + /* Channel is enabled */ + *CommandPortBase = PciConfig.u.type0.BaseAddresses[BaseIndex + 0] & PCI_ADDRESS_IO_ADDRESS_MASK; + *ControlPortBase = PciConfig.u.type0.BaseAddresses[BaseIndex + 1] & PCI_ADDRESS_IO_ADDRESS_MASK; + *InterruptVector = PciConfig.u.type0.InterruptLine; + ret = STATUS_SUCCESS; + } } else { + /* Compatibility mode */ switch (DeviceExtension->Channel) { case 0: @@ -263,9 +305,7 @@ } default: DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", DeviceTextType); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); return STATUS_NOT_SUPPORTED; } @@ -370,9 +410,7 @@ { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Status = STATUS_NOT_SUPPORTED; break; } @@ -456,9 +494,7 @@ /* We can't forward request to the lower driver, because * we are a Pdo, so we don't have lower driver... */ DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", MinorFunction); -#ifndef NDEBUG - DbgBreakPoint(); -#endif + ASSERT(FALSE); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; } _____ Modified: trunk/reactos/w32api/include/ddk/ide.h --- trunk/reactos/w32api/include/ddk/ide.h 2005-11-09 05:14:12 UTC (rev 19091) +++ trunk/reactos/w32api/include/ddk/ide.h 2005-11-09 11:10:24 UTC (rev 19092) @@ -32,87 +32,173 @@ #endif #define MAX_IDE_CHANNEL 2 +#define MAX_IDE_LINE 2 #define MAX_IDE_DEVICE 2 #include <pshpack1.h> -typedef struct _IDE_DRIVE_IDENTIFY -{ - USHORT GeneralConfiguration; - USHORT NumberOfCylinders; - USHORT Reserved1; - USHORT NumberOfHeads; - USHORT UnformattedBytesPerTrack; - USHORT UnformattedBytesPerSector; - USHORT SectorsPerTrack; - USHORT VendorUnique1[3]; - BYTE SerialNumber[20]; - USHORT BufferType; - USHORT BufferSectorSize; - USHORT NumberOfEccBytes; - BYTE FirmwareRevision[8]; - BYTE ModelNumber[40]; - BYTE MaximumBlockTransfer; - BYTE VendorUnique2; - USHORT DoubleWordIo; - USHORT Capabilities; - USHORT Reserved2; - BYTE VendorUnique3; - BYTE PioCycleTimingMode; - BYTE VendorUnique4; - BYTE DmaCycleTimingMode; - USHORT TranslationFieldsValid:3; - USHORT Reserved3:13; - USHORT NumberOfCurrentCylinders; - USHORT NumberOfCurrentHeads; - USHORT CurrentSectorsPerTrack; - ULONG CurrentSectorCapacity; - USHORT CurrentMultiSectorSetting; - ULONG UserAddressableSectors; - USHORT SingleWordDMASupport : 8; - USHORT SingleWordDMAActive : 8; - USHORT MultiWordDMASupport : 8; - USHORT MultiWordDMAActive : 8; - USHORT AdvancedPIOModes : 8; - USHORT Reserved4 : 8; - USHORT MinimumMWXferCycleTime; - USHORT RecommendedMWXferCycleTime; - USHORT MinimumPIOCycleTime; - USHORT MinimumPIOCycleTimeIORDY; - USHORT Reserved5[11]; - USHORT MajorRevision; - USHORT MinorRevision; - USHORT Reserved6[6]; - USHORT UltraDMASupport : 8; - USHORT UltraDMAActive : 8; - USHORT Reserved7[37]; - USHORT LastLun:3; - USHORT Reserved8:13; - USHORT MediaStatusNotification:2; - USHORT Reserved9:6; - USHORT DeviceWriteProtect:1; - USHORT Reserved10:7; - USHORT Reserved11[128]; -} IDE_DRIVE_IDENTIFY, *PIDE_DRIVE_IDENTIFY; +typedef struct _IDENTIFY_DATA { + USHORT GeneralConfiguration; /* 00 */ + USHORT NumCylinders; /* 02 */ + USHORT Reserved1; /* 04 */ + USHORT NumHeads; /* 06 */ + USHORT UnformattedBytesPerTrack; /* 08 */ + USHORT UnformattedBytesPerSector; /* 10 */ + USHORT NumSectorsPerTrack; /* 12 */ + USHORT VendorUnique1[3]; /* 14 */ + UCHAR SerialNumber[20]; /* 20 */ + USHORT BufferType; /* 40 */ + USHORT BufferSectorSize; /* 42 */ + USHORT NumberOfEccBytes; /* 44 */ + UCHAR FirmwareRevision[8]; /* 46 */ + UCHAR ModelNumber[40]; /* 54 */ + UCHAR MaximumBlockTransfer; /* 94 */ + UCHAR VendorUnique2; /* 95 */ + USHORT DoubleWordIo; /* 96 */ + USHORT Capabilities; /* 98 */ + USHORT Reserved2; /* 100 */ + UCHAR VendorUnique3; /* 102 */ + UCHAR PioCycleTimingMode; /* 103 */ + UCHAR VendorUnique4; /* 104 */ + UCHAR DmaCycleTimingMode; /* 105 */ + USHORT TranslationFieldsValid:3; /* 106 */ + USHORT Reserved3:13; /* - */ + USHORT NumberOfCurrentCylinders; /* 108 */ + USHORT NumberOfCurrentHeads; /* 110 */ + USHORT CurrentSectorsPerTrack; /* 112 */ + ULONG CurrentSectorCapacity; /* 114 */ + USHORT CurrentMultiSectorSetting; /* 118 */ + ULONG UserAddressableSectors; /* 120 */ + USHORT SingleWordDMASupport:8; /* 124 */ + USHORT SingleWordDMAActive:8; /* - */ + USHORT MultiWordDMASupport:8; /* 126 */ + USHORT MultiWordDMAActive:8; /* - */ + USHORT AdvancedPIOModes:8; /* 128 */ + USHORT Reserved4:8; /* - */ + USHORT MinimumMWXferCycleTime; /* 130 */ + USHORT RecommendedMWXferCycleTime; /* 132 */ + USHORT MinimumPIOCycleTime; /* 134 */ + USHORT MinimumPIOCycleTimeIORDY; /* 136 */ + USHORT Reserved5[11]; /* 138 */ + USHORT MajorRevision; /* 160 */ + USHORT MinorRevision; /* 162 */ + USHORT Reserved6; /* 164 */ + USHORT CommandSetSupport; /* 166 */ + USHORT Reserved6a[2]; /* 168 */ + USHORT CommandSetActive; /* 172 */ + USHORT Reserved6b; /* 174 */ + USHORT UltraDMASupport:8; /* 176 */ + USHORT UltraDMAActive:8; /* - */ + USHORT Reserved7[11]; /* 178 */ + ULONG Max48BitLBA[2]; /* 200 */ + USHORT Reserved7a[22]; /* 208 */ + USHORT LastLun:3; /* 252 */ + USHORT Reserved8:13; /* - */ + USHORT MediaStatusNotification:2; /* 254 */ + USHORT Reserved9:6; /* - */ + USHORT DeviceWriteProtect:1; /* - */ + USHORT Reserved10:7; /* - */ + USHORT Reserved11[128]; /* 256 */ +} IDENTIFY_DATA, *PIDENTIFY_DATA; + +typedef struct _EXTENDED_IDENTIFY_DATA { + USHORT GeneralConfiguration; /* 00 */ + USHORT NumCylinders; /* 02 */ + USHORT Reserved1; /* 04 */ + USHORT NumHeads; /* 06 */ + USHORT UnformattedBytesPerTrack; /* 08 */ + USHORT UnformattedBytesPerSector; /* 10 */ + USHORT NumSectorsPerTrack; /* 12 */ + union + { + USHORT VendorUnique1[3]; /* 14 */ + struct + { + UCHAR InterSectorGap; /* 14 */ + UCHAR InterSectorGapSize; /* - */ + UCHAR Reserved16; /* 16 */ + UCHAR BytesInPLO; /* - */ + USHORT VendorUniqueCnt; /* 18 */ + } u; + }; + UCHAR SerialNumber[20]; /* 20 */ + USHORT BufferType; /* 40 */ + USHORT BufferSectorSize; /* 42 */ + USHORT NumberOfEccBytes; /* 44 */ + UCHAR FirmwareRevision[8]; /* 46 */ + UCHAR ModelNumber[40]; /* 54 */ + UCHAR MaximumBlockTransfer; /* 94 */ + UCHAR VendorUnique2; /* 95 */ + USHORT DoubleWordIo; /* 96 */ + USHORT Capabilities; /* 98 */ + USHORT Reserved2; /* 100 */ + UCHAR VendorUnique3; /* 102 */ + UCHAR PioCycleTimingMode; /* 103 */ + UCHAR VendorUnique4; /* 104 */ + UCHAR DmaCycleTimingMode; /* 105 */ + USHORT TranslationFieldsValid:3; /* 106 */ + USHORT Reserved3:13; /* - */ + USHORT NumberOfCurrentCylinders; /* 108 */ + USHORT NumberOfCurrentHeads; /* 110 */ + USHORT CurrentSectorsPerTrack; /* 112 */ + ULONG CurrentSectorCapacity; /* 114 */ + USHORT CurrentMultiSectorSetting; /* 118 */ + ULONG UserAddressableSectors; /* 120 */ + USHORT SingleWordDMASupport:8; /* 124 */ + USHORT SingleWordDMAActive:8; /* - */ + USHORT MultiWordDMASupport:8; /* 126 */ + USHORT MultiWordDMAActive:8; /* - */ + USHORT AdvancedPIOModes:8; /* 128 */ + USHORT Reserved4:8; /* - */ + USHORT MinimumMWXferCycleTime; /* 130 */ + USHORT RecommendedMWXferCycleTime; /* 132 */ + USHORT MinimumPIOCycleTime; /* 134 */ + USHORT MinimumPIOCycleTimeIORDY; /* 136 */ + USHORT Reserved5[11]; /* 138 */ + USHORT MajorRevision; /* 160 */ + USHORT MinorRevision; /* 162 */ + USHORT Reserved6; /* 164 */ + USHORT CommandSetSupport; /* 166 */ + USHORT Reserved6a[2]; /* 168 */ + USHORT CommandSetActive; /* 172 */ + USHORT Reserved6b; /* 174 */ + USHORT UltraDMASupport:8; /* 176 */ + USHORT UltraDMAActive:8; /* - */ + USHORT Reserved7[11]; /* 178 */ + ULONG Max48BitLBA[2]; /* 200 */ + USHORT Reserved7a[22]; /* 208 */ + USHORT LastLun:3; /* 252 */ + USHORT Reserved8:13; /* - */ + USHORT MediaStatusNotification:2; /* 254 */ + USHORT Reserved9:6; /* - */ + USHORT DeviceWriteProtect:1; /* - */ + USHORT Reserved10:7; /* - */ + USHORT Reserved11[128]; /* 256 */ +} EXTENDED_IDENTIFY_DATA, *PEXTENDED_IDENTIFY_DATA; #include <poppack.h> typedef struct _PCIIDE_TRANSFER_MODE_SELECT { ULONG Channel; - BOOLEAN DevicePresent[MAX_IDE_DEVICE]; - BOOLEAN FixedDisk[MAX_IDE_DEVICE]; - BOOLEAN IoReadySupported[MAX_IDE_DEVICE]; - ULONG DeviceTransferModeSupported[MAX_IDE_DEVICE]; - ULONG BestPioCycleTime[MAX_IDE_DEVICE]; - ULONG BestSwDmaCycleTime[MAX_IDE_DEVICE]; - ULONG BestMwDmaCycleTime[MAX_IDE_DEVICE]; - ULONG BestUDmaCycleTime[MAX_IDE_DEVICE]; - ULONG DeviceTransferModeCurrent[MAX_IDE_DEVICE]; - ULONG DeviceTransferModeSelected[MAX_IDE_DEVICE]; + BOOLEAN DevicePresent[MAX_IDE_DEVICE * MAX_IDE_LINE]; + BOOLEAN FixedDisk[MAX_IDE_DEVICE * MAX_IDE_LINE]; + BOOLEAN IoReadySupported[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG DeviceTransferModeSupported[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG BestPioCycleTime[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG BestSwDmaCycleTime[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG BestMwDmaCycleTime[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG BestUDmaCycleTime[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG DeviceTransferModeCurrent[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG UserChoiceTransferMode[MAX_IDE_DEVICE * MAX_IDE_LINE]; + ULONG EnableUDMA66; + IDENTIFY_DATA IdentifyData[MAX_IDE_DEVICE]; + ULONG DeviceTransferModeSelected[MAX_IDE_DEVICE * MAX_IDE_LINE]; + PULONG TransferModeTimingTable; + ULONG TransferModeTableLength; } PCIIDE_TRANSFER_MODE_SELECT, *PPCIIDE_TRANSFER_MODE_SELECT; typedef enum { - ChannelDisabled, + ChannelDisabled = 0, ChannelEnabled, ChannelStateUnknown } IDE_CHANNEL_STATE; @@ -131,7 +217,7 @@ IN PVOID DeviceExtension, IN OUT PPCIIDE_TRANSFER_MODE_SELECT XferMode); -typedef BOOLEAN +typedef ULONG (NTAPI *PCIIDE_USEDMA_FUNC)( IN PVOID DeviceExtension, IN PUCHAR CdbCommand, @@ -139,7 +225,7 @@ typedef NTSTATUS (NTAPI *PCIIDE_UDMA_MODES_SUPPORTED)( - IN IDE_DRIVE_IDENTIFY IdentifyData, + IN IDENTIFY_DATA IdentifyData, OUT PULONG BestXferMode, OUT PULONG CurrentXferMode); @@ -210,6 +296,7 @@ #define UDMA_MODE2 (1 << 13) #define UDMA_MODE3 (1 << 14) #define UDMA_MODE4 (1 << 15) +#define UDMA_MODE5 (1 << 16) #ifdef __cplusplus }

18 years, 10 months

[ion] 19091: - Current WIP ws2_32 that was tested on the ML, with some new changes to fully support GetNameInfoW. Tested working with over 30 applications. Uncompilable/unusable in ROS yet, only commiting for progress status.

by ion＠svn.reactos.com

- Current WIP ws2_32 that was tested on the ML, with some new changes to fully support GetNameInfoW. Tested working with over 30 applications. Uncompilable/unusable in ROS yet, only commiting for progress status. Full changelog: Revision: 43 Author: Date: 12:05:25 AM, November 9, 2005 Message: - Update headers with my name, and fix some other typos. ---- Revision: 41 Author: Date: 9:13:43 PM, November 4, 2005 Message: - Cleanup bug list to make it clearer - Implement WSAAddressToSrringA ---- Revision: 40 Author: Date: 9:06:17 PM, November 4, 2005 Message: - Fix a bug in LookupNodeByAddr - Fix some PREfast warnings. ---- Revision: 39 Author: Date: 8:17:00 PM, November 4, 2005 Message: - Get the reverse name correctly. This fixes GetNameInfoW for most usages (tracert works perfectly) ---- Revision: 38 Author: Date: 7:54:56 PM, November 4, 2005 Message: - Implement LookupNodeByAddr for GetNameInfoW. - Fix a bug in GetNameInfoW when passing a parameter to LookupNodeByAddr. - Remove GetNameInfoW from unimplemented bug-list, since it's 99% working. ---- Revision: 37 Author: Date: 4:07:51 AM, November 4, 2005 Message: - Fix a bug in GetNameInfoW: zero the port, not the address. Ping now shows the right numeric address. ---- Revision: 36 Author: Date: 4:05:02 AM, November 4, 2005 Message: - Fix some bugs in previous two patches. ping now shows "0.0.0.0" ---- Revision: 35 Author: Date: 3:54:37 AM, November 4, 2005 Message: - Implemented WSAAddressToStringW. ---- Revision: 34 Author: Date: 3:52:51 AM, November 4, 2005 Message: - Implemented GetNameInfoW (not its helper functions! doesn't work yet!) ---- Revision: 33 Author: Date: 1:46:59 AM, November 4, 2005 Message: - Implement getnameinfo (NOT GetNameInfoW, just the stub calling it) ---- Revision: 32 Author: Date: 9:50:05 PM, November 3, 2005 Message: - Simply getaddrinfo to make use of ansi/unicode duplication functions already present in qshelpr.c - Implement ConvertAddrinfoFromUnicodeToAnsi to cleanly convert ADDRINFOW to ADDRINFOA, also fixes the bug where only the first canonical name was converted. - Remove the disabled code which actually did the work for NSPStartup and WSPStartup. - Update buglist accordingly. ---- Revision: 30 Author: Date: 12:30:29 AM, November 1, 2005 Message: - Add UNIMPLEMENTED wherever it was missing. ---- Revision: 29 Author: Date: 12:27:26 AM, November 1, 2005 Message: - Implement WSANtohl, WSANtohs, WSAHtonl, WSAHtons. Opera now works. - Fix some GetNameInfoW to return correct failure. ---- Revision: 28 Author: Date: 4:25:38 PM, October 30, 2005 Message: - Implement WSAStringToAddressA/W. This makes SmartFTP work with IP lookups, but hostname lookup still fail? ---- Revision: 27 Author: Date: 1:23:52 PM, October 30, 2005 Message: - Fix regressions/bugs in last patch: * Fix Query validation checks * Fix Query signature not being set anywhere - Fix DLL_THREAD_DETACH leaking into DLL_PROCESS_DETACH due to missing break; statement. ---- Revision: 26 Author: Date: 1:35:21 AM, October 30, 2005 Message: - Major refactoring of NS Query Object: * Remove active calls field and operations * Add RefCount member and provide referencing/dereferencing mechanisms * Implement WsNqValidateAndReference for validation and referencing * Add preliminary special support for providers supporting NSPIoctl * Rewrite most of WsNqLookupServiceNext to work with more optimized semantics and NSPIoctl support. * Fixed some potential locking/race issues. - UNTESTED! ---- Revision: 25 Author: Date: 11:03:00 PM, October 29, 2005 Message: - Fix WsRasLoadHelperDll: * Do proper check for initialization * Actually save the loaded DLL handle after loading the DLL, instead of failing - Make the NS Query object initalizer set TryAgain to TRUE so that RAS Auto-Dial will function normally. ---- Revision: 24 Author: Date: 10:20:46 PM, October 29, 2005 Message: - Fix regression in getxyent which made all requests get overwritten and fail. - Re-export getaddrinfo/getnameinfo, since many XP apps have them hard-coded and removing them actually causes more problems. ---- Revision: 23 Author: Date: 10:08:12 PM, October 29, 2005 Message: - Don't enter the startup lock in a loop. Fixes regressions with all apps. - Don't export getnameinfo/getaddrinfo, since they contain bugs: this way, the apps will use their internal replacement code. ---- Revision: 22 Author: Date: 8:38:40 PM, October 29, 2005 Message: - Major fixes in getxbyxx.c: * Allocate bigger buffer in case our estimate RNR_BUFFER_SIZE is not big enough. * Update and fix GUID names and usage * Rename some variables and reformat a bit * Add RAS Auto-dial call in gethostbyname * Use WsSockHeap instead of LocalAlloc/Free * Update gethostbyname to try the call again in case the first time failed, but this time without supplying a name. ---- Revision: 21 Author: Date: 8:11:32 PM, October 29, 2005 Message: - Enable full debugging for now - Fix typo in WSNoteSuccessfulHostentLookup - Support RAS-Autodial in gethostbyname ---- Revision: 19 Author: Date: 5:25:18 PM, October 29, 2005 Message: - Support RAS-Autodial restart in connect() ---- Revision: 18 Author: Date: 3:15:58 PM, October 29, 2005 Message: - Implement CopyQuerySetW helper to create a copy of a Query Set by using the existing convesion functions. - Actually implement caching in LookupServiceBegin in case of RAS Auto-dial - Simplify LookupServiceBegin to use a goto error instead of repetitive errorcode checks. ---- Revision: 17 Author: Date: 3:06:22 PM, October 29, 2005 Message: - Update NSQUERY to support restarting. - Add RAS Auto-dial call to LookupServiceNext to support restart. ---- Revision: 16 Author: Date: 4:08:28 AM, October 29, 2005 Message: - Modularize the async/startup locks better by having their init functions into their own modules. - Use startup lock/unlock macros just like for the other locks. ---- Revision: 15 Author: Date: 4:01:20 AM, October 29, 2005 Message: - Get RAS Autodial function helper pointers - Call init/uninit during dllmain ---- Revision: 14 Author: Date: 1:45:36 PM, October 28, 2005 Message: - Implement RAS Autodial Helper stubs. ---- Revision: 13 Author: Date: 1:33:07 PM, October 28, 2005 Message: - Add RAS Autodial module and basic support functions. ---- Revision: 12 Author: Date: 1:11:38 PM, October 28, 2005 Message: - Implement IPv4 and IPv6 Address->String helprs - Have gethostbyaddr detect the address type and choose the right conversion function. - Fix gethostbyaddr so that it fails if no address pointer was given or if the address type is unsupported. - Fix bug list accordingly. ---- Revision: 11 Author: Date: 3:55:44 AM, October 28, 2005 Message: - Implement MapUnicodeProtocolInfoToAnsi - Make WSADuplicateSocketA use it. - Fix getsockopt so that the SO_PROTOCOL_INFOA can work by having it use MapUnicodeProtocolInfoToAnsi as well in order to convert the data back. - Update bug list accordingly. ---- Revision: 10 Author: Date: 3:45:09 AM, October 28, 2005 Message: - Enhance WsTcGetEntryFromTriplet to allow for resuming from a specific ID - Use this enhancement to add support for a special failure path in WSASocketW - Update buglist accordingly. ---- Revision: 9 Author: Date: 3:36:53 AM, October 28, 2005 Message: - lResult (old naming from old code) -> ErrorCode (new naming in rewrite) - Update one more registry field in case it's missing, and update bug list accordingly. ---- Revision: 8 Author: Date: 3:28:35 AM, October 28, 2005 Message: - Update buglist - Add support for writing catalog data if it's not found. ---- Revision: 7 Author: Date: 12:49:08 AM, October 28, 2005 Message: - Fix top-level headers ---- Revision: 6 Author: Date: 11:36:39 PM, October 27, 2005 Message: - Implement WsSetupCatalogProtection ---- Revision: 5 Author: Date: 10:57:30 PM, October 27, 2005 Message: - Add more error case handling for refreshing catalog data from registry. ---- Revision: 4 Author: Date: 9:38:39 PM, October 27, 2005 Message: - Add more debug prints to newly implemented functions. ---- Revision: 3 Author: Date: 9:11:38 PM, October 27, 2005 Message: - Only free addresses from heap if they've been allocated. Fixes non-existent heap freeing error. ---- Revision: 2 Author: Date: 9:08:36 PM, October 27, 2005 Message: - Allocate space for a BLOB, not a GUID. Fixes heap corruption. ---- Revision: 1 Author: Administrator Date: 5:53:12 PM, October 27, 2005 Message: Initial import ---- Added: branches/alex-network-branch/reactos/lib/ws2_32/inc/ Added: branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32.h Added: branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32p.h Deleted: branches/alex-network-branch/reactos/lib/ws2_32/include/ Deleted: branches/alex-network-branch/reactos/lib/ws2_32/misc/ Added: branches/alex-network-branch/reactos/lib/ws2_32/src/ Added: branches/alex-network-branch/reactos/lib/ws2_32/src/addrconv.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/addrinfo.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/async.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/bhook.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dcatalog.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dcatitem.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dllmain.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dprocess.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dprovide.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dsocket.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dthread.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/dupsock.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/enumprot.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/event.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/getproto.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/getxbyxx.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/ioctl.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/nscatalo.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/nscatent.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/nspinstl.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/nsprovid.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/nsquery.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/qos.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/qshelpr.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/rasdial.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/recv.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/rnr.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/scihlpr.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/select.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/send.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/sockctrl.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/socklife.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/spinstal.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/sputil.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/startup.c Added: branches/alex-network-branch/reactos/lib/ws2_32/src/wsautil.c Deleted: branches/alex-network-branch/reactos/lib/ws2_32/tests/ Modified: branches/alex-network-branch/reactos/lib/ws2_32/ws2_32.def Modified: branches/alex-network-branch/reactos/lib/ws2_32/ws2_32.rc Deleted: branches/alex-network-branch/reactos/lib/ws2_32/ws2_32.xml Deleted: branches/alex-network-branch/reactos/lib/ws2_32/ws2_32_specs _____ Added: branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32.h --- branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32.h 2005-11-09 05:06:30 UTC (rev 19090) +++ branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32.h 2005-11-09 05:14:12 UTC (rev 19091) @@ -0,0 +1,43 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2.2 Library + * FILE: lib/ws2_32.h + * PURPOSE: WinSock 2.2 Main Header + */ + +#ifndef __WS2_32_H +#define __WS2_32_H + +/* Definitions for NDK Usage */ +#define WIN32_NO_STATUS +#define _WIN32_WINNT 0x502 +#define NTOS_MODE_USER +#define _CRT_SECURE_NO_DEPRECATE +#define WINSOCK_API_LINKAGE +#define DBG 1 + +/* C Header */ +#include <stdio.h> + +/* PSDK and NDK Headers */ +#include <winsock2.h> +#include <Ws2tcpip.h> +#include <Ws2spi.h> +#include <ndk/umtypes.h> +#include <ndk/rtlfuncs.h> + +/* Shared NSP Headers */ +#include <nsp_dns.h> + +/* Winsock Helper Header */ +#include <ws2help.h> + +/* Missing definitions */ +#define SO_OPENTYPE 0x7008 +#define SO_SYNCHRONOUS_NONALERT 0x20 + +/* Internal headers */ +#include "ws2_32p.h" + +#endif + _____ Added: branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32p.h --- branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32p.h 2005-11-09 05:06:30 UTC (rev 19090) +++ branches/alex-network-branch/reactos/lib/ws2_32/inc/ws2_32p.h 2005-11-09 05:14:12 UTC (rev 19091) @@ -0,0 +1,891 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2.2 Library + * FILE: lib/ws2_32.h + * PURPOSE: WinSock 2.2 Main Header + */ + +#ifndef __WS2_32P_H +#define __WS2_32P_H + +#define WINSOCK_ROOT "System\\CurrentControlSet\\Services\\WinSock2\\Parameters" +#define MAXALIASES 35 + +typedef enum _WSASYNCOPS +{ + WsAsyncGetHostByAddr, + WsAsyncGetHostByName, + WsAsyncGetProtoByName, + WsAsyncGetProtoByNumber, + WsAsyncGetServByName, + WsAsyncGetServByPort, + WsAsyncTerminate, +} WSASYNCOPS; + +typedef struct _WSASYNCBLOCK +{ + LIST_ENTRY AsyncQueue; + HANDLE TaskHandle; + WSASYNCOPS Operation; + union + { + struct + { + HWND hWnd; + UINT wMsg; + PCHAR ByWhat; + DWORD Length; + DWORD Type; + PVOID Buffer; + DWORD BufferLength; + } GetHost; + struct + { + HWND hWnd; + UINT wMsg; + PCHAR ByWhat; + DWORD Length; + PVOID Buffer; + DWORD BufferLength; + } GetProto; + struct + { + HWND hWnd; + UINT wMsg; + PCHAR ByWhat; + DWORD Length; + PCHAR Protocol; + PVOID Buffer; + DWORD BufferLength; + } GetServ; + }; +} WSASYNCBLOCK, *PWSASYNCBLOCK; + +typedef struct _WSASYNCCONTEXT +{ + LIST_ENTRY AsyncQueue; + HANDLE AsyncEvent; + LIST_ENTRY SocketList; +} WSASYNCCONTEXT, *PWSASYNCCONTEXT; + +typedef struct _WSPROTO_BUFFER +{ + PROTOENT Protoent; + PCHAR Aliases[MAXALIASES]; + CHAR LineBuffer[512]; +} WSPROTO_BUFFER, *PWSPROTO_BUFFER; + +typedef struct _TPROVIDER +{ + LONG RefCount; + WSPPROC_TABLE; + HINSTANCE DllHandle; +} TPROVIDER, *PTPROVIDER; + +typedef struct _TCATALOG_ENTRY +{ + LIST_ENTRY CatalogLink; + LONG RefCount; + PTPROVIDER Provider; + CHAR DllPath[MAX_PATH]; + WSAPROTOCOL_INFOW ProtocolInfo; +} TCATALOG_ENTRY, *PTCATALOG_ENTRY; + +typedef struct _TCATALOG +{ + LIST_ENTRY ProtocolList; + DWORD ItemCount; + DWORD UniqueId; + DWORD NextId; + HKEY CatalogKey; + RTL_CRITICAL_SECTION Lock; + BOOLEAN Initialized; +} TCATALOG, *PTCATALOG; + +typedef struct _NSPROVIDER +{ + LONG RefCount; + DWORD NamespaceId; + HINSTANCE DllHandle; + GUID ProviderId; + NSP_ROUTINE; +} NSPROVIDER, *PNS_PROVIDER; + +typedef struct _NSQUERY_PROVIDER +{ + LIST_ENTRY QueryLink; + PNS_PROVIDER Provider; + HANDLE LookupHandle; +} NSQUERY_PROVIDER, *PNSQUERY_PROVIDER; + +typedef struct _NSCATALOG_ENTRY +{ + LIST_ENTRY CatalogLink; + LONG RefCount; + PNS_PROVIDER Provider; + LONG AddressFamily; + DWORD NamespaceId; + DWORD Version; + LPWSTR ProviderName; + BOOLEAN Enabled; + BOOLEAN StoresServiceClassInfo; + GUID ProviderId; + WCHAR DllPath[MAX_PATH]; +} NSCATALOG_ENTRY, *PNSCATALOG_ENTRY; + +typedef struct _NSCATALOG +{ + LIST_ENTRY CatalogList; + DWORD ItemCount; + DWORD UniqueId; + HKEY CatalogKey; + RTL_CRITICAL_SECTION Lock; +} NSCATALOG, *PNSCATALOG; + +typedef struct _NSQUERY +{ + DWORD Signature; + LONG RefCount; + BOOLEAN ShuttingDown; + LIST_ENTRY ProviderList; + PNSQUERY_PROVIDER ActiveProvider; + RTL_CRITICAL_SECTION Lock; + PNSQUERY_PROVIDER CurrentProvider; + LPWSAQUERYSETW QuerySet; + DWORD ControlFlags; + PNSCATALOG Catalog; + DWORD TryAgain; +} NSQUERY, *PNSQUERY; + +typedef struct _WSPROCESS +{ + LONG RefCount; + HANDLE ApcHelper; + HANDLE HandleHelper; + HANDLE NotificationHelper; + PTCATALOG ProtocolCatalog; + PNSCATALOG NamespaceCatalog; + HANDLE ProtocolCatalogEvent; + HANDLE NamespaceCatalogEvent; + DWORD Version; + BOOLEAN LockReady; + RTL_CRITICAL_SECTION ThreadLock; +} WSPROCESS, *PWSPROCESS; + +typedef struct _WSTHREAD +{ + PWSPROCESS Process; + WSATHREADID WahThreadId; + HANDLE AsyncHelper; + LPWSPCANCELBLOCKINGCALL CancelBlockingCall; + LPBLOCKINGCALLBACK BlockingCallback; + FARPROC BlockingHook; + BOOLEAN Blocking; + BOOLEAN Cancelled; + CHAR Buffer[32]; + PCHAR Hostent; + PCHAR Servent; + DWORD HostentSize; + DWORD ServentSize; + DWORD OpenType; + PVOID ProtocolInfo; +} WSTHREAD, *PWSTHREAD; + +typedef struct _WSSOCKET +{ + LONG RefCount; + HANDLE Handle; + PWSPROCESS Process; + PTPROVIDER Provider; + PTCATALOG_ENTRY CatalogEntry; + BOOLEAN Overlapped; + BOOLEAN ApiSocket; + BOOLEAN IsProvider; +} WSSOCKET, *PWSSOCKET; + +typedef struct _ENUM_CONTEXT +{ + LPWSAQUERYSETW lpqsRestrictions; + INT ErrorCode; + PNSQUERY NsQuery; + PNSCATALOG Catalog; +} ENUM_CONTEXT, *PENUM_CONTEXT; + +typedef struct _PROTOCOL_ENUM_CONTEXT +{ + LPINT Protocols; + LPWSAPROTOCOL_INFOW ProtocolBuffer; + DWORD BufferLength; + DWORD BufferUsed; + DWORD Count; + INT ErrorCode; +} PROTOCOL_ENUM_CONTEXT, *PPROTOCOL_ENUM_CONTEXT; + +typedef struct _WS_BUFFER +{ + ULONG_PTR Position; + SIZE_T MaxSize; + SIZE_T BytesUsed; +} WS_BUFFER, *PWS_BUFFER; + +typedef BOOL +(WINAPI *PNSCATALOG_ENUMERATE_PROC)( + IN PVOID Context, + IN PNSCATALOG_ENTRY Entry +); + +typedef BOOL +(WINAPI *PTCATALOG_ENUMERATE_PROC)( + IN PVOID Context, + IN PTCATALOG_ENTRY Entry +); + +typedef BOOL +(WINAPI *PWS_SOCK_POST_ROUTINE)( + IN HWND hWnd, + IN UINT wMsg, + IN WPARAM wParam, + IN LPARAM lParam +); + +extern HINSTANCE WsDllHandle; +extern HANDLE WsSockHeap; +extern PWAH_HANDLE_TABLE WsSockHandleTable; +extern DWORD TlsIndex; +extern PWSPROCESS CurrentWsProcess; +extern DWORD GlobalTlsIndex; +extern BOOLEAN WsAsyncThreadInitialized; +extern PWS_SOCK_POST_ROUTINE WsSockPostRoutine; + +LPSTR +WSAAPI +AnsiDupFromUnicode(IN LPWSTR UnicodeString); + +LPWSTR +WSAAPI +UnicodeDupFromAnsi(IN LPSTR AnsiString); + +VOID +WSAAPI +WsRasInitializeAutodial(VOID); + +VOID +WSAAPI +WsRasUninitializeAutodial(VOID); + +BOOL +WSAAPI +WSAttemptAutodialName(IN CONST LPWSAQUERYSETW lpqsRestrictions); + +BOOL +WSAAPI +WSAttemptAutodialAddr( + IN CONST SOCKADDR FAR *Name, + IN INT NameLength +); + +VOID +WSAAPI +WSNoteSuccessfulHostentLookup( + IN CONST CHAR FAR *Name, + IN CONST ULONG Address +); + +INT +WSAAPI +MapUnicodeProtocolInfoToAnsi(IN LPWSAPROTOCOL_INFOW UnicodeInfo, + OUT LPWSAPROTOCOL_INFOA AnsiInfo); + +INT +WSAAPI +MapAnsiQuerySetToUnicode(IN LPWSAQUERYSETA AnsiSet, + IN OUT PSIZE_T SetSize, + OUT LPWSAQUERYSETW UnicodeSet); + +INT +WSAAPI +MapUnicodeQuerySetToAnsi(OUT LPWSAQUERYSETW UnicodeSet, + IN OUT PSIZE_T SetSize, + IN LPWSAQUERYSETA AnsiSet); + +INT +WSAAPI +CopyQuerySetW(IN LPWSAQUERYSETW UnicodeSet, + OUT LPWSAQUERYSETW *UnicodeCopy); + +INT +WSAAPI +WsSlowProlog(VOID); + +INT +WSAAPI +WsSlowPrologTid(OUT LPWSATHREADID *ThreadId); + +PWSSOCKET +WSAAPI +WsSockGetSocket(IN SOCKET Handle); + +INT +WSAAPI +WsApiProlog(OUT PWSPROCESS *Process, + OUT PWSTHREAD *Thread); + +HKEY +WSAAPI +WsOpenRegistryRoot(VOID); + +VOID +WSAAPI +WsCreateStartupSynchronization(VOID); + +VOID +WSAAPI +WsDestroyStartupSynchronization(VOID); + +INT +WSAAPI +WsSetupCatalogProtection(IN HKEY CatalogKey, + IN HANDLE CatalogEvent, + OUT LPDWORD UniqueId); + +BOOL +WSAAPI +WsCheckCatalogState(IN HANDLE Event); + +PNSCATALOG +WSAAPI +WsNcAllocate(VOID); + +VOID +WSAAPI +WsNcDelete(IN PNSCATALOG Catalog); + +INT +WSAAPI +WsNcInitializeFromRegistry(IN PNSCATALOG Catalog, + IN HKEY ParentKey, + IN HANDLE CatalogEvent); + +INT +WSAAPI +WsNcRefreshFromRegistry(IN PNSCATALOG Catalog, + IN HANDLE CatalogEvent); + +VOID +WSAAPI +WsNcUpdateNamespaceList(IN PNSCATALOG Catalog, + IN PLIST_ENTRY List); + +BOOL +WSAAPI +WsNcMatchProtocols(IN DWORD NameSpace, + IN LONG AddressFamily, + IN LPWSAQUERYSETW QuerySet); + +INT +WSAAPI +WsNcLoadProvider(IN PNSCATALOG Catalog, + IN PNSCATALOG_ENTRY CatalogEntry); + +INT +WSAAPI +WsNcGetCatalogFromProviderId(IN PNSCATALOG Catalog, + IN LPGUID ProviderId, + OUT PNSCATALOG_ENTRY *CatalogEntry); + +VOID +WSAAPI +WsNcEnumerateCatalogItems(IN PNSCATALOG Catalog, + IN PNSCATALOG_ENUMERATE_PROC Callback, + IN PVOID Context); + +INT +WSAAPI +WsNcGetServiceClassInfo(IN PNSCATALOG Catalog, + IN OUT LPDWORD BugSize, + IN OUT LPWSASERVICECLASSINFOW lpServiceClassInfo); + +PNSCATALOG_ENTRY +WSAAPI +WsNcEntryAllocate(VOID); + +INT +WSAAPI +WsNcEntryInitializeFromRegistry(IN PNSCATALOG_ENTRY CatalogEntry, + IN HKEY ParentKey, + IN ULONG UniqueId); + +VOID +WSAAPI +WsNcEntryDereference(IN PNSCATALOG_ENTRY CatalogEntry); + +VOID +WSAAPI +WsNcEntrySetProvider(IN PNSCATALOG_ENTRY Entry, + IN PNS_PROVIDER Provider); + +DWORD +WSAAPI +WsNqAddProvider( + IN PNSQUERY NsQuery, + IN PNS_PROVIDER Provider +); + +PNSQUERY +WSAAPI +WsNqAllocate(VOID); + +BOOL +WSAAPI +WsNqBeginEnumerationProc( + PVOID Context, + PNSCATALOG_ENTRY CatalogEntry +); + +VOID +WSAAPI +WsNqDelete(IN PNSQUERY NsQuery); + +DWORD +WSAAPI +WsNqInitialize(IN PNSQUERY NsQuery); + +DWORD +WSAAPI +WsNqLookupServiceBegin( + IN PNSQUERY NsQuery, + IN LPWSAQUERYSETW QuerySet, + IN DWORD ControlFlags, + IN PNSCATALOG Catalog +); + +DWORD +WSAAPI +WsNqLookupServiceEnd(IN PNSQUERY NsQuery); + +DWORD +WSAAPI +WsNqLookupServiceNext( + PNSQUERY NsQuery, + DWORD, + PDWORD, + OUT LPWSAQUERYSETW QuerySet +); + +PNSQUERY_PROVIDER +WSAAPI +WsNqNextProvider( + PNSQUERY NsQuery, + IN PNSQUERY_PROVIDER Provider +); + +VOID +WSAAPI +WsNqDereference(IN PNSQUERY Query); + +BOOL +WSAAPI +WsNqValidateAndReference(IN PNSQUERY Query); + +PNSQUERY_PROVIDER +WSAAPI +WsNqPreviousProvider(IN PNSQUERY Query, + IN PNSQUERY_PROVIDER Provider); + +DWORD +WSAAPI +WsNqProvLookupServiceNext( + IN PNSQUERY_PROVIDER QueryProvider, + DWORD, + PDWORD , + LPWSAQUERYSETW QuerySet +); + +DWORD +WSAAPI +WsNqProvLookupServiceEnd(IN PNSQUERY_PROVIDER QueryProvider); + +DWORD +WSAAPI +WsNqProvInitialize( + IN PNSQUERY_PROVIDER QueryProvider, + IN PNS_PROVIDER Provider +); + +PNSQUERY_PROVIDER +WSAAPI +WsNqProvAllocate(VOID); + +VOID +WSAAPI +WsNqProvDelete(IN PNSQUERY_PROVIDER QueryProvider); + +DWORD +WSAAPI +WsNqProvLookupServiceBegin( + IN PNSQUERY_PROVIDER QueryProvider, + IN LPWSAQUERYSETW QuerySet, + IN LPWSASERVICECLASSINFOW ServiceClassInfo, + IN DWORD +); + +VOID +WSAAPI +WsNpDelete(IN PNS_PROVIDER Provider); + +DWORD +WSAAPI +WsNpLookupServiceBegin ( + IN PNS_PROVIDER Provider, + IN LPWSAQUERYSETW Restrictions, + struct _WSAServiceClassInfoW *, + IN DWORD ControlFlags, + OUT PHANDLE LookupHandle +); + +DWORD +WSAAPI +WsNpNSPCleanup(IN PNS_PROVIDER Provider); + +DWORD +WSAAPI +WsNpLookupServiceEnd( + IN PNS_PROVIDER Provider, + IN HANDLE LookupHandle +); + +DWORD +WSAAPI +WsNpInitialize( + IN PNS_PROVIDER Provider, + IN LPWSTR DllPath, + IN LPGUID ProviderGuid +); + +PNS_PROVIDER +WSAAPI +WsNpAllocate(VOID); + +VOID +WSAAPI +WsNpDereference(IN PNS_PROVIDER Provider); + +DWORD +WSAAPI +WsNpLookupServiceNext( + IN PNS_PROVIDER Provider, + IN HANDLE LookupHandle, + IN DWORD ControlFlags, + OUT PDWORD BufferLength, + OUT LPWSAQUERYSETW Results +); + +VOID +WSAAPI +WsTpDelete(IN PTPROVIDER Provider); + +DWORD +WSAAPI +WsTpWSPCleanup( + IN PTPROVIDER Provider, + int * +); + +PTPROVIDER +WSAAPI +WsTpAllocate(VOID); + +DWORD +WSAAPI +WsTpInitialize( + IN PTPROVIDER Provider, + IN LPSTR DllName, + LPWSAPROTOCOL_INFOW ProtocolInfo +); + +VOID +WSAAPI +WsTpDereference(IN PTPROVIDER Provider); + +VOID +WSAAPI +WsThreadDelete(IN PWSTHREAD Thread); + +VOID +WSAAPI +WsThreadDestroyCurrentThread(VOID); + +DWORD +WSAAPI +WsThreadCreate( + IN PWSPROCESS Process, + IN PWSTHREAD *Thread +); + +DWORD +WSAAPI +WsThreadGetCurrentThread( + IN PWSPROCESS Process, + IN PWSTHREAD *Thread +); + +LPWSATHREADID +WSAAPI +WsThreadGetThreadId(IN PWSPROCESS Process); + +DWORD +WSAAPI +WsThreadStartup(VOID); + +VOID +WSAAPI +WsThreadCleanup(VOID); + +DWORD +WSAAPI +WsThreadCancelBlockingCall(IN PWSTHREAD Thread); + +DWORD +WSAAPI +WsThreadUnhookBlockingHook(IN PWSTHREAD Thread); + +FARPROC +WSAAPI +WsThreadSetBlockingHook(IN PWSTHREAD Thread, + IN FARPROC BlockingHook); + + +PHOSTENT +WSAAPI +WsThreadBlobToHostent(IN PWSTHREAD Thread, + IN LPBLOB Blob); + +PSERVENT +WSAAPI +WsThreadBlobToServent(IN PWSTHREAD Thread, + IN LPBLOB Blob); + +PWSPROTO_BUFFER +WSAAPI +WsThreadGetProtoBuffer(IN PWSTHREAD Thread); + +PWSTHREAD +WSAAPI +WsThreadAllocate(VOID); + +DWORD +WSAAPI +WsThreadDefaultBlockingHook(VOID); + +DWORD +WSAAPI +WsThreadInitialize( + IN PWSTHREAD Thread, + IN PWSPROCESS Process +); + +DWORD +WSAAPI +WsTcFindIfsProviderForSocket(IN PTCATALOG TCatalog, SOCKET Socket); + +DWORD +WSAAPI +WsTcEntryInitializeFromRegistry(IN PTCATALOG_ENTRY CatalogEntry, IN HKEY, unsigned long); + +DWORD +WSAAPI +WsTcGetEntryFromAf(IN PTCATALOG TCatalog, IN INT AddressFamily, IN PTCATALOG_ENTRY *CatalogEntry); + +PTCATALOG_ENTRY +WSAAPI +WsTcEntryAllocate(VOID); + +VOID +WSAAPI +WsTcEntrySetProvider(IN PTCATALOG_ENTRY CatalogEntry, IN PTPROVIDER Provider); + +DWORD +WSAAPI +WsTcRefreshFromRegistry(IN PTCATALOG TCatalog, PVOID); + +BOOL +WSAAPI +WsTcOpen(IN PTCATALOG TCatalog, IN HKEY); + +PTPROVIDER +WSAAPI +WsTcFindProvider(IN PTCATALOG TCatalog, IN LPGUID ProviderId); + +VOID +WSAAPI +WsTcEnumerateCatalogItems(IN PTCATALOG Catalog, + IN PTCATALOG_ENUMERATE_PROC Callback, + IN PVOID Context); + +VOID +WSAAPI +WsTcEntryDereference(IN PTCATALOG_ENTRY CatalogEntry); + +PTCATALOG +WSAAPI +WsTcAllocate(VOID); + +VOID +WSAAPI +WsTcDelete(IN PTCATALOG Catalog); + +DWORD +WSAAPI +WsTcGetEntryFromTriplet(IN PTCATALOG TCatalog, IN INT AddressFamily, IN INT SocketType, IN INT Protocol, IN DWORD StartId, IN PTCATALOG_ENTRY *CatalogEntry); + +VOID +WSAAPI +WsTcUpdateProtocolList(IN PTCATALOG TCatalog, PLIST_ENTRY ProtocolList); + +VOID +WSAAPI +WsTcEntryDelete(IN PTCATALOG_ENTRY CatalogEntry); + +DWORD +WSAAPI +WsTcGetEntryFromCatalogEntryId(IN PTCATALOG TCatalog, IN DWORD CatalogEntryId, IN PTCATALOG_ENTRY *CatalogEntry); + +DWORD +WSAAPI +WsTcLoadProvider(IN PTCATALOG TCatalog, IN PTCATALOG_ENTRY CatalogEntry); + +DWORD +WSAAPI +WsTcInitializeFromRegistry(IN PTCATALOG TCatalog, HKEY, PVOID); + +INT +WSAAPI +WsSockStartup(VOID); + +VOID +WSAAPI +WsSockCleanup(VOID); + +BOOL +WSAAPI +WsSockDeleteSockets(IN LPVOID Context, + IN PWAH_HANDLE Handle); + +VOID +WSAAPI +WsSockDereference(IN PWSSOCKET Socket); + +PWSSOCKET +WSAAPI +WsSockAllocate(VOID); + +INT +WSAAPI +WsSockInitialize(IN PWSSOCKET Socket, + IN PTCATALOG_ENTRY CatalogEntry); + +INT +WSAAPI +WsSockAssociateHandle(IN PWSSOCKET Socket, + IN SOCKET Handle, + IN BOOLEAN IsProvider); + +INT +WSAAPI +WsSockDisassociateHandle(IN PWSSOCKET Socket); + +INT +WSAAPI +WsSockAddApiReference(IN SOCKET Handle); + +PTCATALOG +WSAAPI +WsProcGetTCatalog(IN PWSPROCESS Process); + +BOOL +WSAAPI +WsProcDetachSocket(IN PWSPROCESS Process, + IN PWAH_HANDLE Handle); + +INT +WSAAPI +WsProcGetAsyncHelper(IN PWSPROCESS Process, + OUT PHANDLE Handle); + +VOID +WSAAPI +WsProcDelete(IN PWSPROCESS Process); + +INT +WSAAPI +WsProcStartup(VOID); + +PNSCATALOG +WSAAPI +WsProcGetNsCatalog(IN PWSPROCESS Process); + +VOID +WSAAPI +WsProcSetVersion(IN PWSPROCESS Process, + IN WORD VersionRequested); + +VOID +WSAAPI +WsAsyncQueueRequest(IN PWSASYNCBLOCK AsyncBlock); + +BOOL +WSAAPI +WsAsyncCheckAndInitThread(VOID); + +INT +WSAAPI +WsAsyncCancelRequest(IN HANDLE TaskHandle); + +PWSASYNCBLOCK +WSAAPI +WsAsyncAllocateBlock(IN SIZE_T ExtraLength); + +VOID +WSAAPI +WsAsyncTerminateThread(VOID); + +VOID +WSAAPI +WsAsyncGlobalTerminate(VOID); + +VOID +WSAAPI +WsAsyncGlobalInitialize(VOID); + +PWSPROCESS +STATIC __inline +WsGetProcess() +{ + return CurrentWsProcess; +} + +DWORD +STATIC __inline +WsQuickProlog() +{ + /* Try to see if we're initialized. If not, do the full prolog */ + return WsGetProcess() ? ERROR_SUCCESS : WsSlowProlog(); +} + +DWORD +STATIC __inline +WsQuickPrologTid(LPWSATHREADID *Tid) +{ + /* Try to see if we're initialized. If not, do the full prolog */ + if ((WsGetProcess()) && (*Tid = WsThreadGetThreadId(WsGetProcess()))) + { + return ERROR_SUCCESS; + } + else + { + return WsSlowPrologTid(Tid); + } +} + +#endif + _____ Added: branches/alex-network-branch/reactos/lib/ws2_32/src/addrconv.c --- branches/alex-network-branch/reactos/lib/ws2_32/src/addrconv.c 2005-11-09 05:06:30 UTC (rev 19090) +++ branches/alex-network-branch/reactos/lib/ws2_32/src/addrconv.c 2005-11-09 05:14:12 UTC (rev 19091) @@ -0,0 +1,491 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS WinSock 2 API + * FILE: addrconv.c + * PURPOSE: Address and Port Conversion Support + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ +#include "ws2_32.h" + +//#define NDEBUG +#include <debug.h> + +/* DEFINES *******************************************************************/ + +#ifndef BE + +/* DWORD network to host byte order conversion for little endian machines */ +#define DN2H(dw) \ + ((((dw) & 0xFF000000L) >> 24) | \ + (((dw) & 0x00FF0000L) >> 8) | \ + (((dw) & 0x0000FF00L) << 8) | \ + (((dw) & 0x000000FFL) << 24)) + +/* DWORD host to network byte order conversion for little endian machines */ +#define DH2N(dw) \ + ((((dw) & 0xFF000000L) >> 24) | \ + (((dw) & 0x00FF0000L) >> 8) | \ + (((dw) & 0x0000FF00L) << 8) | \ + (((dw) & 0x000000FFL) << 24)) + +/* WORD network to host order conversion for little endian machines */ +#define WN2H(w) \ + ((((w) & 0xFF00) >> 8) | \ + (((w) & 0x00FF) << 8)) + +/* WORD host to network byte order conversion for little endian machines */ +#define WH2N(w) \ + ((((w) & 0xFF00) >> 8) | \ + (((w) & 0x00FF) << 8)) + +#else /* BE */ + +/* DWORD network to host byte order conversion for big endian machines */ +#define DN2H(dw) \ + (dw) + +/* DWORD host to network byte order conversion big endian machines */ +#define DH2N(dw) \ + (dw) [truncated at 1000 lines; 13801 more skipped]

18 years, 10 months

[ion] 19090: User-Mode Networking Rewrite for 0.2.9

by ion＠svn.reactos.com

User-Mode Networking Rewrite for 0.2.9 Added: branches/alex-network-branch/ _____ Copied: branches/alex-network-branch (from rev 19089, trunk)

18 years, 10 months

[ion] 19089: - Fix error spotted by winetest: some status codes need to be normalized in CreateNamedPipeW

by ion＠svn.reactos.com

- Fix error spotted by winetest: some status codes need to be normalized in CreateNamedPipeW - Fix some bugs in CreatePipe: use correct directory, use right access mask, use correct define name for blocking type, and use correct file sharing flags. Results of "kernel32_winetest pipe": 418 tests executed, 0 todo, 0 failures. (with NT NPFS, of course). Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/pipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 04:32:44 UTC (rev 19088) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 04:53:32 UTC (rev 19089) @@ -207,6 +207,13 @@ nOutBufferSize, &DefaultTimeOut); + /* Normalize special error codes */ + if ((Status == STATUS_INVALID_DEVICE_REQUEST) || + (Status == STATUS_NOT_SUPPORTED)) + { + Status = STATUS_OBJECT_NAME_INVALID; + } + /* Free the name */ RtlFreeUnicodeString(&NamedPipeName); _____ Modified: trunk/reactos/lib/kernel32/file/pipe.c --- trunk/reactos/lib/kernel32/file/pipe.c 2005-11-09 04:32:44 UTC (rev 19088) +++ trunk/reactos/lib/kernel32/file/pipe.c 2005-11-09 04:53:32 UTC (rev 19089) @@ -54,7 +54,7 @@ /* Create the pipe name */ swprintf(Buffer, - L"\\\\.\\PIPE\\Win32Pipes.%08x.%08x", + L"\\Device\\NamedPipe\\Win32Pipes.%08x.%08x", NtCurrentTeb()->Cid.UniqueProcess, PipeId); RtlInitUnicodeString(&PipeName, Buffer); @@ -81,15 +81,15 @@ /* Create the named pipe */ Status = NtCreateNamedPipeFile(&ReadPipeHandle, - FILE_GENERIC_READ |FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + GENERIC_READ |FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - FILE_SHARE_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, FILE_PIPE_BYTE_STREAM_TYPE, FILE_PIPE_BYTE_STREAM_MODE, - FILE_PIPE_BYTE_STREAM_MODE, + FILE_PIPE_QUEUE_OPERATION, 1, nSize, nSize, @@ -97,6 +97,7 @@ if (!NT_SUCCESS(Status)) { /* Convert error and fail */ + DPRINT1("Status: %lx\n", Status); SetLastErrorByStatus(Status); return FALSE; } @@ -111,6 +112,7 @@ if (!NT_SUCCESS(Status)) { /* Convert error and fail */ + DPRINT1("Status: %lx\n", Status); NtClose(ReadPipeHandle); SetLastErrorByStatus(Status); return FALSE;

18 years, 10 months

[ion] 19088: - Fix PeekNamedPipe. Now only 14 winetests fail for pipetest.

by ion＠svn.reactos.com

- Fix PeekNamedPipe. Now only 14 winetests fail for pipetest. - Cleanup DisconnectNamedPipe and fix a small bug in it. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 04:29:46 UTC (rev 19087) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 04:32:44 UTC (rev 19088) @@ -760,43 +760,42 @@ /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI DisconnectNamedPipe(HANDLE hNamedPipe) { - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_DISCONNECT, - NULL, - 0, - NULL, - 0); - if (Status == STATUS_PENDING) + /* Send the FSCTL to the driver */ + Status = NtFsControlFile(hNamedPipe, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_PIPE_DISCONNECT, + NULL, + 0, + NULL, + 0); + if (Status == STATUS_PENDING) { - Status = NtWaitForSingleObject(hNamedPipe, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return(FALSE); - } + /* Wait on NPFS to finish and get updated status */ + Status = NtWaitForSingleObject(hNamedPipe, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; } - if (!NT_SUCCESS(Status)) + /* Check for error */ + if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus(Status); - return(FALSE); - } - return(TRUE); + /* Fail */ + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } - /* * @unimplemented */ @@ -989,91 +988,92 @@ return(TRUE); } - /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI PeekNamedPipe(HANDLE hNamedPipe, - LPVOID lpBuffer, - DWORD nBufferSize, - LPDWORD lpBytesRead, - LPDWORD lpTotalBytesAvail, - LPDWORD lpBytesLeftThisMessage) + LPVOID lpBuffer, + DWORD nBufferSize, + LPDWORD lpBytesRead, + LPDWORD lpTotalBytesAvail, + LPDWORD lpBytesLeftThisMessage) { - PFILE_PIPE_PEEK_BUFFER Buffer; - IO_STATUS_BLOCK Iosb; - ULONG BufferSize; - NTSTATUS Status; + PFILE_PIPE_PEEK_BUFFER Buffer; + IO_STATUS_BLOCK Iosb; + ULONG BufferSize; + NTSTATUS Status; - BufferSize = nBufferSize + sizeof(FILE_PIPE_PEEK_BUFFER); - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferSize); + /* Calculate the buffer space that we'll need and allocate it */ + BufferSize = nBufferSize + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); - Status = NtFsControlFile(hNamedPipe, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_PIPE_PEEK, - NULL, - 0, - Buffer, - BufferSize); - if (Status == STATUS_PENDING) + /* Tell the driver to seek */ + Status = NtFsControlFile(hNamedPipe, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_PIPE_PEEK, + NULL, + 0, + Buffer, + BufferSize); + if (Status == STATUS_PENDING) { - Status = NtWaitForSingleObject(hNamedPipe, - FALSE, - NULL); - if (NT_SUCCESS(Status)) - Status = Iosb.Status; + /* Wait for npfs to be done, and update the status */ + Status = NtWaitForSingleObject(hNamedPipe, FALSE, NULL); + if (NT_SUCCESS(Status)) Status = Iosb.Status; } - if (Status == STATUS_BUFFER_OVERFLOW) - { - Status = STATUS_SUCCESS; - } + /* Overflow is success for us */ + if (Status == STATUS_BUFFER_OVERFLOW) Status = STATUS_SUCCESS; - if (!NT_SUCCESS(Status)) + /* If we failed */ + if (!NT_SUCCESS(Status)) { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); - SetLastErrorByStatus(Status); - return(FALSE); + /* Free the buffer and return failure */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); + return FALSE; } - if (lpTotalBytesAvail != NULL) - { - *lpTotalBytesAvail = Buffer->ReadDataAvailable; - } + /* Check if caller requested bytes available */ + if (lpTotalBytesAvail) *lpTotalBytesAvail = Buffer->ReadDataAvailable; - if (lpBytesRead != NULL) + /* Check if caller requested bytes read */ + if (lpBytesRead) { - *lpBytesRead = Iosb.Information - sizeof(FILE_PIPE_PEEK_BUFFER); + /* Calculate the bytes returned, minus our structure overhead */ + *lpBytesRead = (ULONG)(Iosb.Information - + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])); } - if (lpBytesLeftThisMessage != NULL) + /* Check if caller requested bytes left */ + if (lpBytesLeftThisMessage) { - *lpBytesLeftThisMessage = Buffer->MessageLength - - (Iosb.Information - sizeof(FILE_PIPE_PEEK_BUFFER)); + /* Calculate total minus what we returned and our structure overhead */ + *lpBytesLeftThisMessage = Buffer->MessageLength - + (ULONG)(Iosb.Information - + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])); } - if (lpBuffer != NULL) + /* Check if the caller wanted to see the actual data */ + if (lpBuffer) { - memcpy(lpBuffer, Buffer->Data, - min(nBufferSize, Iosb.Information - sizeof(FILE_PIPE_PEEK_BUFFER))); + /* Give him what he wants */ + RtlCopyMemory(lpBuffer, + Buffer->Data, + Iosb.Information - + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0])); } - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Buffer); - - return(TRUE); + /* Free the buffer and return success */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + return TRUE; } - /* * @implemented */

18 years, 10 months

[ion] 19087: - Fixed two really nasty bugs in I/O completion:

by ion＠svn.reactos.com

- Fixed two really nasty bugs in I/O completion: - The user buffer wasn't written for incomplete I/O (warning levels) for METHOD_BUFFERED - Incomplete I/Os (warning levels) took a completely wrong path for completion. Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-11-09 03:02:33 UTC (rev 19086) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-11-09 04:29:46 UTC (rev 19087) @@ -159,7 +159,9 @@ if (Irp->Flags & IRP_BUFFERED_IO) { /* Check if we have an input buffer and if we suceeded */ - if (Irp->Flags & IRP_INPUT_OPERATION && NT_SUCCESS(Irp->IoStatus.Status)) + if ((Irp->Flags & IRP_INPUT_OPERATION) && + (Irp->IoStatus.Status != STATUS_VERIFY_REQUIRED) && + !(NT_ERROR(Irp->IoStatus.Status))) { /* Copy the buffer back to the user */ RtlCopyMemory(Irp->UserBuffer, @@ -191,10 +193,10 @@ #if 1 /* Check for Success but allow failure for Async IRPs */ - if (NT_SUCCESS(Irp->IoStatus.Status) || - (Irp->PendingReturned && - !SyncIrp && - (FileObject == NULL || FileObject->Flags & FO_SYNCHRONOUS_IO))) + if (!(NT_ERROR(Irp->IoStatus.Status)) || + ((NT_ERROR(Irp->IoStatus.Status)) && + (Irp->PendingReturned) && !(SyncIrp) && + ((FileObject == NULL) || (FileObject->Flags & FO_SYNCHRONOUS_IO)))) { _SEH_TRY {

18 years, 10 months

[ion] 19086: - Unbreak build

by ion＠svn.reactos.com

- Unbreak build - Fix CallNamedPipeW, the pipe mode should also be set to PIPE_WAIT. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 02:53:58 UTC (rev 19085) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 03:02:33 UTC (rev 19086) @@ -674,12 +674,12 @@ LPDWORD lpBytesRead, DWORD nTimeOut) { - UNICODE_STRING PipeName = &NtCurrentTeb()->StaticUnicodeString; + PUNICODE_STRING PipeName = &NtCurrentTeb()->StaticUnicodeString; ANSI_STRING AnsiPipe; /* Initialize the string as ANSI_STRING and convert to Unicode */ - RtlInitAnsiString(&NameA, (LPSTR)lpName); - RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); + RtlInitAnsiString(&AnsiPipe, (LPSTR)lpNamedPipeName); + RtlAnsiStringToUnicodeString(PipeName, &AnsiPipe, FALSE); /* Call the Unicode function */ return CallNamedPipeW(PipeName->Buffer, @@ -694,65 +694,69 @@ /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI CallNamedPipeW(LPCWSTR lpNamedPipeName, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - LPDWORD lpBytesRead, - DWORD nTimeOut) + LPVOID lpInBuffer, + DWORD nInBufferSize, + LPVOID lpOutBuffer, + DWORD nOutBufferSize, + LPDWORD lpBytesRead, + DWORD nTimeOut) { - HANDLE hPipe = INVALID_HANDLE_VALUE; - BOOL bRetry = TRUE; - BOOL bError = FALSE; - DWORD dwPipeMode; + HANDLE hPipe; + BOOL bRetry = TRUE; + BOOL bError; + DWORD dwPipeMode; - while (TRUE) + while (TRUE) { - hPipe = CreateFileW(lpNamedPipeName, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hPipe != INVALID_HANDLE_VALUE) - break; + /* Try creating it */ + hPipe = CreateFileW(lpNamedPipeName, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); - if (bRetry == FALSE) - return(FALSE); + /* Success, break out */ + if (hPipe != INVALID_HANDLE_VALUE) break; - WaitNamedPipeW(lpNamedPipeName, - nTimeOut); + /* Already tried twice, give up */ + if (bRetry == FALSE) return FALSE; - bRetry = FALSE; + /* Wait on it */ + WaitNamedPipeW(lpNamedPipeName, nTimeOut); + + /* Get ready to try again */ + bRetry = FALSE; } - dwPipeMode = PIPE_READMODE_MESSAGE; - bError = SetNamedPipeHandleState(hPipe, - &dwPipeMode, - NULL, - NULL); - if (!bError) + /* Set the pipe mode */ + dwPipeMode = PIPE_READMODE_MESSAGE | PIPE_WAIT; + bError = SetNamedPipeHandleState(hPipe, &dwPipeMode, NULL, NULL); + if (!bError) { - CloseHandle(hPipe); - return(FALSE); + /* Couldn't change state, fail */ + CloseHandle(hPipe); + return FALSE; } - bError = TransactNamedPipe(hPipe, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize, - lpBytesRead, - NULL); - CloseHandle(hPipe); - - return(bError); + /* Do the transact */ + bError = TransactNamedPipe(hPipe, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize, + lpBytesRead, + NULL); + + /* Close the handle and return */ + CloseHandle(hPipe); + return bError; } - /* * @implemented */

18 years, 10 months

[ion] 19085: - Optimize CallNamedPipeA too and remove accidental define.

by ion＠svn.reactos.com

- Optimize CallNamedPipeA too and remove accidental define. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 02:50:54 UTC (rev 19084) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 02:53:58 UTC (rev 19085) @@ -12,7 +12,7 @@ #include <k32.h> #define NDEBUG -#define USING_PROPER_NPFS_WAIT_SEMANTICS +//#define USING_PROPER_NPFS_WAIT_SEMANTICS #include "../include/debug.h" /* FUNCTIONS ****************************************************************/ @@ -664,35 +664,33 @@ /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI CallNamedPipeA(LPCSTR lpNamedPipeName, - LPVOID lpInBuffer, - DWORD nInBufferSize, - LPVOID lpOutBuffer, - DWORD nOutBufferSize, - LPDWORD lpBytesRead, - DWORD nTimeOut) + LPVOID lpInBuffer, + DWORD nInBufferSize, + LPVOID lpOutBuffer, + DWORD nOutBufferSize, + LPDWORD lpBytesRead, + DWORD nTimeOut) { - UNICODE_STRING PipeName; - BOOL Result; + UNICODE_STRING PipeName = &NtCurrentTeb()->StaticUnicodeString; + ANSI_STRING AnsiPipe; - RtlCreateUnicodeStringFromAsciiz(&PipeName, - (LPSTR)lpNamedPipeName); + /* Initialize the string as ANSI_STRING and convert to Unicode */ + RtlInitAnsiString(&NameA, (LPSTR)lpName); + RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); - Result = CallNamedPipeW(PipeName.Buffer, - lpInBuffer, - nInBufferSize, - lpOutBuffer, - nOutBufferSize, - lpBytesRead, - nTimeOut); - - RtlFreeUnicodeString(&PipeName); - - return(Result); + /* Call the Unicode function */ + return CallNamedPipeW(PipeName->Buffer, + lpInBuffer, + nInBufferSize, + lpOutBuffer, + nOutBufferSize, + lpBytesRead, + nTimeOut); } - /* * @implemented */

18 years, 10 months

[ion] 19084: Ansi->Unicode conversions:

by ion＠svn.reactos.com

Ansi->Unicode conversions: - Take advantage of TEB in CreateNamedPipeA - Use helper function in WaitNamedPipeA Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 02:17:18 UTC (rev 19083) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-11-09 02:50:54 UTC (rev 19084) @@ -1,11 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS Win32 Kernel Library * FILE: lib/kernel32/file/npipe.c - * PURPOSE: Directory functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: + * PURPOSE: Named Pipe Functions + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * Ariadne ( ariadne(a)xs4all.nl) */ /* INCLUDES *****************************************************************/ @@ -13,7 +12,7 @@ #include <k32.h> #define NDEBUG -//#define USING_PROPER_NPFS_WAIT_SEMANTICS +#define USING_PROPER_NPFS_WAIT_SEMANTICS #include "../include/debug.h" /* FUNCTIONS ****************************************************************/ @@ -21,35 +20,33 @@ /* * @implemented */ -HANDLE STDCALL +HANDLE +WINAPI CreateNamedPipeA(LPCSTR lpName, - DWORD dwOpenMode, - DWORD dwPipeMode, - DWORD nMaxInstances, - DWORD nOutBufferSize, - DWORD nInBufferSize, - DWORD nDefaultTimeOut, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) + DWORD dwOpenMode, + DWORD dwPipeMode, + DWORD nMaxInstances, + DWORD nOutBufferSize, + DWORD nInBufferSize, + DWORD nDefaultTimeOut, + LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - HANDLE NamedPipeHandle; - UNICODE_STRING NameU; - ANSI_STRING NameA; + PUNICODE_STRING NameU = &NtCurrentTeb()->StaticUnicodeString; + ANSI_STRING NameA; - RtlInitAnsiString(&NameA, (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, &NameA, TRUE); + /* Initialize the string as ANSI_STRING and convert to Unicode */ + RtlInitAnsiString(&NameA, (LPSTR)lpName); + RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); - NamedPipeHandle = CreateNamedPipeW(NameU.Buffer, - dwOpenMode, - dwPipeMode, - nMaxInstances, - nOutBufferSize, - nInBufferSize, - nDefaultTimeOut, - lpSecurityAttributes); - - RtlFreeUnicodeString(&NameU); - - return(NamedPipeHandle); + /* Call the Unicode API */ + return CreateNamedPipeW(NameU->Buffer, + dwOpenMode, + dwPipeMode, + nMaxInstances, + nOutBufferSize, + nInBufferSize, + nDefaultTimeOut, + lpSecurityAttributes); } /* @@ -104,8 +101,8 @@ return(INVALID_HANDLE_VALUE); } - DPRINT1("Pipe name: %wZ\n", &NamedPipeName); - DPRINT1("Pipe name: %S\n", NamedPipeName.Buffer); + DPRINT("Pipe name: %wZ\n", &NamedPipeName); + DPRINT("Pipe name: %S\n", NamedPipeName.Buffer); /* Always case insensitive, check if we got extra attributes */ Attributes = OBJ_CASE_INSENSITIVE; @@ -226,26 +223,28 @@ return PipeHandle; } - /* * @implemented */ -BOOL STDCALL +BOOL +WINAPI WaitNamedPipeA(LPCSTR lpNamedPipeName, - DWORD nTimeOut) + DWORD nTimeOut) { - BOOL r; - UNICODE_STRING NameU; - ANSI_STRING NameA; + BOOL r; + UNICODE_STRING NameU; - RtlInitAnsiString(&NameA, (LPSTR)lpNamedPipeName); - RtlAnsiStringToUnicodeString(&NameU, &NameA, TRUE); + /* Convert the name to Unicode */ + Basep8BitStringToLiveUnicodeString(&NameU, lpNamedPipeName); - r = WaitNamedPipeW(NameU.Buffer, nTimeOut); + /* Call the Unicode API */ + r = WaitNamedPipeW(NameU.Buffer, nTimeOut); - RtlFreeUnicodeString(&NameU); + /* Free the Unicode string */ + RtlFreeUnicodeString(&NameU); - return(r); + /* Return result */ + return r; } /*

18 years, 10 months

[ion] 19083: - Fix bugs in RtlSplay

by ion＠svn.reactos.com

- Fix bugs in RtlSplay Modified: trunk/reactos/lib/rtl/splaytree.c _____ Modified: trunk/reactos/lib/rtl/splaytree.c --- trunk/reactos/lib/rtl/splaytree.c 2005-11-09 02:16:03 UTC (rev 19082) +++ trunk/reactos/lib/rtl/splaytree.c 2005-11-09 02:17:18 UTC (rev 19083) @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * PURPOSE: Splay-Tree implementation * FILE: lib/rtl/splaytree.c - * PROGRAMMER: + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -274,7 +274,7 @@ * G was a right child, so change its parent's right * child link to point to N now. */ - RtlLeftChild(RtlParent(G)) = N; + RtlRightChild(RtlParent(G)) = N; } } @@ -335,7 +335,7 @@ * G was a right child, so change its parent's right * child link to point to N now. */ - RtlLeftChild(RtlParent(G)) = N; + RtlRightChild(RtlParent(G)) = N; } } @@ -416,7 +416,7 @@ * G was a right child, so change its parent's right * child link to point to N now. */ - RtlLeftChild(RtlParent(G)) = N; + RtlRightChild(RtlParent(G)) = N; } } @@ -477,7 +477,7 @@ * G was a right child, so change its parent's right * child link to point to N now. */ - RtlLeftChild(RtlParent(G)) = N; + RtlRightChild(RtlParent(G)) = N; } }

18 years, 10 months

← Newer
1
...
68
69
70
71
72
73
74
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005