Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 50986: [Win32k] - Fix a crash in WidenPath, tested with Area.exe.
by jimtabor＠svn.reactos.org 07 Mar '11

07 Mar '11

Author: jimtabor Date: Mon Mar 7 06:24:38 2011 New Revision: 50986 URL: http://svn.reactos.org/svn/reactos?rev=50986&view=rev Log: [Win32k] - Fix a crash in WidenPath, tested with Area.exe. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Mon Mar 7 06:24:38 2011 @@ -1858,7 +1858,7 @@ PATH_DestroyGdiPath(pDownPath); ExFreePoolWithTag(pDownPath, TAG_PATH); } - ExFreePoolWithTag(pStrokes, TAG_PATH); + if (pStrokes) ExFreePoolWithTag(pStrokes, TAG_PATH); pNewPath->state = PATH_Closed; if (!(ret = PATH_AssignGdiPath(pPath, pNewPath)))

1 0

[fireball] 50985: [UNIATA] - Rafal Harabien: Sync UniATA to 0.40a5. Changelog: * Fixed bug with BSOD on newer SATA/AHCI Intel chips. * Added support for different number of devices on different cha...
by fireball＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: fireball Date: Sun Mar 6 16:32:36 2011 New Revision: 50985 URL: http://svn.reactos.org/svn/reactos?rev=50985&view=rev Log: [UNIATA] - Rafal Harabien: Sync UniATA to 0.40a5. Changelog: * Fixed bug with BSOD on newer SATA/AHCI Intel chips. * Added support for different number of devices on different channls. * Updated AHCI support code (not ready yet). * All ReactOS specific changes have been left. See issue #5976 for more details. Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -31,9 +31,12 @@ --*/ -#define IDE_MAX_CHAN 8 +#define IDE_MAX_CHAN 16 +#define IDE_DEFAULT_MAX_CHAN 2 // Thanks to SATA Port Multipliers: -#define IDE_MAX_LUN_PER_CHAN 16 +//#define IDE_MAX_LUN_PER_CHAN SATA_MAX_PM_UNITS +#define IDE_MAX_LUN_PER_CHAN 2 + #define IDE_MAX_LUN (AHCI_MAX_PORT*IDE_MAX_LUN_PER_CHAN) #define MAX_QUEUE_STAT 8 @@ -113,6 +116,7 @@ ULONG Isr2Vector; PKINTERRUPT Isr2InterruptObject; CHAR AltInitMasterDev; // 0xff - uninitialized, 0x00 - normal, 0x01 - change ISA to PCI + CHAR NeedAltInit; // 0x01 - try change ISA to PCI #endif }BUSMASTER_CONTROLLER_INFORMATION, *PBUSMASTER_CONTROLLER_INFORMATION; Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -95,6 +95,8 @@ #define AHCI_MAX_PORT 32 +#define SATA_MAX_PM_UNITS 16 + typedef struct _BUSMASTER_CTX { PBUSMASTER_CONTROLLER_INFORMATION* BMListPtr; ULONG* BMListLen; @@ -178,6 +180,7 @@ } CAP; #define AHCI_CAP_NOP_MASK 0x0000001f +#define AHCI_CAP_SPM 0x00010000 #define AHCI_CAP_S64A 0x80000000 // Global HBA Control @@ -793,7 +796,10 @@ // KIRQL QueueOldIrql; #endif struct _HW_DEVICE_EXTENSION* DeviceExtension; - struct _HW_LU_EXTENSION* lun[2]; + struct _HW_LU_EXTENSION* lun[IDE_MAX_LUN_PER_CHAN]; + + ULONG NumberLuns; + ULONG PmLunMap; // Double-buffering support PVOID DB_PRD; @@ -898,7 +904,8 @@ // Controller-specific LUN options union { /* for tricky controllers, those can change Logical-to-Physical LUN mapping. - mainly for mapping SATA ports to compatible PATA registers */ + Treated as PHYSICAL port number, regardless of logical mapping. + */ ULONG SATA_lun_map; }; @@ -1493,6 +1500,14 @@ #define GET_LDEV2(P, T, L) (T | ((P)<<1)) #define GET_CDEV(Srb) (Srb->TargetId) +VOID +NTAPI +AtapiSetupLunPtrs( + IN PHW_CHANNEL chan, + IN PHW_DEVICE_EXTENSION deviceExtension, + IN ULONG c + ); +/* #define AtapiSetupLunPtrs(chan, deviceExtension, c) \ { \ chan->DeviceExtension = deviceExtension; \ @@ -1504,7 +1519,7 @@ chan->lun[0]->DeviceExtension = deviceExtension; \ chan->lun[1]->DeviceExtension = deviceExtension; \ } - +*/ BOOLEAN NTAPI AtapiReadChipConfig( Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -2976,8 +2976,8 @@ kptr = KeyWord; while ((*cptr == *kptr) || - (*cptr <= 'Z' && *cptr + ('a' - 'A') == *kptr) || - (*cptr >= 'a' && *cptr - ('a' - 'A') == *kptr)) { + (*cptr >= 'A' && *cptr <= 'Z' && *cptr + ('a' - 'A') == *kptr) || + (*cptr >= 'a' && *cptr <= 'z' && *cptr - ('a' - 'A') == *kptr)) { cptr++; kptr++; @@ -8589,6 +8589,16 @@ &hwInitializationData.comm, (PVOID)(i | (alt ? 0x80000000 : 0))); KdPrint2((PRINT_PREFIX "ScsiPortInitialize Status %#x\n", newStatus)); + if(newStatus == (ULONG)STATUS_DEVICE_DOES_NOT_EXIST && BMList[i].NeedAltInit) { + KdPrint2((PRINT_PREFIX "STATUS_DEVICE_DOES_NOT_EXIST, try workaround\n")); + hwInitializationData.comm.AdapterInterfaceType = Isa; + newStatus = ScsiPortInitialize(DriverObject, + Argument2, + &hwInitializationData.comm, + (PVOID)(i | 0x80000000)); + KdPrint2((PRINT_PREFIX "ScsiPortInitialize Status %#x (2)\n", newStatus)); + } + if (newStatus < statusToReturn) { statusToReturn = newStatus; } @@ -9090,7 +9100,7 @@ status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE /*| RTL_REGISTRY_OPTIONAL*/, paramPath.Buffer, parameters, NULL, NULL); - //KdPrint(( "AtapiCheckRegValue: %ws -> %ws is %#x\n", PathSuffix, Name, doRun)); + KdPrint(( "AtapiCheckRegValue: %ws -> %ws is %#x\n", PathSuffix, Name, doRun)); ExFreePool(paramPath.Buffer); Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -68,6 +68,11 @@ deviceExtension->NumberChannels = 1; } + if(ChipFlags & (UNIATA_SATA | UNIATA_AHCI)) { + KdPrint2((PRINT_PREFIX "SATA/AHCI -> possible PM, max luns %d\n", SATA_MAX_PM_UNITS)); + //deviceExtension->NumberLuns = SATA_MAX_PM_UNITS; + } + switch(VendorID) { case ATA_ACER_LABS_ID: switch(deviceExtension->DevID) { @@ -102,8 +107,8 @@ case ATA_ATI_ID: KdPrint2((PRINT_PREFIX "ATI\n")); switch(deviceExtension->DevID) { - case 0x438c1002: - case 0x439c1002: + case ATA_ATI_IXP600: + case ATA_ATI_IXP700: /* IXP600 & IXP700 only have 1 PATA channel */ if(BMList[deviceExtension->DevIndex].channel) { KdPrint2((PRINT_PREFIX "New ATI no 2nd PATA chan\n")); @@ -141,6 +146,12 @@ deviceExtension->HwFlags & VIABAR) { deviceExtension->NumberChannels = 3; KdPrint2((PRINT_PREFIX "VIA 3 chan\n")); + } + if(ChipFlags & VIASATA) { + /* 2 SATA without SATA registers on first channel + 1 PATA on second */ + // do nothing, generic PATA INIT + KdPrint2((PRINT_PREFIX "VIA SATA without SATA regs -> no PM\n")); + deviceExtension->NumberLuns = SATA_MAX_PM_UNITS; } break; case ATA_ITE_ID: @@ -981,32 +992,14 @@ IsPata = FALSE; if(ChipFlags & ICH5) { if ((tmp8 & 0x04) == 0) { - //ch->flags |= ATA_SATA; - //ch->flags |= ATA_NO_SLAVE; - //smap[0] = (map & 0x01) ^ ch->unit; - //smap[1] = 0; chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; - chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ^ c; - chan->lun[1]->SATA_lun_map = 0; } else if ((tmp8 & 0x02) == 0) { - //ch->flags |= ATA_SATA; - //smap[0] = (map & 0x01) ? 1 : 0; - //smap[1] = (map & 0x01) ? 0 : 1; - if(c == 0) { - chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ? 1 : 0; - chan->lun[1]->SATA_lun_map = (tmp8 & 0x01) ? 0 : 1; - } else { + if(c != 0) { IsPata = TRUE; //chan->ChannelCtrlFlags |= CTRFLAGS_PATA; } } else if ((tmp8 & 0x02) != 0) { - //ch->flags |= ATA_SATA; - //smap[0] = (map & 0x01) ? 1 : 0; - //smap[1] = (map & 0x01) ? 0 : 1; - if(c == 1) { - chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ? 1 : 0; - chan->lun[1]->SATA_lun_map = (tmp8 & 0x01) ? 0 : 1; - } else { + if(c != 1) { IsPata = TRUE; //chan->ChannelCtrlFlags |= CTRFLAGS_PATA; } @@ -1014,28 +1007,16 @@ } else if(ChipFlags & I6CH2) { chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; - chan->lun[0]->SATA_lun_map = c ? 4 : 5; - chan->lun[1]->SATA_lun_map = 0; } else { switch(tmp8 & 0x03) { - case 0: - chan->lun[0]->SATA_lun_map = 0+c; - chan->lun[1]->SATA_lun_map = 2+c; - break; case 2: - if(c==0) { - chan->lun[0]->SATA_lun_map = 0; - chan->lun[1]->SATA_lun_map = 2; - } else { + if(c!=0) { // PATA IsPata = TRUE; } break; case 1: - if(c==1) { - chan->lun[0]->SATA_lun_map = 1; - chan->lun[1]->SATA_lun_map = 3; - } else { + if(c!=1) { // PATA IsPata = TRUE; } @@ -1045,9 +1026,11 @@ if(IsPata) { chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA5); + KdPrint2((PRINT_PREFIX "PATA part\n")); } else { if((ChipFlags & ICH5) && BaseMemAddress) { + KdPrint2((PRINT_PREFIX "ICH5 indexed\n")); chan->RegTranslation[IDX_INDEXED_ADDR].Addr = BaseMemAddress + 0; chan->RegTranslation[IDX_INDEXED_ADDR].MemIo = MemIo; chan->RegTranslation[IDX_INDEXED_DATA].Addr = BaseMemAddress + 4; @@ -1055,6 +1038,7 @@ } if((ChipFlags & ICH5) || BaseMemAddress) { + KdPrint2((PRINT_PREFIX "i indexed\n")); // Rather interesting way of register access... ChipType = INTEL_IDX; deviceExtension->HwFlags &= ~CHIPTYPE_MASK; @@ -1085,6 +1069,10 @@ } if(ChipFlags & UNIATA_AHCI) { + if(AtapiRegCheckDevValue(NULL, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"IgnoreAhci", 1)) { + KdPrint((" AHCI excluded\n")); + return STATUS_UNSUCCESSFUL; + } return UniataAhciInit(HwDeviceExtension) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; } @@ -1395,8 +1383,8 @@ c = channel - deviceExtension->Channel; // logical channel chan = &deviceExtension->chan[c]; - ldev &= 0x01; - LunExt = &(deviceExtension->lun[c*2+ldev]); + ldev &= (deviceExtension->NumberLuns-1); + LunExt = &(deviceExtension->lun[c*deviceExtension->NumberLuns+ldev]); tmp32 = AtapiRegCheckDevValue(deviceExtension, channel, ldev, L"ReadCacheEnable", 1); LunExt->opt_ReadCacheEnable = tmp32 ? TRUE : FALSE; @@ -1441,6 +1429,7 @@ PHW_CHANNEL chan; ULONG tmp32; ULONG c; // logical channel (for Compatible Mode controllers) + ULONG i; KdPrint2((PRINT_PREFIX "AtapiReadChipConfig: devExt %#x\n", deviceExtension )); ASSERT(deviceExtension); @@ -1504,8 +1493,9 @@ tmp32 = AtapiRegCheckDevValue(deviceExtension, c, DEVNUM_NOT_SPECIFIED, L"ReorderEnable", TRUE); chan->UseReorder = tmp32 ? TRUE : FALSE; - UniAtaReadLunConfig(deviceExtension, channel, 0); - UniAtaReadLunConfig(deviceExtension, channel, 1); + for(i=0; i<deviceExtension->NumberLuns; i++) { + UniAtaReadLunConfig(deviceExtension, channel, i); + } } return TRUE; @@ -1656,25 +1646,104 @@ } break; case ATA_INTEL_ID: { + BOOLEAN IsPata; USHORT reg54; + UCHAR tmp8; if(ChipFlags & UNIATA_SATA) { - if(ChipFlags & UNIATA_AHCI) + KdPrint2((PRINT_PREFIX "Intel SATA\n")); + if(ChipFlags & UNIATA_AHCI) { + KdPrint2((PRINT_PREFIX "Skip AHCI\n")); break; + } if(c == CHAN_NOT_SPECIFIED) { + KdPrint2((PRINT_PREFIX "Base init\n")); /* force all ports active "the legacy way" */ ChangePciConfig2(0x92, (a | 0x0f)); /* enable PCI interrupt */ ChangePciConfig2(/*PCIR_COMMAND*/0x04, (a & ~0x0400)); + } else { + + KdPrint2((PRINT_PREFIX "channel init\n")); + + GetPciConfig1(0x90, tmp8); + KdPrint2((PRINT_PREFIX "reg 90: %x, init lun map\n", tmp8)); + + KdPrint2((PRINT_PREFIX "chan %d\n", c)); + chan = &deviceExtension->chan[c]; + IsPata = FALSE; + if(ChipFlags & ICH5) { + KdPrint2((PRINT_PREFIX "ICH5\n")); + if ((tmp8 & 0x04) == 0) { + chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; + chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ^ c; + chan->lun[1]->SATA_lun_map = 0; + } else if ((tmp8 & 0x02) == 0) { + if(c == 0) { + chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ? 1 : 0; + chan->lun[1]->SATA_lun_map = (tmp8 & 0x01) ? 0 : 1; + } else { + IsPata = TRUE; + //chan->ChannelCtrlFlags |= CTRFLAGS_PATA; + } + } else if ((tmp8 & 0x02) != 0) { + if(c == 1) { + chan->lun[0]->SATA_lun_map = (tmp8 & 0x01) ? 1 : 0; + chan->lun[1]->SATA_lun_map = (tmp8 & 0x01) ? 0 : 1; + } else { + IsPata = TRUE; + //chan->ChannelCtrlFlags |= CTRFLAGS_PATA; + } + } + } else + if(ChipFlags & I6CH2) { + KdPrint2((PRINT_PREFIX "I6CH2\n")); + chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; + chan->lun[0]->SATA_lun_map = c ? 4 : 5; + chan->lun[1]->SATA_lun_map = 0; + } else { + KdPrint2((PRINT_PREFIX "other Intel\n")); + switch(tmp8 & 0x03) { + case 0: + chan->lun[0]->SATA_lun_map = 0+c; + chan->lun[1]->SATA_lun_map = 2+c; + break; + case 2: + if(c==0) { + chan->lun[0]->SATA_lun_map = 0; + chan->lun[1]->SATA_lun_map = 2; + } else { + // PATA + IsPata = TRUE; + } + break; + case 1: + if(c==1) { + chan->lun[0]->SATA_lun_map = 1; + chan->lun[1]->SATA_lun_map = 3; + } else { + // PATA + IsPata = TRUE; + } + break; + } + } + + if(IsPata) { + KdPrint2((PRINT_PREFIX "PATA part\n")); + chan->MaxTransferMode = min(deviceExtension->MaxTransferMode, ATA_UDMA5); + } + if(ChipType == INTEL_IDX) { - for(c=0; c<deviceExtension->NumberChannels; c++) { + KdPrint2((PRINT_PREFIX "i indexed\n")); + //for(c=0; c<deviceExtension->NumberChannels; c++) { chan = &deviceExtension->chan[c]; UniataSataWritePort4(chan, IDX_SATA_SError, 0xffffffff, 0); if(!(chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE)) { UniataSataWritePort4(chan, IDX_SATA_SError, 0xffffffff, 1); } - } + //} } } @@ -2141,3 +2210,30 @@ RtlCopyMemory(&chan->RegTranslation[IDX_IO1_o], &chan->RegTranslation[IDX_IO1], IDX_IO1_SZ*sizeof(chan->RegTranslation[0])); RtlCopyMemory(&chan->RegTranslation[IDX_IO2_o], &chan->RegTranslation[IDX_IO2], IDX_IO2_SZ*sizeof(chan->RegTranslation[0])); } // end UniataInitSyncBaseIO() + +VOID +NTAPI +AtapiSetupLunPtrs( + IN PHW_CHANNEL chan, + IN PHW_DEVICE_EXTENSION deviceExtension, + IN ULONG c + ) +{ + ULONG i; + + if(!deviceExtension->NumberLuns) { + deviceExtension->NumberLuns = IDE_MAX_LUN_PER_CHAN; + } + chan->DeviceExtension = deviceExtension; + chan->lChannel = c; + chan->NumberLuns = deviceExtension->NumberLuns; + for(i=0; i<deviceExtension->NumberLuns; i++) { + chan->lun[i] = &(deviceExtension->lun[c*deviceExtension->NumberLuns+i]); + } + chan->AltRegMap = deviceExtension->AltRegMap; + chan->NextDpcChan = -1; + for(i=0; i<deviceExtension->NumberLuns; i++) { + chan->lun[i]->DeviceExtension = deviceExtension; + } +} // end AtapiSetupLunPtrs() + Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -144,6 +144,11 @@ (*ConfigInfo->AccessRanges)[rid].RangeStart = ScsiPortConvertUlongToPhysicalAddress(io_start); (*ConfigInfo->AccessRanges)[rid].RangeLength = length; + } + if((pciData->u.type0.BaseAddresses[rid] & PCI_ADDRESS_IO_SPACE)) { + (*ConfigInfo->AccessRanges)[rid].RangeInMemory = FALSE; + } else { + (*ConfigInfo->AccessRanges)[rid].RangeInMemory = TRUE; } } else { io_start = 0; @@ -252,6 +257,7 @@ BOOLEAN found; BOOLEAN known; + BOOLEAN NeedPciAltInit; UCHAR IrqForCompat = 10; @@ -269,6 +275,7 @@ for(pass=0; pass<3; pass++) { for(busNumber=0 ;busNumber<maxPciBus && !no_buses; busNumber++) { for(slotNumber=0; slotNumber<PCI_MAX_DEVICES && !no_buses; slotNumber++) { + NeedPciAltInit = FALSE; for(funcNumber=0; funcNumber<PCI_MAX_FUNCTION && !no_buses; funcNumber++) { // KdPrint2((PRINT_PREFIX "-- BusID: %#x:%#x:%#x\n",busNumber,slotNumber,funcNumber)); @@ -288,11 +295,15 @@ break; } // no device in this slot - if(busDataRead == 2) + if(busDataRead == 2) { + NeedPciAltInit = TRUE; continue; - - if(busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) + } + + if(busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { + NeedPciAltInit = TRUE; continue; + } VendorID = pciData.VendorID; DeviceID = pciData.DeviceID; @@ -304,6 +315,7 @@ if(BaseClass != PCI_DEV_CLASS_STORAGE) continue; + KdPrint2((PRINT_PREFIX "-- BusID: %#x:%#x:%#x\n",busNumber,slotNumber,funcNumber)); KdPrint2((PRINT_PREFIX "Storage Class\n")); KdPrint2((PRINT_PREFIX "DevId = %8.8X Class = %4.4X/%4.4X\n", dev_id, BaseClass, SubClass )); // look for known chipsets @@ -528,9 +540,10 @@ newBMListPtr->MasterDev = IsMasterDev(&pciData) ? 1 : 0; newBMListPtr->busNumber = busNumber; + newBMListPtr->NeedAltInit = NeedPciAltInit; newBMListPtr->Known = known; - KdPrint2((PRINT_PREFIX "Add to BMList\n")); + KdPrint2((PRINT_PREFIX "Add to BMList, AltInit %d\n", NeedPciAltInit)); } else { KdPrint2((PRINT_PREFIX "count: BMListLen++\n")); } @@ -812,12 +825,12 @@ } } - deviceExtension->lun = (PHW_LU_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(HW_LU_EXTENSION) * (deviceExtension->NumberChannels+1) * IDE_MAX_LUN_PER_CHAN); + deviceExtension->lun = (PHW_LU_EXTENSION)ExAllocatePool(NonPagedPool, sizeof(HW_LU_EXTENSION) * (deviceExtension->NumberChannels+1) * deviceExtension->NumberLuns); if (!deviceExtension->lun) { KdPrint2((PRINT_PREFIX "!deviceExtension->lun => SP_RETURN_ERROR\n")); return FALSE; } - RtlZeroMemory(deviceExtension->lun, sizeof(HW_LU_EXTENSION) * (deviceExtension->NumberChannels+1) * IDE_MAX_LUN_PER_CHAN); + RtlZeroMemory(deviceExtension->lun, sizeof(HW_LU_EXTENSION) * (deviceExtension->NumberChannels+1) * deviceExtension->NumberLuns); deviceExtension->chan = (PHW_CHANNEL)ExAllocatePool(NonPagedPool, sizeof(HW_CHANNEL) * (deviceExtension->NumberChannels+1)); if (!deviceExtension->chan) { @@ -1025,7 +1038,8 @@ deviceExtension->SystemIoBusNumber = SystemIoBusNumber; deviceExtension->DevID = dev_id; deviceExtension->RevID = RevID; - deviceExtension->NumberChannels = 2; // default + deviceExtension->NumberChannels = IDE_DEFAULT_MAX_CHAN; // default + deviceExtension->NumberLuns = IDE_MAX_LUN_PER_CHAN; // default deviceExtension->DevIndex = i; _snprintf(deviceExtension->Signature, sizeof(deviceExtension->Signature), @@ -1266,9 +1280,9 @@ } if(simplexOnly && MasterDev) { - if(deviceExtension->NumberChannels < 2) { - KdPrint2((PRINT_PREFIX "set NumberChannels = 2\n")); - deviceExtension->NumberChannels = 2; + if(deviceExtension->NumberChannels < IDE_DEFAULT_MAX_CHAN) { + KdPrint2((PRINT_PREFIX "set NumberChannels = %d\n", IDE_DEFAULT_MAX_CHAN)); + deviceExtension->NumberChannels = IDE_DEFAULT_MAX_CHAN; if(BaseIoAddressBM_0) { UniataInitMapBM(deviceExtension, BaseIoAddressBM_0, @@ -1289,7 +1303,7 @@ KdPrint2((PRINT_PREFIX "set ConfigInfo->InitiatorBusId[0] = %#x\n", ConfigInfo->InitiatorBusId[0])); } // Indicate four devices can be attached to the adapter - ConfigInfo->MaximumNumberOfTargets = (UCHAR)(/*deviceExtension->NumberChannels **/ 2); + ConfigInfo->MaximumNumberOfTargets = (UCHAR)(deviceExtension->NumberLuns); if (MasterDev) { KdPrint2((PRINT_PREFIX "MasterDev (2)\n")); @@ -1461,6 +1475,15 @@ (*ConfigInfo->AccessRanges)[4].RangeStart = ScsiPortConvertUlongToPhysicalAddress(0); (*ConfigInfo->AccessRanges)[4].RangeLength = 0; } + } else + if(AltInit && + !(*ConfigInfo->AccessRanges)[channel * 2 + 0].RangeStart.QuadPart && + !(*ConfigInfo->AccessRanges)[channel * 2 + 1].RangeStart.QuadPart) { + KdPrint2((PRINT_PREFIX "cheat ScsiPort, sync real PCI and ConfigInfo IO ranges\n")); + AtapiGetIoRange(HwDeviceExtension, ConfigInfo, &pciData, SystemIoBusNumber, + channel * 2 + 0, 0, ATA_IOSIZE); + AtapiGetIoRange(HwDeviceExtension, ConfigInfo, &pciData, SystemIoBusNumber, + channel * 2 + 1, 0, ATA_ALTIOSIZE); } IoBasePort1 = (*ConfigInfo->AccessRanges)[channel * 2 + 0].RangeStart; @@ -1860,7 +1883,8 @@ deviceExtension->SystemIoBusNumber = SystemIoBusNumber; deviceExtension->DevID = dev_id; deviceExtension->RevID = RevID; - deviceExtension->NumberChannels = 2; // default + deviceExtension->NumberChannels = IDE_DEFAULT_MAX_CHAN; // default + deviceExtension->NumberLuns = IDE_MAX_LUN_PER_CHAN; // default deviceExtension->DevIndex = i; _snprintf(deviceExtension->Signature, sizeof(deviceExtension->Signature), @@ -2291,6 +2315,7 @@ KdPrint2((PRINT_PREFIX " assume max PIO4\n")); deviceExtension->MaxTransferMode = ATA_PIO4; deviceExtension->NumberChannels = 1; + deviceExtension->NumberLuns = IDE_MAX_LUN_PER_CHAN; // default if(!UniataAllocateLunExt(deviceExtension, UNIATA_ALLOCATE_NEW_LUNS)) { goto exit_error; @@ -2525,7 +2550,7 @@ } ConfigInfo->NumberOfBuses = 1; - ConfigInfo->MaximumNumberOfTargets = 2; + ConfigInfo->MaximumNumberOfTargets = IDE_MAX_LUN_PER_CHAN; // Indicate maximum transfer length is 64k. ConfigInfo->MaximumTransferLength = 0x10000; @@ -2970,7 +2995,7 @@ // Clear expecting interrupt flag and current SRB field. chan->ExpectingInterrupt = FALSE; // chan->CurrentSrb = NULL; - max_ldev = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2; + max_ldev = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : IDE_MAX_LUN_PER_CHAN; KdPrint2((PRINT_PREFIX " max_ldev %d\n", max_ldev)); // Search for devices. Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -380,32 +380,64 @@ ULONG BaseMemAddress; ULONG PI; ULONG CAP; + ULONG GHC; BOOLEAN MemIo; ULONGLONG base; /* reset AHCI controller */ - AtapiWritePortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC, - AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC) | AHCI_GHC_HR); - AtapiStallExecution(1000000); - if(AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC) & AHCI_GHC_HR) { + GHC = AtapiReadPortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC); + KdPrint2((PRINT_PREFIX " reset AHCI controller, GHC %x\n", GHC)); + AtapiWritePortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC, + GHC | AHCI_GHC_HR); + + for(i=0; i<1000; i++) { + AtapiStallExecution(1000); + GHC = AtapiReadPortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC); + KdPrint2((PRINT_PREFIX " AHCI GHC %x\n", GHC)); + if(!(GHC & AHCI_GHC_HR)) { + break; + } + } + if(GHC & AHCI_GHC_HR) { KdPrint2((PRINT_PREFIX " AHCI reset failed\n")); return FALSE; } /* enable AHCI mode */ - AtapiWritePortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC, - AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC) | AHCI_GHC_AE); + GHC = AtapiReadPortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC); + KdPrint2((PRINT_PREFIX " enable AHCI mode, GHC %x\n", GHC)); + AtapiWritePortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC, + GHC | AHCI_GHC_AE); + GHC = AtapiReadPortEx4(NULL, (ULONG_PTR)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_GHC); + KdPrint2((PRINT_PREFIX " AHCI GHC %x\n", GHC)); + CAP = AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_CAP); PI = AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_PI); + KdPrint2((PRINT_PREFIX " AHCI CAP %x\n", CAP)); + if(CAP & AHCI_CAP_S64A) { + KdPrint2((PRINT_PREFIX " AHCI 64bit\n")); + deviceExtension->Host64 = TRUE; + } /* get the number of HW channels */ + PI = AtapiReadPortEx4(NULL, (ULONG)&deviceExtension->BaseIoAHCI_0, IDX_AHCI_PI); + KdPrint2((PRINT_PREFIX " AHCI PI %x\n", PI)); for(i=PI, n=0; i; n++, i=i>>1); deviceExtension->NumberChannels = max((CAP & AHCI_CAP_NOP_MASK)+1, n); - if(CAP & AHCI_CAP_S64A) { - KdPrint2((PRINT_PREFIX " AHCI 64bit\n")); - deviceExtension->Host64 = TRUE; - } + + switch(deviceExtension->DevID) { + case ATA_M88SX6111: + deviceExtension->NumberChannels = 1; + break; + case ATA_M88SX6121: + deviceExtension->NumberChannels = 2; + break; + case ATA_M88SX6141: + case ATA_M88SX6145: + deviceExtension->NumberChannels = 4; + break; + } // switch() /* clear interrupts */ AtapiWritePortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_IS, @@ -416,10 +448,13 @@ AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_GHC) | AHCI_GHC_IE); version = AtapiReadPortEx4(NULL, (ULONG_PTR)(&deviceExtension->BaseIoAHCI_0), IDX_AHCI_VS); - KdPrint2((PRINT_PREFIX " AHCI version %x%x.%x%x controller with %d ports (mask %x) detected\n", - (version >> 24) & 0xff, (version >> 16) & 0xff, - (version >> 8) & 0xff, version & 0xff, deviceExtension->NumberChannels, PI)); - + KdPrint2((PRINT_PREFIX " AHCI version %x.%02x controller with %d ports (mask %x) detected\n", + ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f), + ((version >> 4) & 0xf0) + (version & 0x0f), + deviceExtension->NumberChannels, PI)); + + KdPrint2((PRINT_PREFIX " PM%s supported\n", + CAP & AHCI_CAP_SPM ? "" : " not")); deviceExtension->HwFlags |= UNIATA_SATA; deviceExtension->HwFlags |= UNIATA_AHCI; Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -43,9 +43,9 @@ #endif //__cplusplus #define AHCI_MAX_PORT 32 -#define IDE_MAX_CHAN 8 +#define IDE_MAX_CHAN 16 // Thanks to SATA Port Multipliers: -#define IDE_MAX_LUN_PER_CHAN 16 +#define IDE_MAX_LUN_PER_CHAN 2 #define IDE_MAX_LUN (AHCI_MAX_PORT*IDE_MAX_LUN_PER_CHAN) #define MAX_QUEUE_STAT 8 Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Sun Mar 6 16:32:36 2011 @@ -1,6 +1,6 @@ -#define UNIATA_VER_STR "40a1" -#define UNIATA_VER_DOT 0.40.1.1 -#define UNIATA_VER_DOT_COMMA 0,40,1,1 -#define UNIATA_VER_DOT_STR "0.40.1.1" +#define UNIATA_VER_STR "40a5" +#define UNIATA_VER_DOT 0.40.1.5 +#define UNIATA_VER_DOT_COMMA 0,40,1,5 +#define UNIATA_VER_DOT_STR "0.40.1.5" #define UNIATA_VER_YEAR 2010 #define UNIATA_VER_YEAR_STR "2010"

1 0

[ekohl] 50984: Fix PNP_QueryArbitratorFreeData() and PNP_QueryArbitratorFreeSize() prototypes.
by ekohl＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: ekohl Date: Sun Mar 6 14:15:41 2011 New Revision: 50984 URL: http://svn.reactos.org/svn/reactos?rev=50984&view=rev Log: Fix PNP_QueryArbitratorFreeData() and PNP_QueryArbitratorFreeSize() prototypes. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Mar 6 14:15:41 2011 @@ -1855,7 +1855,12 @@ /* Function 56 */ DWORD PNP_QueryArbitratorFreeData( - handle_t hBinding) + handle_t hBinding, + BYTE *pData, + DWORD DataLen, + LPWSTR pDeviceID, + RESOURCEID ResourceID, + DWORD ulFlags) { UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; @@ -1864,7 +1869,11 @@ /* Function 57 */ DWORD PNP_QueryArbitratorFreeSize( - handle_t hBinding) + handle_t hBinding, + DWORD *pulSize, + LPWSTR pDeviceID, + RESOURCEID ResourceID, + DWORD ulFlags) { UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun Mar 6 14:15:41 2011 @@ -731,11 +731,20 @@ /* Function 56 */ DWORD PNP_QueryArbitratorFreeData( - [in] handle_t hBinding); + [in] handle_t hBinding, + [out,size_is(DataLen)] BYTE *pData, + [in] DWORD DataLen, + [in, string, ref] LPWSTR pDeviceID, + [in] RESOURCEID ResourceID, + [in] DWORD ulFlags); /* Function 57 */ DWORD PNP_QueryArbitratorFreeSize( - [in] handle_t hBinding); + [in] handle_t hBinding, + [out] DWORD *pulSize, + [in, string, ref] LPWSTR pDeviceID, + [in] RESOURCEID ResourceID, + [in] DWORD ulFlags); /* Function 58 */ DWORD PNP_RunDetection(

1 0

[pschweitzer] 50983: [KERNEL32] Fixed implementation of both GetFileTime/SetFileTime
by pschweitzer＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: pschweitzer Date: Sun Mar 6 13:28:11 2011 New Revision: 50983 URL: http://svn.reactos.org/svn/reactos?rev=50983&view=rev Log: [KERNEL32] Fixed implementation of both GetFileTime/SetFileTime Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sun Mar 6 13:28:11 2011 @@ -1421,40 +1421,51 @@ * @implemented */ BOOL WINAPI -GetFileTime(HANDLE hFile, - LPFILETIME lpCreationTime, - LPFILETIME lpLastAccessTime, - LPFILETIME lpLastWriteTime) -{ - IO_STATUS_BLOCK IoStatusBlock; - FILE_BASIC_INFORMATION FileBasic; - NTSTATUS Status; - - if(IsConsoleHandle(hFile)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = NtQueryInformationFile(hFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - if (lpCreationTime) - memcpy(lpCreationTime, &FileBasic.CreationTime, sizeof(FILETIME)); - if (lpLastAccessTime) - memcpy(lpLastAccessTime, &FileBasic.LastAccessTime, sizeof(FILETIME)); - if (lpLastWriteTime) - memcpy(lpLastWriteTime, &FileBasic.LastWriteTime, sizeof(FILETIME)); - - return TRUE; +GetFileTime(IN HANDLE hFile, + OUT LPFILETIME lpCreationTime OPTIONAL, + OUT LPFILETIME lpLastAccessTime OPTIONAL, + OUT LPFILETIME lpLastWriteTime OPTIONAL) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileBasic; + + if(IsConsoleHandle(hFile)) + { + BaseSetLastNTError(STATUS_INVALID_HANDLE); + return FALSE; + } + + Status = NtQueryInformationFile(hFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + if (lpCreationTime) + { + lpCreationTime->dwLowDateTime = FileBasic.CreationTime.LowPart; + lpCreationTime->dwHighDateTime = FileBasic.CreationTime.HighPart; + } + + if (lpLastAccessTime) + { + lpLastAccessTime->dwLowDateTime = FileBasic.LastAccessTime.LowPart; + lpLastAccessTime->dwHighDateTime = FileBasic.LastAccessTime.HighPart; + } + + if (lpLastWriteTime) + { + lpLastWriteTime->dwLowDateTime = FileBasic.LastWriteTime.LowPart; + lpLastWriteTime->dwHighDateTime = FileBasic.LastWriteTime.HighPart; + } + + return TRUE; } @@ -1462,53 +1473,53 @@ * @implemented */ BOOL WINAPI -SetFileTime(HANDLE hFile, - CONST FILETIME *lpCreationTime, - CONST FILETIME *lpLastAccessTime, - CONST FILETIME *lpLastWriteTime) -{ - FILE_BASIC_INFORMATION FileBasic; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - if(IsConsoleHandle(hFile)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - Status = NtQueryInformationFile(hFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - if (lpCreationTime) - memcpy(&FileBasic.CreationTime, lpCreationTime, sizeof(FILETIME)); - if (lpLastAccessTime) - memcpy(&FileBasic.LastAccessTime, lpLastAccessTime, sizeof(FILETIME)); - if (lpLastWriteTime) - memcpy(&FileBasic.LastWriteTime, lpLastWriteTime, sizeof(FILETIME)); - - // should i initialize changetime ??? - - Status = NtSetInformationFile(hFile, - &IoStatusBlock, - &FileBasic, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; +SetFileTime(IN HANDLE hFile, + CONST FILETIME *lpCreationTime OPTIONAL, + CONST FILETIME *lpLastAccessTime OPTIONAL, + CONST FILETIME *lpLastWriteTime OPTIONAL) +{ + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + FILE_BASIC_INFORMATION FileBasic; + + if(IsConsoleHandle(hFile)) + { + BaseSetLastNTError(STATUS_INVALID_HANDLE); + return FALSE; + } + + memset(&FileBasic, 0, sizeof(FILE_BASIC_INFORMATION)); + + if (lpCreationTime) + { + FileBasic.CreationTime.LowPart = lpCreationTime->dwLowDateTime; + FileBasic.CreationTime.HighPart = lpCreationTime->dwHighDateTime; + } + + if (lpLastAccessTime) + { + FileBasic.LastAccessTime.LowPart = lpLastAccessTime->dwLowDateTime; + FileBasic.LastAccessTime.HighPart = lpLastAccessTime->dwHighDateTime; + } + + if (lpLastWriteTime) + { + FileBasic.LastWriteTime.LowPart = lpLastWriteTime->dwLowDateTime; + FileBasic.LastWriteTime.HighPart = lpLastWriteTime->dwHighDateTime; + } + + Status = NtSetInformationFile(hFile, + &IoStatusBlock, + &FileBasic, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; }

1 0

[fireball] 50982: - Fix a typo, thanks Herve!
by fireball＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: fireball Date: Sun Mar 6 11:16:22 2011 New Revision: 50982 URL: http://svn.reactos.org/svn/reactos?rev=50982&view=rev Log: - Fix a typo, thanks Herve! Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Mar 6 11:16:22 2011 @@ -38,7 +38,7 @@ } /* Check for a shortcut: just one wildcard */ - if (Expression->Length == 2) + if (Expression->Length == sizeof(WCHAR)) { if (Expression->Buffer[0] == L'*') return TRUE;

1 0

[fireball] 50981: [NTOS/FSRTL] - Implement parameters checking in FsRtlIsNameInExpressionPrivate. - Add two shortcuts for common wildcard invocations to make the function faster. - Second (main par...
by fireball＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: fireball Date: Sun Mar 6 11:00:17 2011 New Revision: 50981 URL: http://svn.reactos.org/svn/reactos?rev=50981&view=rev Log: [NTOS/FSRTL] - Implement parameters checking in FsRtlIsNameInExpressionPrivate. - Add two shortcuts for common wildcard invocations to make the function faster. - Second (main part of the function) is still under review. Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Mar 6 11:00:17 2011 @@ -5,7 +5,8 @@ * PURPOSE: Provides name parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) - * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) + * Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -23,9 +24,78 @@ IN PWCHAR UpcaseTable OPTIONAL) { USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; + UNICODE_STRING IntExpression; PAGED_CODE(); + /* Check if we were given strings at all */ + if (!Name->Length || !Expression->Length) + { + /* Return TRUE if both strings are empty, otherwise FALSE */ + if (Name->Length == 0 && Expression->Length == 0) + return TRUE; + else + return FALSE; + } + + /* Check for a shortcut: just one wildcard */ + if (Expression->Length == 2) + { + if (Expression->Buffer[0] == L'*') + return TRUE; + } + ASSERT(!IgnoreCase || UpcaseTable); + + /* Another shortcut, wildcard followed by some string */ + if (Expression->Buffer[0] == L'*') + { + /* Copy Expression to our local variable */ + IntExpression = *Expression; + + /* Skip the first char */ + IntExpression.Buffer++; + IntExpression.Length -= sizeof(WCHAR); + + /* Continue only if the rest of the expression does NOT contain + any more wildcards */ + if (!FsRtlDoesNameContainWildCards(&IntExpression)) + { + /* Check for a degenerate case */ + if (Name->Length < (Expression->Length - sizeof(WCHAR))) + return FALSE; + + /* Calculate position */ + NamePosition = (Name->Length - IntExpression.Length) / sizeof(WCHAR); + + /* Compare */ + if (!IgnoreCase) + { + /* We can just do a byte compare */ + return RtlEqualMemory(IntExpression.Buffer, + Name->Buffer + NamePosition, + IntExpression.Length); + } + else + { + /* Not so easy, need to upcase and check char by char */ + for (ExpressionPosition = 0; ExpressionPosition < (IntExpression.Length / sizeof(WCHAR)); ExpressionPosition++) + { + /* Assert that expression is already upcased! */ + ASSERT(IntExpression.Buffer[ExpressionPosition] == UpcaseTable[IntExpression.Buffer[ExpressionPosition]]); + + /* Now compare upcased name char with expression */ + if (UpcaseTable[Name->Buffer[NamePosition + ExpressionPosition]] != + UpcaseTable[IntExpression.Buffer[ExpressionPosition]]) + { + return FALSE; + } + } + + /* It matches */ + return TRUE; + } + } + } while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) { @@ -385,7 +455,7 @@ if (IgnoreCase && !UpcaseTable) { Status = RtlUpcaseUnicodeString(&IntName, Name, TRUE); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) { ExRaiseStatus(Status); }

1 0

[pschweitzer] 50980: [KERNEL32] FlushFileBuffers: - In spite of what MSDN pretends, it appears that FlushFileBuffers flushes console input buffer when it's called with a console handle. Then, do it...
by pschweitzer＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: pschweitzer Date: Sun Mar 6 10:28:50 2011 New Revision: 50980 URL: http://svn.reactos.org/svn/reactos?rev=50980&view=rev Log: [KERNEL32] FlushFileBuffers: - In spite of what MSDN pretends, it appears that FlushFileBuffers flushes console input buffer when it's called with a console handle. Then, do it here as well. - Get rid of SetLastErrorByStatus here... Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sun Mar 6 10:28:50 2011 @@ -406,26 +406,26 @@ * @implemented */ BOOL WINAPI -FlushFileBuffers(HANDLE hFile) -{ - NTSTATUS errCode; +FlushFileBuffers(IN HANDLE hFile) +{ + NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; hFile = TranslateStdHandle(hFile); if (IsConsoleHandle(hFile)) { + return FlushConsoleInputBuffer(hFile); + } + + Status = NtFlushBuffersFile(hFile, + &IoStatusBlock); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); return FALSE; } - - errCode = NtFlushBuffersFile(hFile, - &IoStatusBlock); - if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus(errCode); - return(FALSE); - } - return(TRUE); + return TRUE; }

1 0

[pschweitzer] 50979: [KERNEL32] Apply consistent formatting to FlushFileBuffers. No code changes yet
by pschweitzer＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: pschweitzer Date: Sun Mar 6 10:20:32 2011 New Revision: 50979 URL: http://svn.reactos.org/svn/reactos?rev=50979&view=rev Log: [KERNEL32] Apply consistent formatting to FlushFileBuffers. No code changes yet Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sun Mar 6 10:20:32 2011 @@ -408,24 +408,24 @@ BOOL WINAPI FlushFileBuffers(HANDLE hFile) { - NTSTATUS errCode; - IO_STATUS_BLOCK IoStatusBlock; - - hFile = TranslateStdHandle(hFile); - - if (IsConsoleHandle(hFile)) - { - return FALSE; - } - - errCode = NtFlushBuffersFile(hFile, - &IoStatusBlock); - if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus(errCode); - return(FALSE); - } - return(TRUE); + NTSTATUS errCode; + IO_STATUS_BLOCK IoStatusBlock; + + hFile = TranslateStdHandle(hFile); + + if (IsConsoleHandle(hFile)) + { + return FALSE; + } + + errCode = NtFlushBuffersFile(hFile, + &IoStatusBlock); + if (!NT_SUCCESS(errCode)) + { + SetLastErrorByStatus(errCode); + return(FALSE); + } + return(TRUE); }

1 0

[rmessiant] 50978: [HEAP] - RtlpInsertUnCommittedPages: Don't rely on linked list data in an UCR Descriptor after destroying it. No functionality change because the linked list data was still "as e...
by rmessiant＠svn.reactos.org 06 Mar '11

06 Mar '11

Author: rmessiant Date: Sun Mar 6 00:37:10 2011 New Revision: 50978 URL: http://svn.reactos.org/svn/reactos?rev=50978&view=rev Log: [HEAP] - RtlpInsertUnCommittedPages: Don't rely on linked list data in an UCR Descriptor after destroying it. No functionality change because the linked list data was still "as expected", but not something we want to rely on. - RtlpCreateUnCommittedRange: Fix a typo that caused the head of UCR Segment list of the Heap to be treated as an UCR Segment header. Side effects of the typo: When this list wasn't empty, the (fake) UCR Segment it described was grown to contain more UCR descriptors. Due to the data involved, this always happened to be the initial Heap Segment, which contains the Heap Header. Writing the new UCR descriptors caused the Heap Header and trailing Heap Entries to be partially corrupted. Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50978&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sun Mar 6 00:37:10 2011 @@ -414,7 +414,7 @@ if (IsListEmpty(&Heap->UCRList)) { /* Get a pointer to the first UCR segment */ - UcrSegment = CONTAINING_RECORD(&Heap->UCRSegments.Flink, HEAP_UCR_SEGMENT, ListEntry); + UcrSegment = CONTAINING_RECORD(Heap->UCRSegments.Flink, HEAP_UCR_SEGMENT, ListEntry); /* Check the list of UCR segments */ if (IsListEmpty(&Heap->UCRSegments) || @@ -539,8 +539,11 @@ Address = (ULONG_PTR)UcrDescriptor->Address; Size += UcrDescriptor->Size; - /* Remove it from the list and destroy it */ - RemoveEntryList(Current); + /* Advance to the next descriptor */ + Current = Current->Flink; + + /* Remove the current descriptor from the list and destroy it */ + RemoveEntryList(&UcrDescriptor->SegmentEntry); RtlpDestroyUnCommittedRange(Segment, UcrDescriptor); Segment->NumberOfUnCommittedRanges--;

1 0

[ekohl] 50977: [SERVICES] - Use one instead of two critical sections to synchronize service start and control actions. - Fail, if an already running service is started again.
by ekohl＠svn.reactos.org 05 Mar '11

05 Mar '11

Author: ekohl Date: Sat Mar 5 18:37:39 2011 New Revision: 50977 URL: http://svn.reactos.org/svn/reactos?rev=50977&view=rev Log: [SERVICES] - Use one instead of two critical sections to synchronize service start and control actions. - Fail, if an already running service is started again. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Mar 5 18:37:39 2011 @@ -30,8 +30,7 @@ static RTL_RESOURCE DatabaseLock; static DWORD dwResumeCount = 1; -static CRITICAL_SECTION NamedPipeCriticalSection; -static CRITICAL_SECTION StartServiceCriticalSection; +static CRITICAL_SECTION ControlServiceCriticalSection; /* FUNCTIONS *****************************************************************/ @@ -693,6 +692,8 @@ DPRINT("ScmControlService() called\n"); + EnterCriticalSection(&ControlServiceCriticalSection); + TotalLength = wcslen(Service->lpServiceName) + 1; ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), @@ -705,8 +706,6 @@ ControlPacket->dwSize = TotalLength; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); - - EnterCriticalSection(&NamedPipeCriticalSection); /* Send the control packet */ WriteFile(Service->ControlPipeHandle, @@ -722,8 +721,6 @@ &dwReadCount, NULL); - LeaveCriticalSection(&NamedPipeCriticalSection); - /* Release the contol packet */ HeapFree(GetProcessHeap(), 0, @@ -733,6 +730,8 @@ { dwError = ReplyPacket.dwError; } + + LeaveCriticalSection(&ControlServiceCriticalSection); DPRINT("ScmControlService() done\n"); @@ -801,8 +800,6 @@ /* Terminate the argument list */ *Ptr = 0; - EnterCriticalSection(&NamedPipeCriticalSection); - /* Send the start command */ WriteFile(Service->ControlPipeHandle, ControlPacket, @@ -816,8 +813,6 @@ sizeof(SCM_REPLY_PACKET), &dwReadCount, NULL); - - LeaveCriticalSection(&NamedPipeCriticalSection); /* Release the contol packet */ HeapFree(GetProcessHeap(), @@ -924,6 +919,9 @@ /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent); + + DPRINT1("Service: %p ImagePath: %wZ PipeName: %S\n", Service, &ImagePath, NtControlPipeName); + Service->ControlPipeHandle = CreateNamedPipeW(NtControlPipeName, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, @@ -1036,9 +1034,18 @@ PSERVICE_GROUP Group = Service->lpGroup; DWORD dwError = ERROR_SUCCESS; - EnterCriticalSection(&StartServiceCriticalSection); - DPRINT("ScmStartService() called\n"); + + DPRINT1("Start Service %p (%S)\n", Service, Service->lpServiceName); + + EnterCriticalSection(&ControlServiceCriticalSection); + + if (Service->Status.dwCurrentState != SERVICE_STOPPED) + { + DPRINT1("Service %S is already running!\n", Service->lpServiceName); + LeaveCriticalSection(&ControlServiceCriticalSection); + return ERROR_SERVICE_ALREADY_RUNNING; + } Service->ControlPipeHandle = INVALID_HANDLE_VALUE; DPRINT("Service->Type: %lu\n", Service->Status.dwServiceType); @@ -1067,8 +1074,9 @@ } } + LeaveCriticalSection(&ControlServiceCriticalSection); + DPRINT("ScmStartService() done (Error %lu)\n", dwError); - LeaveCriticalSection(&StartServiceCriticalSection); if (dwError == ERROR_SUCCESS) { @@ -1274,16 +1282,14 @@ VOID ScmInitNamedPipeCriticalSection(VOID) { - InitializeCriticalSection(&NamedPipeCriticalSection); - InitializeCriticalSection(&StartServiceCriticalSection); + InitializeCriticalSection(&ControlServiceCriticalSection); } VOID ScmDeleteNamedPipeCriticalSection(VOID) { - DeleteCriticalSection(&StartServiceCriticalSection); - DeleteCriticalSection(&NamedPipeCriticalSection); + DeleteCriticalSection(&ControlServiceCriticalSection); } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs