Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[hbirr] 18498: Invalidate the start value if start key doesn't exist.
by hbirr＠svn.reactos.com 16 Oct '05

16 Oct '05

Invalidate the start value if start key doesn't exist. Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-10-16 14:10:29 UTC (rev 18497) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-10-16 14:24:11 UTC (rev 18498) @@ -439,6 +439,7 @@ /* Read the Start Value */ ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, "Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); /* Read the Tag */ @@ -486,7 +487,7 @@ } else { DbgPrint((DPRINT_REACTOS, " Skipping driver '%s' with Start %d, Tag %d and Group '%s' (Current Tag %d, current group '%s')\n", - ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName)); + ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName)); } Index++; @@ -511,6 +512,7 @@ /* Read the Start Value */ ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, "Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); /* Read the Tag */

1 0

[hpoussin] 18497: Sorry, most devices were reinstalled at each boot, as the calculated crc32 for the parent was changing.
by hpoussin＠svn.reactos.com 16 Oct '05

16 Oct '05

Sorry, most devices were reinstalled at each boot, as the calculated crc32 for the parent was changing. Prevent this by using only the parent InstancePath instead of the whole DEVICE_NODE structure Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-16 11:17:26 UTC (rev 18496) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-16 14:10:29 UTC (rev 18497) @@ -1415,8 +1415,8 @@ goto cleanup; /* 2. Create the ParentIdPrefix value */ - currentByte = (PBYTE)DeviceNode->Parent; - for (i = 0; i < sizeof(DEVICE_NODE); i++, currentByte++) + currentByte = (PBYTE)DeviceNode->Parent->InstancePath.Buffer; + for (i = 0; i < DeviceNode->Parent->InstancePath.Length; i++, currentByte++) crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)]; crc32 = ~crc32; KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;

1 0

[hbirr] 18496: Implemented SMART commands for ide devices.
by hbirr＠svn.reactos.com 16 Oct '05

16 Oct '05

Implemented SMART commands for ide devices. Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-10-16 11:11:35 UTC (rev 18495) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-10-16 11:17:26 UTC (rev 18496) @@ -221,6 +221,9 @@ AtapiPacketInterrupt(IN PATAPI_MINIPORT_EXTENSION DevExt); static BOOLEAN FASTCALL +AtapiSmartInterrupt(IN PATAPI_MINIPORT_EXTENSION DevExt); + +static BOOLEAN FASTCALL AtapiReadInterrupt(IN PATAPI_MINIPORT_EXTENSION DevExt); #ifdef ENABLE_DMA @@ -266,6 +269,10 @@ IN PSCSI_REQUEST_BLOCK Srb); static ULONG +AtapiSendSmartCommand(IN PATAPI_MINIPORT_EXTENSION DeviceExtension, + IN PSCSI_REQUEST_BLOCK Srb); + +static ULONG AtapiInquiry(IN PATAPI_MINIPORT_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); @@ -941,54 +948,128 @@ case SRB_FUNCTION_IO_CONTROL: { PSRB_IO_CONTROL SrbIoControl = (PSRB_IO_CONTROL)Srb->DataBuffer; - if (!_strnicmp((char*)SrbIoControl->Signature, "ScsiDisk", 8)) + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) || + Srb->DataTransferLength < SrbIoControl->Length + sizeof(SRB_IO_CONTROL)) { - switch (SrbIoControl->ControlCode) + Result = SRB_STATUS_INVALID_REQUEST; + } + else + { + if (!_strnicmp((char*)SrbIoControl->Signature, "ScsiDisk", 8)) { - default: - Result = SRB_STATUS_INVALID_REQUEST; - break; - - case IOCTL_SCSI_MINIPORT_IDENTIFY: + switch (SrbIoControl->ControlCode) { - PSENDCMDOUTPARAMS OutParams = (PSENDCMDOUTPARAMS)((ULONG_PTR)Srb->DataBuffer + sizeof(SRB_IO_CONTROL)); - SENDCMDINPARAMS InParams = *(PSENDCMDINPARAMS)OutParams; - + default: + Result = SRB_STATUS_INVALID_REQUEST; + break; - RtlZeroMemory(OutParams, Srb->DataTransferLength - sizeof(SRB_IO_CONTROL)); + case IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE: + case IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES: + case IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS: + case IOCTL_SCSI_MINIPORT_ENABLE_SMART: + case IOCTL_SCSI_MINIPORT_DISABLE_SMART: + case IOCTL_SCSI_MINIPORT_RETURN_STATUS: + case IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS: + case IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS: + case IOCTL_SCSI_MINIPORT_READ_SMART_LOG: +#if 0 + case IOCTL_SCSI_MINIPORT_WRITE_SMART_LOG: +#endif + Result = AtapiSendSmartCommand(DevExt, Srb); + break; - if (InParams.irDriveRegs.bCommandReg != IDE_CMD_IDENT_ATA_DRV) + case IOCTL_SCSI_MINIPORT_SMART_VERSION: { - DPRINT1("bCommandReg: %x\n", InParams.irDriveRegs.bCommandReg); - OutParams->DriverStatus.bIDEError = 1; - Result = SRB_STATUS_INVALID_REQUEST; + GETVERSIONINPARAMS Version; + ULONG i; + + DPRINT("IOCTL_SCSI_MINIPORT_SMART_VERSION\n"); + + RtlZeroMemory(&Version, sizeof(GETVERSIONINPARAMS)); + Version.bVersion = 1; + Version.bRevision = 1; + for (i = 0; i < 2; i++) + { + switch (DevExt->DeviceFlags[i] & (DEVICE_PRESENT|DEVICE_ATAPI)) + { + case DEVICE_PRESENT: + Version.bIDEDeviceMap |= 0x01 << i; + break; +/* + case DEVICE_PRESENT|DEVICE_ATAPI: + Version.bIDEDeviceMap |= 0x11 << i; + break; +*/ + } + } + Version.fCapabilities = CAP_ATA_ID_CMD/*|CAP_ATAPI_ID_CMD|CAP_SMART_CMD*/; + SrbIoControl->Length = min(sizeof(GETVERSIONINPARAMS), Srb->DataTransferLength - sizeof(SRB_IO_CONTROL)); + memcpy(SrbIoControl + 1, &Version, SrbIoControl->Length); + Result = SRB_STATUS_SUCCESS; break; } - if (InParams.bDriveNumber > 1 || - (DevExt->DeviceFlags[InParams.bDriveNumber] & (DEVICE_PRESENT|DEVICE_ATAPI)) != DEVICE_PRESENT) + case IOCTL_SCSI_MINIPORT_IDENTIFY: { - OutParams->DriverStatus.bIDEError = 1; - Result = SRB_STATUS_NO_DEVICE; + SENDCMDOUTPARAMS OutParams; + SENDCMDINPARAMS InParams = *(PSENDCMDINPARAMS)(SrbIoControl + 1); + + DPRINT("IOCTL_SCSI_MINIPORT_IDENTIFY\n"); + + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDINPARAMS) - 1) + { + Result = SRB_STATUS_INVALID_REQUEST; + break; + } + + RtlZeroMemory(&OutParams, sizeof(SENDCMDOUTPARAMS)); + + if (InParams.irDriveRegs.bCommandReg != IDE_CMD_IDENT_ATA_DRV) + { + DPRINT("bCommandReg: %x\n", InParams.irDriveRegs.bCommandReg); + OutParams.DriverStatus.bIDEError = 1; + Result = SRB_STATUS_INVALID_REQUEST; + } + else if (InParams.bDriveNumber > 1 || + (DevExt->DeviceFlags[InParams.bDriveNumber] & (DEVICE_PRESENT|DEVICE_ATAPI)) != DEVICE_PRESENT) + { + OutParams.DriverStatus.bIDEError = 1; + Result = SRB_STATUS_NO_DEVICE; + } + else + { + Result = SRB_STATUS_SUCCESS; + } + if (Result == SRB_STATUS_SUCCESS) + { + SrbIoControl->Length = min(sizeof(SENDCMDOUTPARAMS) - 1 + IDENTIFY_BUFFER_SIZE, Srb->DataTransferLength - sizeof(SRB_IO_CONTROL)); + } + else + { + SrbIoControl->Length = min(sizeof(SENDCMDOUTPARAMS) - 1, Srb->DataTransferLength - sizeof(SRB_IO_CONTROL)); + } + + if (SrbIoControl->Length >= sizeof(SENDCMDOUTPARAMS) - 1) + { + OutParams.cBufferSize = min(SrbIoControl->Length, IDENTIFY_BUFFER_SIZE); + } + + memcpy(SrbIoControl + 1, &OutParams, min (SrbIoControl->Length, sizeof(SENDCMDOUTPARAMS) - 1)); + + if (SrbIoControl->Length > sizeof(SENDCMDOUTPARAMS) - 1) + { + RtlCopyMemory((PVOID)((ULONG_PTR)(SrbIoControl + 1) + sizeof(SENDCMDOUTPARAMS) - 1), &DevExt->DeviceParams[InParams.bDriveNumber], OutParams.cBufferSize); + } break; } - - if (Srb->DataTransferLength > sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1) - { - OutParams->cBufferSize = min(IDENTIFY_BUFFER_SIZE, Srb->DataTransferLength - (sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1)); - RtlCopyMemory(OutParams->bBuffer, &DevExt->DeviceParams[InParams.bDriveNumber], OutParams->cBufferSize); - } - - Result = SRB_STATUS_SUCCESS; - break; } } + else + { + Result = SRB_STATUS_INVALID_REQUEST; + SrbIoControl->Length = 0; + } } - else - { - Result = SRB_STATUS_INVALID_REQUEST; - } - break; } @@ -1686,6 +1767,219 @@ // ------------------------------------------- Nondiscardable statics static ULONG +AtapiSendSmartCommand(IN PATAPI_MINIPORT_EXTENSION DeviceExtension, + IN PSCSI_REQUEST_BLOCK Srb) +{ + PSRB_IO_CONTROL SrbIoControl = (PSRB_IO_CONTROL)Srb->DataBuffer; + SENDCMDINPARAMS InParams; + PSENDCMDOUTPARAMS OutParams = (PSENDCMDOUTPARAMS)(SrbIoControl + 1); + ULONG Retries; + UCHAR Status; + + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1 || + SrbIoControl->Length < sizeof(SENDCMDOUTPARAMS) - 1) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams = *(PSENDCMDINPARAMS)(SrbIoControl + 1); + + DPRINT("%02x %02x %02x %02x %02x %02x %02x %02x\n", + InParams.irDriveRegs.bFeaturesReg, + InParams.irDriveRegs.bSectorCountReg, + InParams.irDriveRegs.bSectorNumberReg, + InParams.irDriveRegs.bCylLowReg, + InParams.irDriveRegs.bCylHighReg, + InParams.irDriveRegs.bDriveHeadReg, + InParams.irDriveRegs.bCommandReg, + InParams.irDriveRegs.bReserved); + + if (InParams.bDriveNumber > 1 || + (DeviceExtension->DeviceFlags[InParams.bDriveNumber] & (DEVICE_PRESENT|DEVICE_ATAPI)) != DEVICE_PRESENT) + { + RtlZeroMemory(&OutParams, sizeof(SENDCMDOUTPARAMS)); + OutParams->DriverStatus.bIDEError = 1; + return SRB_STATUS_NO_DEVICE; + } + + DeviceExtension->DataTransferLength = 0; + + switch (SrbIoControl->ControlCode) + { + case IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS: + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS\n"); + + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1 + READ_ATTRIBUTE_BUFFER_SIZE || + SrbIoControl->Length < sizeof(SENDCMDOUTPARAMS) - 1 + READ_ATTRIBUTE_BUFFER_SIZE || + InParams.irDriveRegs.bFeaturesReg != READ_ATTRIBUTES || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + InParams.irDriveRegs.bSectorNumberReg = 0; + DeviceExtension->DataTransferLength = READ_ATTRIBUTE_BUFFER_SIZE; + break; + + case IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS: + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS\n"); + + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1 + READ_THRESHOLD_BUFFER_SIZE || + SrbIoControl->Length < sizeof(SENDCMDOUTPARAMS) - 1 + READ_THRESHOLD_BUFFER_SIZE || + InParams.irDriveRegs.bFeaturesReg != READ_THRESHOLDS || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + InParams.irDriveRegs.bSectorNumberReg = 0; + DeviceExtension->DataTransferLength = READ_THRESHOLD_BUFFER_SIZE; + break; + + case IOCTL_SCSI_MINIPORT_READ_SMART_LOG: + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_LOG\n"); + + if (Srb->DataTransferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDOUTPARAMS) - 1 + max(1, InParams.irDriveRegs.bSectorCountReg) * SMART_LOG_SECTOR_SIZE || + SrbIoControl->Length < sizeof(SENDCMDOUTPARAMS) - 1 + max(1, InParams.irDriveRegs.bSectorCountReg) * SMART_LOG_SECTOR_SIZE || + InParams.irDriveRegs.bFeaturesReg != SMART_READ_LOG || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + DeviceExtension->DataTransferLength = max(1, InParams.irDriveRegs.bSectorCountReg) * SMART_LOG_SECTOR_SIZE; + break; + + case IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE: + DPRINT("IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE\n"); + + if (InParams.irDriveRegs.bFeaturesReg != ENABLE_DISABLE_AUTOSAVE || + (InParams.irDriveRegs.bSectorCountReg != 0 && InParams.irDriveRegs.bSectorCountReg != 1) || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorNumberReg = 0; + break; + + case IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES: + DPRINT("IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES\n"); + + if (InParams.irDriveRegs.bFeaturesReg != SAVE_ATTRIBUTE_VALUES || + (InParams.irDriveRegs.bSectorCountReg != 0 && InParams.irDriveRegs.bSectorCountReg != 0xf1) || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorNumberReg = 0; + break; + + case IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS: + DPRINT("IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS\n"); + + if (InParams.irDriveRegs.bFeaturesReg != EXECUTE_OFFLINE_DIAGS || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + break; + + case IOCTL_SCSI_MINIPORT_ENABLE_SMART: + DPRINT("IOCTL_SCSI_MINIPORT_ENABLE_SMART\n"); + + if (InParams.irDriveRegs.bFeaturesReg != ENABLE_SMART || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + InParams.irDriveRegs.bSectorNumberReg = 0; + break; + + case IOCTL_SCSI_MINIPORT_DISABLE_SMART: + DPRINT("IOCTL_SCSI_MINIPORT_DISABLE_SMART\n"); + + if (InParams.irDriveRegs.bFeaturesReg != DISABLE_SMART || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + InParams.irDriveRegs.bSectorNumberReg = 0; + break; + + case IOCTL_SCSI_MINIPORT_RETURN_STATUS: + DPRINT("IOCTL_SCSI_MINIPORT_RETURN_STATUS\n"); + + if (InParams.irDriveRegs.bFeaturesReg != RETURN_SMART_STATUS || + InParams.irDriveRegs.bCylLowReg != SMART_CYL_LOW || + InParams.irDriveRegs.bCylHighReg != SMART_CYL_HI || + InParams.irDriveRegs.bCommandReg != SMART_CMD) + { + return SRB_STATUS_INVALID_REQUEST; + } + InParams.irDriveRegs.bSectorCountReg = 0; + InParams.irDriveRegs.bSectorNumberReg = 0; + break; + } + + Srb->TargetId = InParams.bDriveNumber; + + /* Set pointer to data buffer. */ + DeviceExtension->DataBuffer = (PUCHAR)OutParams->bBuffer; + + DeviceExtension->CurrentSrb = Srb; + + /* wait for BUSY to clear */ + for (Retries = 0; Retries < IDE_MAX_BUSY_RETRIES; Retries++) + { + Status = IDEReadStatus(DeviceExtension->CommandPortBase); + if (!(Status & IDE_SR_BUSY)) + { + break; + } + ScsiPortStallExecution(10); + } + if (Retries >= IDE_MAX_BUSY_RETRIES) + { + DPRINT ("Drive is BUSY for too long\n"); + return(SRB_STATUS_BUSY); + } + + /* Select the desired drive */ + InParams.irDriveRegs.bDriveHeadReg = (InParams.bDriveNumber ? IDE_DH_DRV1 : IDE_DH_DRV0) | IDE_DH_FIXED; + IDEWriteDriveHead(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bDriveHeadReg); + ScsiPortStallExecution(2); + + IDEWritePrecomp(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bFeaturesReg); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bSectorCountReg); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bSectorNumberReg); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bCylLowReg); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, InParams.irDriveRegs.bCylHighReg); + + AtapiExecuteCommand(DeviceExtension, InParams.irDriveRegs.bCommandReg, AtapiSmartInterrupt); + + /* Wait for interrupt. */ + return SRB_STATUS_PENDING; + +} + +static ULONG AtapiSendAtapiCommand(IN PATAPI_MINIPORT_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb) { @@ -2240,8 +2534,6 @@ IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow[0]); IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh[0]); - IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED | DrvHead); - #ifdef ENABLE_DMA if (DeviceExtension->PRDTable && DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_DMA_CMD) @@ -2940,6 +3232,79 @@ #endif static BOOLEAN FASTCALL +AtapiSmartInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) +{ + PSCSI_REQUEST_BLOCK Srb; + UCHAR DeviceStatus; + PSRB_IO_CONTROL SrbIoControl; + PSENDCMDOUTPARAMS OutParams; + PIDEREGS IdeRegs; + + DPRINT("AtapiSmartInterrupt() called!\n"); + + Srb = DevExt->CurrentSrb; + + + DeviceStatus = IDEReadStatus(DevExt->CommandPortBase); + if ((DeviceStatus & (IDE_SR_DRQ|IDE_SR_BUSY|IDE_SR_ERR)) != (DevExt->DataTransferLength ? IDE_SR_DRQ : 0)) + { + if (DeviceStatus & (IDE_SR_ERR|IDE_SR_DRQ)) + { + AtapiCompleteRequest(DevExt, SRB_STATUS_ERROR); + DPRINT("AtapiSmartInterrupt() done!\n"); + return TRUE; + } + DPRINT("AtapiSmartInterrupt() done!\n"); + return FALSE; + } + + DPRINT("CommandPortBase: %lx ControlPortBase: %lx\n", DevExt->CommandPortBase, DevExt->ControlPortBase); + + if (DevExt->DataTransferLength) + { + IDEReadBlock(DevExt->CommandPortBase, DevExt->DataBuffer, 512); + DevExt->DataTransferLength -= 512; + DevExt->DataBuffer += 512; + } + + if (DevExt->DataTransferLength == 0) + { + SrbIoControl = (PSRB_IO_CONTROL)Srb->DataBuffer; + OutParams = (PSENDCMDOUTPARAMS)(SrbIoControl + 1); + + OutParams->DriverStatus.bDriverError = 0; + OutParams->DriverStatus.bIDEError = 0; + + if (SrbIoControl->ControlCode == IOCTL_SCSI_MINIPORT_RETURN_STATUS) + { + IdeRegs = (PIDEREGS)OutParams->bBuffer; + + IdeRegs->bFeaturesReg = RETURN_SMART_STATUS; + IdeRegs->bSectorCountReg = IDEReadSectorCount(DevExt->CommandPortBase); + IdeRegs->bSectorNumberReg = IDEReadSectorNum(DevExt->CommandPortBase); + IdeRegs->bCylLowReg = IDEReadCylinderLow(DevExt->CommandPortBase); + IdeRegs->bCylHighReg = IDEReadCylinderHigh(DevExt->CommandPortBase); + IdeRegs->bDriveHeadReg = IDEReadDriveHead(DevExt->CommandPortBase); + IdeRegs->bCommandReg = SMART_CMD; + IdeRegs->bReserved = 0; + + OutParams->cBufferSize = 8; + } + else + { + OutParams->cBufferSize = DevExt->DataBuffer - OutParams->bBuffer; + } + + AtapiCompleteRequest(DevExt, SRB_STATUS_SUCCESS); + } + + DPRINT("AtapiSmartInterrupt() done!\n"); + + return(TRUE); +} + + +static BOOLEAN FASTCALL AtapiReadInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) { PSCSI_REQUEST_BLOCK Srb; _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2005-10-16 11:11:35 UTC (rev 18495) +++ trunk/reactos/drivers/storage/disk/disk.c 2005-10-16 11:17:26 UTC (rev 18496) @@ -999,6 +999,11 @@ PDISK_DATA DiskData; ULONG Information; NTSTATUS Status; + KEVENT Event; + IO_STATUS_BLOCK IoSB; + PIRP LocalIrp; + PSRB_IO_CONTROL SrbIoControl; + PSENDCMDINPARAMS InParams; DPRINT("DiskClassDeviceControl() called!\n"); @@ -1251,6 +1256,338 @@ Information = 0; break; + case SMART_GET_VERSION: + { + PGETVERSIONINPARAMS Version; + DPRINT("SMART_GET_VERSION\n"); + if (OutputLength < sizeof(GETVERSIONINPARAMS)) + { + Status = STATUS_BUFFER_TOO_SMALL; + Information = sizeof(GETVERSIONINPARAMS); + break; + } + + SrbIoControl = ExAllocatePool(NonPagedPool, sizeof(SRB_IO_CONTROL) + sizeof(GETVERSIONINPARAMS)); + if (SrbIoControl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + Version = (PGETVERSIONINPARAMS)(SrbIoControl + 1); + memset(SrbIoControl, 0, sizeof(SRB_IO_CONTROL) + sizeof(GETVERSIONINPARAMS)); + + SrbIoControl->HeaderLength = sizeof(SRB_IO_CONTROL); + memcpy(SrbIoControl->Signature, "ScsiDisk", 8); + SrbIoControl->Timeout = DeviceExtension->TimeOutValue * 4; + SrbIoControl->Length = sizeof(GETVERSIONINPARAMS); + SrbIoControl->ControlCode = IOCTL_SCSI_MINIPORT_SMART_VERSION; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + LocalIrp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_MINIPORT, + DeviceExtension->PortDeviceObject, + SrbIoControl, + sizeof(SRB_IO_CONTROL), + SrbIoControl, + sizeof(SRB_IO_CONTROL) + sizeof(GETVERSIONINPARAMS), + FALSE, + &Event, + &IoSB); + if (LocalIrp == NULL) + { + ExFreePool(SrbIoControl); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + Status = IoCallDriver(DeviceExtension->PortDeviceObject, LocalIrp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoSB.Status; + } + if (NT_SUCCESS(Status)) + { + memcpy(Irp->AssociatedIrp.SystemBuffer, Version, sizeof(GETVERSIONINPARAMS)); + Information = sizeof(GETVERSIONINPARAMS); + } + ExFreePool(SrbIoControl); + break; + } + + case SMART_SEND_DRIVE_COMMAND: + { + DPRINT("SMART_SEND_DRIVE_COMMAND\n"); + + if (InputLength < sizeof(SENDCMDINPARAMS) - 1) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + InParams = (PSENDCMDINPARAMS)Irp->AssociatedIrp.SystemBuffer; + if (InParams->irDriveRegs.bCommandReg == SMART_CMD) + { + if (InParams->irDriveRegs.bFeaturesReg == ENABLE_DISABLE_AUTOSAVE) + { + DPRINT("IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE\n"); + ControlCode = IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == SAVE_ATTRIBUTE_VALUES) + { + DPRINT("IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES\n"); + ControlCode = IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == EXECUTE_OFFLINE_DIAGS) + { + DPRINT("IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS\n"); + ControlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == SMART_WRITE_LOG) + { + DPRINT("IOCTL_SCSI_MINIPORT_WRITE_SMART_LOG\n"); + ControlCode = IOCTL_SCSI_MINIPORT_WRITE_SMART_LOG; + if (InputLength < sizeof(SENDCMDINPARAMS) - 1 + 512 * max(1, InParams->irDriveRegs.bSectorCountReg)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == ENABLE_SMART) + { + DPRINT("IOCTL_SCSI_MINIPORT_ENABLE_SMART\n"); + ControlCode = IOCTL_SCSI_MINIPORT_ENABLE_SMART; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == DISABLE_SMART) + { + DPRINT("IOCTL_SCSI_MINIPORT_DISABLE_SMART\n"); + ControlCode = IOCTL_SCSI_MINIPORT_DISABLE_SMART; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == RETURN_SMART_STATUS) + { + DPRINT("IOCTL_SCSI_MINIPORT_RETURN_STATUS\n"); + ControlCode = IOCTL_SCSI_MINIPORT_RETURN_STATUS; + Information = sizeof(SENDCMDOUTPARAMS) - 1 + sizeof(IDEREGS); + } + else if (InParams->irDriveRegs.bFeaturesReg == ENABLE_DISABLE_AUTO_OFFLINE) + { + DPRINT("IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS\n"); + ControlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + else + { + DPRINT("%x\n", InParams->irDriveRegs.bFeaturesReg); + Status = STATUS_INVALID_PARAMETER; + break; + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + break; + } + if (OutputLength < Information) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + SrbIoControl = ExAllocatePool(NonPagedPool, sizeof(SRB_IO_CONTROL) + max(Information, sizeof(SENDCMDINPARAMS) - 1)); + if (SrbIoControl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + Information = 0; + break; + } + memset(SrbIoControl, 0, sizeof(SRB_IO_CONTROL) + max(Information, sizeof(SENDCMDINPARAMS) - 1)); + + SrbIoControl->HeaderLength = sizeof(SRB_IO_CONTROL); + memcpy(SrbIoControl->Signature, "SCSIDISK", 8); + SrbIoControl->Timeout = DeviceExtension->TimeOutValue * 4; + SrbIoControl->Length = Information; + SrbIoControl->ControlCode = ControlCode; + + InParams = (PSENDCMDINPARAMS)(SrbIoControl + 1); + + memcpy(InParams, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); + + InParams->bDriveNumber = DeviceExtension->TargetId; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + LocalIrp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_MINIPORT, + DeviceExtension->PortDeviceObject, + SrbIoControl, + sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDINPARAMS) - 1, + SrbIoControl, + sizeof(SRB_IO_CONTROL) + Information, + FALSE, + &Event, + &IoSB); + if (LocalIrp == NULL) + { + ExFreePool(SrbIoControl); + Information = 0; + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + Status = IoCallDriver(DeviceExtension->PortDeviceObject, LocalIrp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoSB.Status; + } + if (NT_SUCCESS(Status)) + { + Information = SrbIoControl->Length; + } + else + { + Information = sizeof(SENDCMDOUTPARAMS) - 1; + } + memcpy(Irp->AssociatedIrp.SystemBuffer, InParams, Information); + ExFreePool(SrbIoControl); + break; + } + + case SMART_RCV_DRIVE_DATA: + { + DPRINT("SMART_RCV_DRIVE_DATA\n"); + + if (InputLength < sizeof(SENDCMDINPARAMS) - 1) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + InParams = (PSENDCMDINPARAMS)Irp->AssociatedIrp.SystemBuffer; + if (InParams->irDriveRegs.bCommandReg == ID_CMD) + { + DPRINT("IOCTL_SCSI_MINIPORT_IDENTIFY\n"); + ControlCode = IOCTL_SCSI_MINIPORT_IDENTIFY; + Information = IDENTIFY_BUFFER_SIZE + sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bCommandReg == SMART_CMD) + { + if (InParams->irDriveRegs.bFeaturesReg == READ_ATTRIBUTES) + { + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS\n"); + ControlCode = IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS; + Information = READ_ATTRIBUTE_BUFFER_SIZE + sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == READ_THRESHOLDS) + { + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS\n"); + ControlCode = IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS; + Information = READ_THRESHOLD_BUFFER_SIZE + sizeof(SENDCMDOUTPARAMS) - 1; + } + else if (InParams->irDriveRegs.bFeaturesReg == SMART_READ_LOG) + { + DPRINT("IOCTL_SCSI_MINIPORT_READ_SMART_LOG\n"); + ControlCode = IOCTL_SCSI_MINIPORT_READ_SMART_LOG; + Information = sizeof(SENDCMDOUTPARAMS) - 1 + 512 * max(1, InParams->irDriveRegs.bSectorCountReg); + } + else + { + DPRINT("%x\n", InParams->irDriveRegs.bFeaturesReg); + Status = STATUS_INVALID_PARAMETER; + break; + } + } + else + { + DPRINT("%x\n", InParams->irDriveRegs.bCommandReg); + Status = STATUS_INVALID_PARAMETER; + break; + } + if (OutputLength < Information) + { + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + SrbIoControl = ExAllocatePool(NonPagedPool, sizeof(SRB_IO_CONTROL) + Information); + if (SrbIoControl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + Information = 0; + break; + } + memset(SrbIoControl, 0, sizeof(SRB_IO_CONTROL) + Information); + + SrbIoControl->HeaderLength = sizeof(SRB_IO_CONTROL); + memcpy(SrbIoControl->Signature, "SCSIDISK", 8); + SrbIoControl->Timeout = DeviceExtension->TimeOutValue * 4; + SrbIoControl->Length = Information; + SrbIoControl->ControlCode = ControlCode; + + InParams = (PSENDCMDINPARAMS)(SrbIoControl + 1); + + memcpy(InParams, Irp->AssociatedIrp.SystemBuffer, sizeof(SENDCMDINPARAMS) - 1); + + InParams->bDriveNumber = DeviceExtension->TargetId; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + LocalIrp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_MINIPORT, + DeviceExtension->PortDeviceObject, + SrbIoControl, + sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDINPARAMS) - 1, + SrbIoControl, + sizeof(SRB_IO_CONTROL) + Information, + FALSE, + &Event, + &IoSB); + if (LocalIrp == NULL) + { + ExFreePool(SrbIoControl); + Information = 0; + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + Status = IoCallDriver(DeviceExtension->PortDeviceObject, LocalIrp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoSB.Status; + } + if (NT_SUCCESS(Status)) + { +#if 0 + CHAR Buffer[256]; + ULONG i, j; + UCHAR sum = 0; + memset(Buffer, 0, sizeof(Buffer)); + for (i = 0; i < 512; i += 16) + { + for (j = 0; j < 16 && i + j < 512; j++) + { + sprintf(&Buffer[3*j], "%02x ", ((PSENDCMDOUTPARAMS)(SrbIoControl + 1))->bBuffer[i + j]); + sum += ((PSENDCMDOUTPARAMS)(SrbIoControl + 1))->bBuffer[i + j]; + } + for (j = 0; j < 16 && i + j < 512; j++) + { + sprintf(&Buffer[3*16 + j], "%c", isprint(((PSENDCMDOUTPARAMS)(SrbIoControl + 1))->bBuffer[i + j]) ? ((PSENDCMDOUTPARAMS)(SrbIoControl + 1))->bBuffer[i + j] : '.'); + } + DPRINT1("%04x %s\n", i, Buffer); + } + DPRINT1("Sum %02x\n", sum); +#endif + Information = SrbIoControl->Length; + + } + else + { + Information = sizeof(SENDCMDOUTPARAMS) -1; + } + memcpy(Irp->AssociatedIrp.SystemBuffer, InParams, Information); + ExFreePool(SrbIoControl); + break; + } + default: /* Call the common device control function */ return(ScsiClassDeviceControl(DeviceObject, Irp)); @@ -1316,21 +1653,13 @@ return(STATUS_INSUFFICIENT_RESOURCES); } - /* Initialize SRB */ RtlZeroMemory(Srb, sizeof(SCSI_REQUEST_BLOCK)); - Srb->Length = sizeof(SCSI_REQUEST_BLOCK); - /* Set device IDs */ - Srb->PathId = DeviceExtension->PathId; - Srb->TargetId = DeviceExtension->TargetId; - Srb->Lun = DeviceExtension->Lun; /* Set timeout */ Srb->TimeOutValue = DeviceExtension->TimeOutValue * 4; /* Flush write cache */ - Srb->Function = SRB_FUNCTION_EXECUTE_SCSI; - Srb->SrbFlags = SRB_FLAGS_NO_DATA_TRANSFER; Srb->CdbLength = 10; Srb->Cdb[0] = SCSIOP_SYNCHRONIZE_CACHE; ScsiClassSendSrbSynchronous(DeviceObject, _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-16 11:11:35 UTC (rev 18495) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-16 11:17:26 UTC (rev 18496) @@ -1776,9 +1776,9 @@ break; case IOCTL_SCSI_MINIPORT: - DPRINT1(" IOCTL_SCSI_MINIPORT\n"); - DPRINT1(" Signature: %.8s\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->Signature); - DPRINT1(" ControlCode: 0x%lX\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->ControlCode); + DPRINT(" IOCTL_SCSI_MINIPORT\n"); + DPRINT(" Signature: %.8s\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->Signature); + DPRINT(" ControlCode: 0x%lX\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->ControlCode); return SpiScsiMiniport(DeviceObject, Irp); default: @@ -1869,7 +1869,7 @@ SrbIoControl = (PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer; IrpStack = IoGetCurrentIrpStackLocation(Irp); - if (IrpStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SRB_IO_CONTROL) + sizeof(SENDCMDINPARAMS) - 1) + if (IrpStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SRB_IO_CONTROL)) { Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; IoCompleteRequest(Irp, IO_NO_INCREMENT);

1 0

[hpoussin] 18495: Remove registry entries for class installers we don't have
by hpoussin＠svn.reactos.com 16 Oct '05

16 Oct '05

Remove registry entries for class installers we don't have Modified: trunk/reactos/media/inf/mouse.inf Modified: trunk/reactos/media/inf/ports.inf Modified: trunk/reactos/media/inf/scsi.inf _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-10-16 11:08:01 UTC (rev 18494) +++ trunk/reactos/media/inf/mouse.inf 2005-10-16 11:11:35 UTC (rev 18495) @@ -20,7 +20,7 @@ [MouseClass.NT.AddReg] HKR, , , 0, %MouseClassName% HKR, , Icon, 0, "-2" -HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" +;HKR, , Installer32, 0, "syssetup.dll,MouseClassInstaller" HKR, , NoInstallClass, 0, 1 [Manufacturer] _____ Modified: trunk/reactos/media/inf/ports.inf --- trunk/reactos/media/inf/ports.inf 2005-10-16 11:08:01 UTC (rev 18494) +++ trunk/reactos/media/inf/ports.inf 2005-10-16 11:11:35 UTC (rev 18495) @@ -20,7 +20,7 @@ [PortsClass.NT.AddReg] HKR, , , 0, %PortsClassName% HKR, , Icon, 0, "-23" -HKR, , Installer32, 0, "msports.dll,PortsClassInstaller" +;HKR, , Installer32, 0, "msports.dll,PortsClassInstaller" [Manufacturer] %StdMfg% = StdMfg _____ Modified: trunk/reactos/media/inf/scsi.inf --- trunk/reactos/media/inf/scsi.inf 2005-10-16 11:08:01 UTC (rev 18494) +++ trunk/reactos/media/inf/scsi.inf 2005-10-16 11:11:35 UTC (rev 18495) @@ -18,7 +18,7 @@ [SCSIClass.NT.AddReg] HKR, , , 0, %SCSIClassName% HKR, , Icon, 0, "-10" -HKR, , Installer32, 0, "syssetup.dll,ScsiClassInstaller" +;HKR, , Installer32, 0, "syssetup.dll,ScsiClassInstaller" [Strings] ReactOS = "ReactOS Team"

1 0

[hbirr] 18494: - Do only read the pci config header. Some devices/drivers don't like it
by hbirr＠svn.reactos.com 16 Oct '05

16 Oct '05

- Do only read the pci config header. Some devices/drivers don't like it if the complete pci config space is accessed (like my Tekram DC-390F SCSI controller). - Replaced some numeric values with nice named constants. Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-10-16 10:46:22 UTC (rev 18493) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-10-16 11:08:01 UTC (rev 18494) @@ -327,9 +327,9 @@ DeviceExtension->PciDevice->BusNumber, DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &PciConfig, - sizeof(PCI_COMMON_CONFIG)); + PCI_COMMON_HDR_LENGTH); DPRINT("Size %lu\n", Size); - if (Size < sizeof(PCI_COMMON_CONFIG)) + if (Size < PCI_COMMON_HDR_LENGTH) { Irp->IoStatus.Information = 0; return STATUS_UNSUCCESSFUL; @@ -419,7 +419,7 @@ ResourceList->List[0].Count = ResCount; Descriptor = &ResourceList->List[0].Descriptors[0]; - if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0) + if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) { @@ -509,7 +509,7 @@ Descriptor->u.Interrupt.MaximumVector = 0xFF; } } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) { @@ -598,7 +598,7 @@ Descriptor->u.BusNumber.Reserved = 0; } } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { /* FIXME: Add Cardbus bridge resources */ } @@ -637,9 +637,9 @@ DeviceExtension->PciDevice->BusNumber, DeviceExtension->PciDevice->SlotNumber.u.AsULONG, &PciConfig, - sizeof(PCI_COMMON_CONFIG)); + PCI_COMMON_HDR_LENGTH); DPRINT("Size %lu\n", Size); - if (Size < sizeof(PCI_COMMON_CONFIG)) + if (Size < PCI_COMMON_HDR_LENGTH) { Irp->IoStatus.Information = 0; return STATUS_UNSUCCESSFUL; @@ -649,7 +649,7 @@ /* Count required resource descriptors */ ResCount = 0; - if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0) + if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) { @@ -668,7 +668,7 @@ (PciConfig.u.type0.InterruptLine != 0xFF)) ResCount++; } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) { @@ -683,7 +683,7 @@ ResCount++; } } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { } @@ -721,7 +721,7 @@ PartialList->Count = ResCount; Descriptor = &PartialList->PartialDescriptors[0]; - if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0) + if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE) { for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) { @@ -775,7 +775,7 @@ Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; } } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) { @@ -817,7 +817,7 @@ Descriptor++; } } - else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2) + else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { /* FIXME: Cardbus */ }

1 0

[hpoussin] 18493: Implement SetupDiDestroyDriverInfoList
by hpoussin＠svn.reactos.com 16 Oct '05

16 Oct '05

Implement SetupDiDestroyDriverInfoList Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-16 09:58:19 UTC (rev 18492) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-16 10:46:22 UTC (rev 18493) @@ -169,6 +169,7 @@ * - DI_DIDCOMPAT * Set when the device driver list is created * FlagsEx is a combination of: + * - DI_FLAGSEX_DIDCOMPATINFO (FIXME: not supported) */ DWORD Flags; DWORD FlagsEx; @@ -196,9 +197,11 @@ /* Flags is a combination of: * - DI_DIDCLASS * Set when the class driver list is created + * - DI_MULTMFGS (FIXME: not supported) * - DI_COMPAT_FROM_CLASS (FIXME: not supported) * Forces SetupDiBuildDriverInfoList to build a class drivers list * FlagsEx is a combination of: + * - DI_FLAGSEX_DIDINFOLIST (FIXME: not supported) */ DWORD Flags; DWORD FlagsEx; @@ -4257,11 +4260,81 @@ IN PSP_DEVINFO_DATA DeviceInfoData, IN DWORD DriverType) { + struct DeviceInfoSet *list; + BOOL ret = FALSE; + TRACE("%p %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, DriverType); - FIXME("not implemented\n"); - SetLastError(ERROR_GEN_FAILURE); - return FALSE; + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_HANDLE); + else if ((list = (struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (DriverType != SPDIT_CLASSDRIVER && DriverType != SPDIT_COMPATDRIVER) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverType == SPDIT_COMPATDRIVER && !DeviceInfoData) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + struct DeviceInfoElement *deviceInfo = NULL; + PLIST_ENTRY ListEntry; + struct DriverInfoElement *driverInfo; + + if (!DeviceInfoData) + DriverType = SPDIT_CLASSDRIVER; + if (DriverType == SPDIT_CLASSDRIVER) + { + if (!(list->Flags & DI_DIDCLASS)) + /* The list was not created */ + goto done; + } + else if (DriverType == SPDIT_COMPATDRIVER) + { + deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + if (!(deviceInfo->Flags & DI_DIDCOMPAT)) + /* The list was not created */ + goto done; + } + + if (DriverType == SPDIT_CLASSDRIVER) + { + while (!IsListEmpty(&list->DriverListHead)) + { + ListEntry = RemoveHeadList(&list->DriverListHead); + driverInfo = (struct DriverInfoElement *)ListEntry; + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); + HeapFree(GetProcessHeap(), 0, driverInfo); + } + list->Flags &= ~(DI_DIDCLASS | DI_MULTMFGS); + list->FlagsEx &= ~DI_FLAGSEX_DIDINFOLIST; + list->SelectedDriver = NULL; + } + else + { + while (!IsListEmpty(&deviceInfo->DriverListHead)) + { + ListEntry = RemoveHeadList(&deviceInfo->DriverListHead); + driverInfo = (struct DriverInfoElement *)ListEntry; + if (list->SelectedDriver == driverInfo) + list->SelectedDriver = NULL; + HeapFree(GetProcessHeap(), 0, driverInfo->InfSection); + HeapFree(GetProcessHeap(), 0, driverInfo->InfPath); + HeapFree(GetProcessHeap(), 0, driverInfo->MatchingId); + HeapFree(GetProcessHeap(), 0, driverInfo); + } + deviceInfo->Flags &= ~DI_DIDCOMPAT; + deviceInfo->FlagsEx &= ~DI_FLAGSEX_DIDCOMPATINFO; + deviceInfo->SelectedDriver = NULL; + } + ret = TRUE; + } + +done: + TRACE("Returning %d\n", ret); + return ret; }

1 0

[ekohl] 18492: - Add samsrv.dll stub.
by ekohl＠svn.reactos.com 16 Oct '05

16 Oct '05

- Add samsrv.dll stub. - Install cfgmgr32.dll, lsasrv.dll and samsrv.dll. Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/samsrv/ Added: trunk/reactos/lib/samsrv/samsrv.c Added: trunk/reactos/lib/samsrv/samsrv.def Added: trunk/reactos/lib/samsrv/samsrv.rc Added: trunk/reactos/lib/samsrv/samsrv.xml _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-16 09:58:19 UTC (rev 18492) @@ -72,6 +72,7 @@ lib\cpl\ncpa\ncpa.cpl 1 lib\cpl\sysdm\sysdm.cpl 1 lib\cpl\timedate\timedate.cpl 1 +lib\cfgmgr32\cfgmgr32.dll 1 lib\comctl32\comctl32.dll 1 lib\comdlg32\comdlg32.dll 1 lib\crtdll\crtdll.dll 1 @@ -104,6 +105,7 @@ lib\keyboard\kbduk\kbduk.dll 1 lib\keyboard\kbdus\kbdus.dll 1 lib\kernel32\kernel32.dll 1 +lib\lsasrv\lsasrv.dll 1 lib\lzexpand\lz32.dll 1 lib\mesa32\mesa32.dll 1 lib\winmm\midimap\midimap.dll 1 @@ -134,6 +136,7 @@ lib\richedit\riched32.dll 1 lib\rpcrt4\rpcrt4.dll 1 lib\samlib\samlib.dll 1 +lib\samsrv\samsrv.dll 1 lib\secur32\secur32.dll 1 lib\serialui\serialui.dll 1 lib\setupapi\setupapi.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/lib/directory.xml 2005-10-16 09:58:19 UTC (rev 18492) @@ -224,6 +224,9 @@ <directory name="samlib"> <xi:include href="samlib/samlib.xml" /> </directory> +<directory name="samsrv"> + <xi:include href="samsrv/samsrv.xml" /> +</directory> <directory name="secur32"> <xi:include href="secur32/secur32.xml" /> </directory> _____ Added: trunk/reactos/lib/samsrv/samsrv.c --- trunk/reactos/lib/samsrv/samsrv.c 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/lib/samsrv/samsrv.c 2005-10-16 09:58:19 UTC (rev 18492) @@ -0,0 +1,51 @@ +/* + * SAM Server DLL + * Copyright (C) 2005 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +//#include <samsrv.h> + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS STDCALL +SamIInitialize(VOID) +{ + DPRINT1("SamIInitialize() called\n"); + + return STATUS_SUCCESS; +} + + +NTSTATUS STDCALL +SampInitializeRegistry(VOID) +{ + DPRINT1("SampInitializeRegistry() called\n"); + + return STATUS_SUCCESS; +} + +/* EOF */ _____ Added: trunk/reactos/lib/samsrv/samsrv.def --- trunk/reactos/lib/samsrv/samsrv.def 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/lib/samsrv/samsrv.def 2005-10-16 09:58:19 UTC (rev 18492) @@ -0,0 +1,75 @@ +LIBRARY samsrv +EXPORTS +;SamIAccountRestrictions +;SamIConnect +;SamICreateAccountByRid +;SamIEnumerateAccountRids +;SamIFree_SAMPR_ALIAS_INFO_BUFFER +;SamIFree_SAMPR_DISPLAY_INFO_BUFFER +;SamIFree_SAMPR_DOMAIN_INFO_BUFFER +;SamIFree_SAMPR_ENUMERATION_BUFFER +;SamIFree_SAMPR_GET_GROUPS_BUFFER +;SamIFree_SAMPR_GET_MEMBERS_BUFFER +;SamIFree_SAMPR_GROUP_INFO_BUFFER +;SamIFree_SAMPR_PSID_ARRAY +;SamIFree_SAMPR_RETURNED_USTRING_ARRAY +;SamIFree_SAMPR_SR_SECURITY_DESCRIPTOR +;SamIFree_SAMPR_ULONG_ARRAY +;SamIFree_SAMPR_USER_INFO_BUFFER +;SamIGetPrivateData +;SamIGetSerialNumberDomain +SamIInitialize@0 +;SamINotifyDelta +;SamISetAuditingInformation +;SamISetPrivateData +;SamISetSerialNumberDomain +SampInitializeRegistry@0 +;SampRtlConvertUlongToUnicodeString +;SamrAddMemberToAlias +;SamrAddMemberToGroup +;SamrAddMultipleMemberstoAlias +;SamrChangePasswordUser +;SamrCloseHandle +;SamrConnect +;SamrCreateAliasInDomain +;SamrCreateGroupInDomain +;SamrCreateUserInDomain +;SamrDeleteAlias +;SamrDeleteGroup +;SamrDeleteUser +;SamrEnumerateAliasesInDomain +;SamrEnumerateDomainsInSamServer +;SamrEnumerateGroupsInDomain +;SamrEnumerateUsersInDomain +;SamrGetAliasMembership +;SamrGetGroupsForUser +;SamrGetMembersInAlias +;SamrGetMembersInGroup +;SamrGetUserDomainPasswordInformation +;SamrLookupDomainInSamServer +;SamrLookupIdsInDomain +;SamrLookupNamesInDomain +;SamrOpenAlias +;SamrOpenDomain +;SamrOpenGroup +;SamrOpenUser +;SamrQueryDisplayInformation +;SamrQueryInformationAlias +;SamrQueryInformationDomain +;SamrQueryInformationGroup +;SamrQueryInformationUser +;SamrQuerySecurityObject +;SamrRemoveMemberFromAlias +;SamrRemoveMemberFromForeignDomain +;SamrRemoveMemberFromGroup +;SamrRemoveMultipleMembersFromAlias +;SamrSetInformationAlias +;SamrSetInformationDomain +;SamrSetInformationGroup +;SamrSetInformationUser +;SamrSetMemberAttributesOfGroup +;SamrSetSecurityObject +;SamrShutdownSamServer +;SamrTestPrivateFunctionsDomain +;SamrTestPrivateFunctionsUser +; EOF \ No newline at end of file _____ Added: trunk/reactos/lib/samsrv/samsrv.rc --- trunk/reactos/lib/samsrv/samsrv.rc 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/lib/samsrv/samsrv.rc 2005-10-16 09:58:19 UTC (rev 18492) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "SAM server DLL\0" +#define REACTOS_STR_INTERNAL_NAME "samsrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "samsrv.dll\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/lib/samsrv/samsrv.xml --- trunk/reactos/lib/samsrv/samsrv.xml 2005-10-16 01:29:08 UTC (rev 18491) +++ trunk/reactos/lib/samsrv/samsrv.xml 2005-10-16 09:58:19 UTC (rev 18492) @@ -0,0 +1,13 @@ +<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll"> + <importlibrary definition="samsrv.def" /> + <include base="samsrv">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <library>ntdll</library> + <library>kernel32</library> + <file>samsrv.c</file> + <file>samsrv.rc</file> +</module>

1 0

[gdalsnes] 18491: fix buffer overflow
by gdalsnes＠svn.reactos.com 16 Oct '05

16 Oct '05

fix buffer overflow Modified: trunk/reactos/lib/advapi32/service/sctrl.c _____ Modified: trunk/reactos/lib/advapi32/service/sctrl.c --- trunk/reactos/lib/advapi32/service/sctrl.c 2005-10-16 01:27:32 UTC (rev 18490) +++ trunk/reactos/lib/advapi32/service/sctrl.c 2005-10-16 01:29:08 UTC (rev 18491) @@ -204,7 +204,7 @@ lpService->Arguments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - StartPacket->Size); + StartPacket->Size * sizeof(WCHAR)); if (lpService->Arguments == NULL) return ERROR_OUTOFMEMORY;

1 0

[gdalsnes] 18490: fix two buffer overflows
by gdalsnes＠svn.reactos.com 16 Oct '05

16 Oct '05

fix two buffer overflows Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-10-16 01:26:52 UTC (rev 18489) +++ trunk/reactos/subsys/csrss/init.c 2005-10-16 01:27:32 UTC (rev 18490) @@ -401,16 +401,21 @@ AnsiEnv.Buffer = RtlAllocateHeap (RtlGetProcessHeap(), 0, CharCount); if (NULL != AnsiEnv.Buffer) { + PCHAR WritePos = AnsiEnv.Buffer; for (Index=0; NULL != envp[Index]; Index++) { - strcat (WritePos, envp[Index]); + strcpy (WritePos, envp[Index]); WritePos += strlen (envp[Index]) + 1; } - AnsiEnv.Buffer [CharCount] = '\0'; + + /* FIXME: the last (double) nullterm should perhaps not be included in Length + * but only in MaximumLength. -Gunnar */ + AnsiEnv.Buffer [CharCount-1] = '\0'; AnsiEnv.Length = CharCount; AnsiEnv.MaximumLength = CharCount; + RtlAnsiStringToUnicodeString (UnicodeEnv, & AnsiEnv, TRUE); RtlFreeHeap (RtlGetProcessHeap(), 0, AnsiEnv.Buffer); }

1 0

[gdalsnes] 18489: fix buffer overflow
by gdalsnes＠svn.reactos.com 16 Oct '05

16 Oct '05

fix buffer overflow add error checking Modified: trunk/reactos/lib/nt/entry_point.c _____ Modified: trunk/reactos/lib/nt/entry_point.c --- trunk/reactos/lib/nt/entry_point.c 2005-10-16 01:22:18 UTC (rev 18488) +++ trunk/reactos/lib/nt/entry_point.c 2005-10-16 01:26:52 UTC (rev 18489) @@ -29,44 +29,32 @@ /* FUNCTIONS ****************************************************************/ static -ULONG STDCALL WideCharStringToUnicodeString (HANDLE hHeap, PWCHAR wsIn, PUNICODE_STRING usOut) +VOID FASTCALL EnvironmentStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usOut) { - ULONG CharCount = 0; - PWCHAR CurrentChar = wsIn; - ULONG BufferLength = 0; + if (wsIn) + { + PWCHAR CurrentChar = wsIn; + + while (*CurrentChar) + { + while(*CurrentChar++); + } + /* double nullterm at end */ + CurrentChar++; - DPRINT("%s(%S) called\n", __FUNCTION__, wsIn); + usOut->Buffer = wsIn; + /* FIXME: the last (double) nullterm should perhaps not be included in Length + * but only in MaximumLength. -Gunnar */ + usOut->MaximumLength = usOut->Length = (CurrentChar-wsIn) * sizeof(WCHAR); + } + else + { + usOut->Buffer = NULL; + usOut->Length = usOut->MaximumLength = 0; + } +} - if (NULL != CurrentChar) - { - while (*CurrentChar ++) - { - ++ CharCount; - while (*CurrentChar ++) - { - ++ CharCount; - } - } - ++ CharCount; - } - BufferLength = CharCount * sizeof *usOut->Buffer; - if (0 < CharCount) - { - usOut->Buffer = RtlAllocateHeap (hHeap, 0, BufferLength); - if (NULL != usOut->Buffer) - { - RtlCopyMemory (usOut->Buffer, wsIn, BufferLength); - usOut->Length = BufferLength; - usOut->MaximumLength = BufferLength; - } - } else { - usOut->Buffer = NULL; - usOut->Length = 0; - usOut->MaximumLength = 0; - } - return usOut->Length; -} VOID STDCALL @@ -94,7 +82,14 @@ ASSERT(ProcessParameters); /* Allocate memory for the argument list, enough for 512 tokens */ - ArgumentList = RtlAllocateHeap(Peb->ProcessHeap, 0, 512 * sizeof(PCHAR)); + //FIXME: what if 512 is not enough???? + ArgumentList = RtlAllocateHeap(RtlGetProcessHeap(), 0, 512 * sizeof(PCHAR)); + if (!ArgumentList) + { + DPRINT1("ERR: no mem!"); + Status = STATUS_NO_MEMORY; + goto fail; + } /* Use a null pointer as default */ argv = &NullPointer; @@ -114,7 +109,12 @@ } /* Convert it to an ANSI string */ - RtlUnicodeStringToAnsiString(&AnsiCmdLine, CmdLineString, TRUE); + Status = RtlUnicodeStringToAnsiString(&AnsiCmdLine, CmdLineString, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERR: no mem(guess)\n"); + goto fail; + } /* Save parameters for parsing */ Source = AnsiCmdLine.Buffer; @@ -124,7 +124,13 @@ if (Source) { /* Allocate a buffer for the destination */ - Destination = RtlAllocateHeap(Peb->ProcessHeap, 0, Length + sizeof(WCHAR)); + Destination = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length + sizeof(WCHAR)); + if (!Destination) + { + DPRINT1("ERR: no mem!"); + Status = STATUS_NO_MEMORY; + goto fail; + } /* Start parsing */ while (*Source) @@ -156,27 +162,27 @@ /* Now handle the enviornment, point the envp at our current list location. */ envp = ArgumentList; - if (0 < WideCharStringToUnicodeString (Peb->ProcessHeap, - ProcessParameters->Environment, & UnicodeEnvironment)) + if (ProcessParameters->Environment) { - RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); - RtlFreeUnicodeString (& UnicodeEnvironment); + EnvironmentStringToUnicodeString(ProcessParameters->Environment, &UnicodeEnvironment); + Status = RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERR: no mem(guess)\n"); + goto fail; + } - /* Change our source to the enviroment pointer */ - Source = AnsiEnvironment.Buffer; + ASSERT(AnsiEnvironment.Buffer); - /* Simply do a direct copy */ - if (Source) - { - while (*Source) - { - /* Save a pointer to this token */ - *ArgumentList++ = Source; + Source = AnsiEnvironment.Buffer; + while (*Source) + { + /* Save a pointer to this token */ + *ArgumentList++ = Source; - /* Keep looking for another variable */ - while (*Source++); - } - } + /* Keep looking for another variable */ + while (*Source++); + } /* Null terminate the list again */ *ArgumentList++ = NULL; @@ -187,6 +193,7 @@ /* Call the Main Function */ Status = _main(argc, argv, envp, ProcessParameters->DebugFlags); +fail: /* We're done here */ NtTerminateProcess(NtCurrentProcess(), Status); }

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005