Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[fireball] 56870: [UNIATA] - Update Uniata to 41b5. Thanks to Alter for the great driver and Olaf Siejka for preparing the patch, getting our changes upstream and testing the updated version. See i...
by fireball＠svn.reactos.org 11 Jul '12

11 Jul '12

Author: fireball Date: Wed Jul 11 23:34:55 2012 New Revision: 56870 URL: http://svn.reactos.org/svn/reactos?rev=56870&view=rev Log: [UNIATA] - Update Uniata to 41b5. Thanks to Alter for the great driver and Olaf Siejka for preparing the patch, getting our changes upstream and testing the updated version. See issue #7148 for more details. Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.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/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] Wed Jul 11 23:34:55 2012 @@ -273,8 +273,29 @@ #define ATA_CPT_S3 0x1c088086 #define ATA_CPT_S4 0x1c098086 +#define ATA_PBG_S1 0x1d008086 +#define ATA_PBG_AH1 0x1d028086 +#define ATA_PBG_R1 0x1d048086 +#define ATA_PBG_R2 0x1d068086 +#define ATA_PBG_R3 0x28268086 +#define ATA_PBG_S2 0x1d088086 + +#define ATA_PPT_S1 0x1e008086 +#define ATA_PPT_S2 0x1e018086 +#define ATA_PPT_AH1 0x1e028086 +#define ATA_PPT_AH2 0x1e038086 +#define ATA_PPT_R1 0x1e048086 +#define ATA_PPT_R2 0x1e058086 +#define ATA_PPT_R3 0x1e068086 +#define ATA_PPT_R4 0x1e078086 +#define ATA_PPT_S3 0x1e088086 +#define ATA_PPT_S4 0x1e098086 +#define ATA_PPT_R5 0x1e0e8086 +#define ATA_PPT_R6 0x1e0f8086 + #define ATA_I31244 0x32008086 #define ATA_ISCH 0x811a8086 +#define ATA_DH89XXCC 0x23238086 #define ATA_JMICRON_ID 0x197b #define ATA_JMB360 0x2360197b @@ -708,9 +729,9 @@ PCI_DEV_HW_SPEC_BM( 4349, 1002, 0x00, ATA_UDMA5, "ATI IXP200" , 0 ), PCI_DEV_HW_SPEC_BM( 4369, 1002, 0x00, ATA_UDMA6, "ATI IXP300" , 0 ), PCI_DEV_HW_SPEC_BM( 4376, 1002, 0x00, ATA_UDMA6, "ATI IXP400" , 0 ), - PCI_DEV_HW_SPEC_BM( 436e, 1002, 0x00, ATA_SA150, "ATI IXP300" , SIIMIO | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 4379, 1002, 0x00, ATA_SA150, "ATI IXP400" , SIIMIO | SIINOSATAIRQ | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 437a, 1002, 0x00, ATA_SA300, "ATI IXP400" , SIIMIO | SIINOSATAIRQ | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 436e, 1002, 0x00, ATA_SA150, "ATI IXP300" , SIIMIO | SIIBUG | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 4379, 1002, 0x00, ATA_SA150, "ATI IXP400" , SIIMIO | SIIBUG | SIINOSATAIRQ | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 437a, 1002, 0x00, ATA_SA300, "ATI IXP400" , SIIMIO | SIIBUG | SIINOSATAIRQ | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 438c, 1002, 0x00, ATA_UDMA6, "ATI IXP600" , 0 ), PCI_DEV_HW_SPEC_BM( 4380, 1002, 0x00, ATA_SA150, "ATI IXP600" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 439c, 1002, 0x00, ATA_UDMA6, "ATI IXP700" , 0 ), @@ -784,11 +805,17 @@ PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH2 | UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH9" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ),/* ??? */ PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2925, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2928, 8086, 0x00, ATA_SA300, "Intel ICH9M" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 2929, 8086, 0x00, ATA_SA300, "Intel ICH9M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 292a, 8086, 0x00, ATA_SA300, "Intel ICH9M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 292d, 8086, 0x00, ATA_SA300, "Intel ICH9M" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 3a20, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a26, 8086, 0x00, ATA_SA300, "Intel ICH10" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 3a22, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), @@ -826,9 +853,29 @@ PCI_DEV_HW_SPEC_BM( 1c08, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH2 | UNIATA_SATA ), PCI_DEV_HW_SPEC_BM( 1c09, 8086, 0x00, ATA_SA300, "Intel Cougar Point" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1d00, 8086, 0x00, ATA_SA300, "Intel Patsburg" , I6CH | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1d02, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1d04, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1d06, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2826, 8086, 0x00, ATA_SA300, "Intel Patsburg" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1d08, 8086, 0x00, ATA_SA300, "Intel Patsburg" , I6CH2 | UNIATA_SATA ), + + PCI_DEV_HW_SPEC_BM( 1e00, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1e01, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1e02, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e03, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e04, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e05, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e06, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e07, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e08, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1e09, 8086, 0x00, ATA_SA300, "Intel Panther Point" , I6CH2 | UNIATA_SATA ), + PCI_DEV_HW_SPEC_BM( 1e0e, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 1e0f, 8086, 0x00, ATA_SA300, "Intel Panther Point" , UNIATA_SATA | UNIATA_AHCI ), + // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), - PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_UDMA5, "Intel SCH" , I1CH ), - + PCI_DEV_HW_SPEC_BM( 811a, 8086, 0x00, ATA_UDMA5, "Intel SCH" , I1CH ), + PCI_DEV_HW_SPEC_BM( 2323, 8086, 0x00, ATA_SA300, "Intel DH98xxCC" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2360, 197b, 0x00, ATA_SA300, "JMB360" , UNIATA_SATA | UNIATA_AHCI ), 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] Wed Jul 11 23:34:55 2012 @@ -2094,6 +2094,7 @@ switch(VendorID) { case ATA_INTEL_ID: { ULONG mask; + ULONG pshift; ULONG timeout; if(!(ChipFlags & UNIATA_SATA)) goto default_reset; @@ -2117,7 +2118,7 @@ #else mask = 1 << chan->lun[0]->SATA_lun_map; if (MaxLuns > 1) { - mask |= (1 << chan->lun[1]->SATA_lun_map); + mask |= (1 << chan->lun[1]->SATA_lun_map); } #endif ChangePciConfig2(0x92, a & ~mask); @@ -2126,18 +2127,20 @@ timeout = 100; /* Wait up to 1 sec for "connect well". */ - if (ChipFlags & (I6CH | I6CH2)) - mask = mask << 8; - else - mask = mask << 4; - + if (ChipFlags & (I6CH | I6CH2)) { + pshift = 8; + } else { + pshift = 4; + } while (timeout--) { + GetPciConfig2(0x92, tmp16); + if (((tmp16 >> pshift) & mask) == mask) { + GetBaseStatus(chan, statusByte); + if(statusByte != 0xff) { + break; + } + } AtapiStallExecution(10000); - GetPciConfig2(0x92, tmp16); - if ((tmp16 & mask) == mask) { - AtapiStallExecution(10000); - break; - } } break; } case ATA_SIS_ID: @@ -3729,7 +3732,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan = &(deviceExtension->chan[c]); - PHW_LU_EXTENSION LunExt; + PHW_LU_EXTENSION LunExt = chan->lun[chan->cur_cdev]; ULONG VendorID = deviceExtension->DevID & 0xffff; ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; @@ -3986,6 +3989,11 @@ if(statusByte & IDE_STATUS_ERROR) { KdPrint2((PRINT_PREFIX " IDE_STATUS_ERROR -> our\n", statusByte)); OurInterrupt = INTERRUPT_REASON_UNEXPECTED; + } else + if ((statusByte & IDE_STATUS_DSC) && + (LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) && + (dma_status == BM_STATUS_ACTIVE)) { + KdPrint2((PRINT_PREFIX " special case DMA + ATAPI + IDE_STATUS_DSC -> our\n", statusByte)); } else { return INTERRUPT_REASON_IGNORE; } @@ -4005,7 +4013,6 @@ AtapiStallExecution(1); } - LunExt = chan->lun[chan->cur_cdev]; /* if drive is busy it didn't interrupt */ /* the exception is DCS + BSY state of ATAPI devices */ KdPrint2((PRINT_PREFIX " getting status...\n")); @@ -8858,16 +8865,17 @@ } continue; } + //BMList[i].AltInitMasterDev = (UCHAR)0xff; + if(GlobalConfig->AtDiskPrimaryAddressClaimed) PrimaryClaimed = TRUE; if(GlobalConfig->AtDiskSecondaryAddressClaimed) SecondaryClaimed = TRUE; - BMList[i].AltInitMasterDev = (UCHAR)0xff; - if(g_opt_Verbose) { _PrintNtConsole("Init standard Dual-channel PCI ATA controller:"); } + for(alt = 0; alt < (ULONG)(WinVer_WDM_Model ? 1 : 2) ; alt++) { 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] Wed Jul 11 23:34:55 2012 @@ -132,6 +132,9 @@ case ATA_SILICON_IMAGE_ID: if(ChipFlags & SIIBUG) { + /* work around errata in early chips */ + ConfigInfo->AlignmentMask = 0x1fff; + deviceExtension->MaximumDmaTransferLength = 15 * DEV_BSIZE; } if(ChipType != SIIMIO) { break; @@ -177,7 +180,8 @@ break; case ATA_INTEL_ID: /* New Intel PATA controllers */ - if(/*deviceExtension->DevID == 0x27df8086 || + if(g_opt_VirtualMachine != VM_VBOX && + /*deviceExtension->DevID == 0x27df8086 || deviceExtension->DevID == 0x269e8086 || deviceExtension->DevID == ATA_I82801HBM*/ ChipFlags & I1CH) { @@ -855,32 +859,6 @@ ULONG IoSize = 0; ULONG BaseMemAddress = 0; - /* - * vt6420/1 has problems talking to some drives. The following - * is based on the fix from Joseph Chan <JosephChan(a)via.com.tw>. - * - * When host issues HOLD, device may send up to 20DW of data - * before acknowledging it with HOLDA and the host should be - * able to buffer them in FIFO. Unfortunately, some WD drives - * send upto 40DW before acknowledging HOLD and, in the - * default configuration, this ends up overflowing vt6421's - * FIFO, making the controller abort the transaction with - * R_ERR. - * - * Rx52[2] is the internal 128DW FIFO Flow control watermark - * adjusting mechanism enable bit and the default value 0 - * means host will issue HOLD to device when the left FIFO - * size goes below 32DW. Setting it to 1 makes the watermark - * 64DW. - * - * http://www.reactos.org/bugzilla/show_bug.cgi?id=6500 - */ - - if(DeviceID == 0x3149 || DeviceID == 0x3249) { //vt6420 or vt6421 - KdPrint2((PRINT_PREFIX "VIA 642x FIFO\n")); - ChangePciConfig1(0x52, a | (1 << 2)); - } - switch(DeviceID) { case 0x3149: // VIA 6420 KdPrint2((PRINT_PREFIX "VIA 6420\n")); @@ -1040,11 +1018,18 @@ deviceExtension->HwFlags &= ~UNIATA_AHCI; /* if BAR(5) is IO it should point to SATA interface registers */ - BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, + if(deviceExtension->DevID == 0x28288086 && + pciData->u.type0.SubVendorID == 0x106b) { + BaseMemAddress = 0; + KdPrint2((PRINT_PREFIX "Ignore BAR5 on ICH8M Apples\n")); + } else { + /* Skip BAR(5) on ICH8M Apples, system locks up on access. */ + BaseMemAddress = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 5, 0, 0x10); - if(BaseMemAddress && (*ConfigInfo->AccessRanges)[5].RangeInMemory) { - KdPrint2((PRINT_PREFIX "MemIo\n")); - MemIo = TRUE; + if(BaseMemAddress && (*ConfigInfo->AccessRanges)[5].RangeInMemory) { + KdPrint2((PRINT_PREFIX "MemIo\n")); + MemIo = TRUE; + } } deviceExtension->BaseIoAddressSATA_0.Addr = BaseMemAddress; deviceExtension->BaseIoAddressSATA_0.MemIo = MemIo; @@ -1589,9 +1574,7 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; -#ifdef _DEBUG ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; -#endif ULONG RevID = deviceExtension->RevID; // ULONG i; // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; @@ -1796,7 +1779,7 @@ if(ChipFlags & I6CH2) { KdPrint2((PRINT_PREFIX "I6CH2\n")); chan->ChannelCtrlFlags |= CTRFLAGS_NO_SLAVE; - chan->lun[0]->SATA_lun_map = c ? 4 : 5; + chan->lun[0]->SATA_lun_map = c ? 0 : 1; chan->lun[1]->SATA_lun_map = 0; } else { KdPrint2((PRINT_PREFIX "other Intel\n")); @@ -2158,6 +2141,33 @@ if(ChipFlags & (UNIATA_SATA | VIASATA)) { /* enable PCI interrupt */ ChangePciConfig2(/*PCIR_COMMAND*/0x04, (a & ~0x0400)); + + /* + * vt6420/1 has problems talking to some drives. The following + * is based on the fix from Joseph Chan <JosephChan(a)via.com.tw>. + * + * When host issues HOLD, device may send up to 20DW of data + * before acknowledging it with HOLDA and the host should be + * able to buffer them in FIFO. Unfortunately, some WD drives + * send upto 40DW before acknowledging HOLD and, in the + * default configuration, this ends up overflowing vt6421's + * FIFO, making the controller abort the transaction with + * R_ERR. + * + * Rx52[2] is the internal 128DW FIFO Flow control watermark + * adjusting mechanism enable bit and the default value 0 + * means host will issue HOLD to device when the left FIFO + * size goes below 32DW. Setting it to 1 makes the watermark + * 64DW. + * + * http://www.reactos.org/bugzilla/show_bug.cgi?id=6500 + */ + + if(DeviceID == 0x3149 || DeviceID == 0x3249) { //vt6420 or vt6421 + KdPrint2((PRINT_PREFIX "VIA 642x FIFO\n")); + ChangePciConfig1(0x52, a | (1 << 2)); + } + break; } 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] Wed Jul 11 23:34:55 2012 @@ -2364,6 +2364,7 @@ } chan = &(deviceExtension->chan[0]); + AtapiSetupLunPtrs(chan, deviceExtension, 0); deviceExtension->AdapterInterfaceType = deviceExtension->OrigAdapterInterfaceType @@ -2422,7 +2423,7 @@ portBase = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"PortBase", portBase); irq = AtapiRegCheckDevValue(deviceExtension, CHAN_NOT_SPECIFIED, DEVNUM_NOT_SPECIFIED, L"Irq", irq); - for (i = 0; i < 4; i++) { + for (i = 0; i < deviceExtension->NumberLuns; i++) { // Zero device fields to ensure that if earlier devices were found, // but not claimed, the fields are cleared. deviceExtension->lun[i].DeviceFlags &= ~(DFLAGS_ATAPI_DEVICE | DFLAGS_DEVICE_PRESENT | DFLAGS_TAPE_DEVICE); @@ -2850,6 +2851,7 @@ AtapiSoftReset(chan, deviceNumber); if(!UniataAnybodyHome(HwDeviceExtension, lChannel, deviceNumber)) { + //KdPrint2((PRINT_PREFIX "CheckDevice: nobody at home 1\n")); return 0; } statusByte = WaitOnBusy(chan); @@ -2905,6 +2907,7 @@ SelectDrive(chan, deviceNumber); if(!UniataAnybodyHome(HwDeviceExtension, lChannel, deviceNumber)) { + //KdPrint2((PRINT_PREFIX "CheckDevice: nobody at home 2\n")); return 0; } 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] Wed Jul 11 23:34:55 2012 @@ -1045,8 +1045,14 @@ UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_IS, IS.Reg); if (timeout && (i >= timeout)) { + ULONG TFD; + SError = AtapiReadPort4(chan, IDX_SATA_SError); KdPrint((" AHCI: timeout, SError %#x\n", SError)); + + TFD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_TFD); + KdPrint2((" TFD %#x\n", TFD)); + return 0xff; } 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] Wed Jul 11 23:34:55 2012 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "41b2" -#define UNIATA_VER_DOT 0.41.2.2 +#define UNIATA_VER_STR "41b5" +#define UNIATA_VER_DOT 0.41.2.5 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 41 #define UNIATA_VER_SUB_MJ 2 -#define UNIATA_VER_SUB_MN 2 -#define UNIATA_VER_DOT_COMMA 0,41,2,2 -#define UNIATA_VER_DOT_STR "0.41.2.2" -#define UNIATA_VER_YEAR 2011 -#define UNIATA_VER_YEAR_STR "2011" +#define UNIATA_VER_SUB_MN 5 +#define UNIATA_VER_DOT_COMMA 0,41,2,5 +#define UNIATA_VER_DOT_STR "0.41.2.5" +#define UNIATA_VER_YEAR 2012 +#define UNIATA_VER_YEAR_STR "2012"

1 0

[tfaber] 56869: [REGEDIT] - Implement Import/Export of hive files. Patch by Hermes Belusca (German translation by me) See issue #7180 for more details.
by tfaber＠svn.reactos.org 11 Jul '12

11 Jul '12

Author: tfaber Date: Wed Jul 11 23:04:41 2012 New Revision: 56869 URL: http://svn.reactos.org/svn/reactos?rev=56869&view=rev Log: [REGEDIT] - Implement Import/Export of hive files. Patch by Hermes Belusca (German translation by me) See issue #7180 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/regedit/resource.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -260,7 +260,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn) { - FILTERPAIR FilterPairs[3]; + FILTERPAIR FilterPairs[4]; static TCHAR Filter[1024]; memset(pofn, 0, sizeof(OPENFILENAME)); @@ -271,10 +271,12 @@ /* create filter string */ FilterPairs[0].DisplayID = IDS_FLT_REGFILES; FilterPairs[0].FilterID = IDS_FLT_REGFILES_FLT; - FilterPairs[1].DisplayID = IDS_FLT_REGEDIT4; - FilterPairs[1].FilterID = IDS_FLT_REGEDIT4_FLT; - FilterPairs[2].DisplayID = IDS_FLT_ALLFILES; - FilterPairs[2].FilterID = IDS_FLT_ALLFILES_FLT; + FilterPairs[1].DisplayID = IDS_FLT_HIVFILES; + FilterPairs[1].FilterID = IDS_FLT_HIVFILES_FLT; + FilterPairs[2].DisplayID = IDS_FLT_REGEDIT4; + FilterPairs[2].FilterID = IDS_FLT_REGEDIT4_FLT; + FilterPairs[3].DisplayID = IDS_FLT_ALLFILES; + FilterPairs[3].FilterID = IDS_FLT_ALLFILES_FLT; BuildFilterStrings(Filter, FilterPairs, COUNT_OF(FilterPairs)); pofn->lpstrFilter = Filter; @@ -432,10 +434,14 @@ static BOOL ImportRegistryFile(HWND hWnd) { + BOOL bRet = FALSE; OPENFILENAME ofn; TCHAR Caption[128], szTitle[256], szText[256]; HKEY hKeyRoot; LPCTSTR pszKeyPath; + + /* Figure out in which key path we are importing */ + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_IMPORT_REG_FILE, Caption, COUNT_OF(Caption)); @@ -444,21 +450,65 @@ /* ofn.lCustData = ;*/ if (GetOpenFileName(&ofn)) { - FILE *fp = _wfopen(ofn.lpstrFile, L"r"); - if (fp == NULL || !import_registry_file(fp)) - { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fprintf(stderr, "Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); - if (fp != NULL) - fclose(fp); - return FALSE; - } - LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); - /* show successful import */ - MessageBox(NULL, szText, szTitle, MB_OK); - fclose(fp); + /* Look at the extension of the file to determine its type */ + if (ofn.nFileExtension >= 1 && + _tcsicmp(ofn.lpstrFile + ofn.nFileExtension, TEXT("reg")) == 0) /* REGEDIT4 or Windows Registry Editor Version 5.00 */ + { + /* Open the file */ + FILE *fp = _wfopen(ofn.lpstrFile, L"r"); + + /* Import it */ + if (fp == NULL || !import_registry_file(fp)) + { + LPSTR p = GetMultiByteString(ofn.lpstrFile); + fprintf(stderr, "Can't open file \"%s\"\n", p); + HeapFree(GetProcessHeap(), 0, p); + bRet = FALSE; + } + else + { + /* Show successful import */ + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + MessageBox(NULL, szText, szTitle, MB_OK); + bRet = TRUE; + } + + /* Close the file */ + if (fp) fclose(fp); + } + else /* Registry Hive Files */ + { + LoadString(hInst, IDS_QUERY_IMPORT_HIVE_CAPTION, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_QUERY_IMPORT_HIVE_MSG, szText, COUNT_OF(szText)); + + /* Display a confirmation message */ + if (MessageBox(g_pChildWnd->hWnd, szText, szTitle, MB_ICONWARNING | MB_YESNO) == IDYES) + { + LONG lResult; + HKEY hSubKey; + + /* Open the subkey */ + lResult = RegOpenKeyEx(hKeyRoot, pszKeyPath, 0, KEY_WRITE, &hSubKey); + if (lResult == ERROR_SUCCESS) + { + /* Enable the 'restore' privilege, restore the hive then disable the privilege */ + EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); + lResult = RegRestoreKey(hSubKey, ofn.lpstrFile, REG_FORCE_RESTORE); + EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); + + /* Flush the subkey and close it */ + RegFlushKey(hSubKey); + RegCloseKey(hSubKey); + } + + /* Set the return value */ + bRet = (lResult == ERROR_SUCCESS); + + /* Display error, if any */ + if (!bRet) ErrorMessageBox(hWnd, Caption, lResult); + } + } } else { @@ -470,7 +520,7 @@ pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, pszKeyPath); - return TRUE; + return bRet; } static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) @@ -529,6 +579,7 @@ BOOL ExportRegistryFile(HWND hWnd) { + BOOL bRet = FALSE; OPENFILENAME ofn; TCHAR ExportKeyPath[_MAX_PATH]; TCHAR Caption[128]; @@ -553,20 +604,78 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { - BOOL result; - DWORD format; - - if (ofn.nFilterIndex == 1) - format = REG_FORMAT_5; - else - format = REG_FORMAT_4; - result = export_registry_key(ofn.lpstrFile, ExportKeyPath, format); - if (!result) - { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fprintf(stderr, "Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); - return FALSE; + switch (ofn.nFilterIndex) + { + case 2: /* Registry Hive Files */ + { + LONG lResult; + HKEY hSubKey; + + /* Open the subkey */ + lResult = RegOpenKeyEx(hKeyRoot, pszKeyPath, 0, KEY_READ, &hSubKey); + if (lResult == ERROR_SUCCESS) + { + /* Enable the 'backup' privilege, save the hive then disable the privilege */ + EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + lResult = RegSaveKey(hSubKey, ofn.lpstrFile, NULL); + if (lResult == ERROR_ALREADY_EXISTS) + { + /* + * We are here, that means that we already said "yes" to the confirmation dialog. + * So we absolutely want to replace the hive file. + */ + if (DeleteFile(ofn.lpstrFile)) + { + /* Try again */ + lResult = RegSaveKey(hSubKey, ofn.lpstrFile, NULL); + } + } + EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); + + if (lResult != ERROR_SUCCESS) + { + /* + * If we are here, it's because RegSaveKey has failed for any reason. + * The problem is that even if it has failed, it has created or + * replaced the exported hive file with a new empty file. We don't + * want to keep this file, so we delete it. + */ + DeleteFile(ofn.lpstrFile); + } + + /* Close the subkey */ + RegCloseKey(hSubKey); + } + + /* Set the return value */ + bRet = (lResult == ERROR_SUCCESS); + + /* Display error, if any */ + if (!bRet) ErrorMessageBox(hWnd, Caption, lResult); + + break; + } + + case 1: /* Windows Registry Editor Version 5.00 */ + case 3: /* REGEDIT4 */ + default: /* All files ==> use Windows Registry Editor Version 5.00 */ + { + if (!export_registry_key(ofn.lpstrFile, ExportKeyPath, + (ofn.nFilterIndex == 3 ? REG_FORMAT_4 + : REG_FORMAT_5))) + { + LPSTR p = GetMultiByteString(ofn.lpstrFile); + fprintf(stderr, "Can't open file \"%s\"\n", p); + HeapFree(GetProcessHeap(), 0, p); + bRet = FALSE; + } + else + { + bRet = TRUE; + } + + break; + } } } else @@ -574,7 +683,7 @@ CheckCommDlgError(hWnd); } - return TRUE; + return bRet; } BOOL PrintRegistryHive(HWND hWnd, LPTSTR path) Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -383,6 +383,8 @@ IDS_ERR_DELETEVALUE "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑÐ¸ Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾!" IDS_ERR_RENVAL_CAPTION "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐµÐ¸Ð¼Ð°Ð½ÐµÑÐ²Ð°Ð½ÐµÑÐ¾" IDS_ERR_RENVAL_TOEMPTY "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¿ÑÐµÐ¸Ð¼ÐµÐ½ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s. Ð£ÐºÐ°Ð·Ð°Ð½Ð°ÑÐ° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ Ð½Ðµ Ðµ Ð¿ÑÐ°Ð·Ð½Ð°. ÐÐ¿Ð¸ÑÐ°Ð¹ÑÐµ Ð¾ÑÐ½Ð¾Ð²Ð¾ Ñ Ð´ÑÑÐ³Ð¾ Ð¸Ð¼Ðµ." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "ÐÐ¾Ð² ÐºÐ»ÑÑ #%d" IDS_NEW_VALUE "ÐÐ¾Ð²Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ #%d" END @@ -406,6 +408,8 @@ IDS_FLT_REGFILE "ÐÐ¿Ð¸ÑÐ²Ð°Ñ ÑÐ°Ð¹Ð»" IDS_FLT_REGFILES "ÐÐ¿Ð¸ÑÐ²Ð°ÑÐ¸ (ÑÐµÐ³Ð¸ÑÑÑÑÐ½Ð¸) ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Ð²Ð¿Ð¸ÑÐ²Ð°ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÐÑÐ¸ÑÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Nelze odstranit vÅ¡echny vybranÃ© poloÅ¾ky!" IDS_ERR_RENVAL_CAPTION "Chyba pÅi pÅejmenovÃ¡nÃ poloÅ¾ky" IDS_ERR_RENVAL_TOEMPTY "Nelze pÅejmenovat %s. VybranÃ¡ poloÅ¾ka je prÃ¡zdnÃ¡. VyzkouÅ¡ejte jinÃ½ nÃ¡zev." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "NovÃ½ klÃÄ #%d" IDS_NEW_VALUE "NovÃ¡ hodnota #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Soubor registru" IDS_FLT_REGFILES "Soubory registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "VÅ¡echny soubory (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Es konnten nicht alle Werte gelÃ¶scht werden!" IDS_ERR_RENVAL_CAPTION "Fehler beim Umbenennen des Wertes" IDS_ERR_RENVAL_TOEMPTY "Kann %s nicht umbenennen. Der angegebene Name ist leer." + IDS_QUERY_IMPORT_HIVE_CAPTION "Wiederherstellen des SchlÃ¼ssels bestÃ¤tigen" + IDS_QUERY_IMPORT_HIVE_MSG "Ein SchlÃ¼ssel wird Ã¼ber den aktuell ausgewÃ¤hlten SchlÃ¼ssel wiederhergestellt.\nAlle Werte und UnterschlÃ¼ssel dieses SchlÃ¼ssels werden dabei gelÃ¶scht.\nMÃ¶chten Sie den Vorgang fortsetzen?" IDS_NEW_KEY "Neuer SchlÃ¼ssel #%d" IDS_NEW_VALUE "Neuer Wert #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registrierungsdatei" IDS_FLT_REGFILES "Registrierungsdateien (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry-Hive-Dateien (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4-Registrierungsdateien (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Dateien (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "ÎÎµÎ½ Î®ÏÎ½Î± Î´ÏÎ½Î±ÏÎ® Î· Î´Î¹Î±Î³ÏÎ±ÏÎ® ÏÎ»ÏÎ½ ÏÏÎ½ ÏÎ¹Î¼ÏÎ½!" IDS_ERR_RENVAL_CAPTION "Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ· ÎÎµÏÎ¿Î½Î¿Î¼Î±ÏÎ¯Î± Î¤Î¹Î¼ÏÎ½" IDS_ERR_RENVAL_TOEMPTY "ÎÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´ÏÎ½Î±ÏÎ® Î· Î¼ÎµÏÎ¿Î½Î¿Î¼Î±ÏÎ¯Î± ÏÎ¿Ï %s. Î¤Î¿ ÏÎ½Î¿Î¼Î± ÏÎ·Ï ÏÏÎ³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î·Ï ÏÎ¹Î¼Î®Ï ÎµÎ¯Î½Î±Î¹ Î¬Î´ÎµÎ¹Î¿. ÎÏÏÏÎµ Î¬Î»Î»Î¿ ÏÎ½Î¿Î¼Î± ÎºÎ±Î¹ ÏÏÎ¿ÏÏÎ±Î¸Î®ÏÏÎµ Î¾Î±Î½Î¬." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "ÎÎÎ¿ ÎÎ»ÎµÎ¹Î´Î¯ #%d" IDS_NEW_VALUE "ÎÎÎ± Î¤Î¹Î¼Î® #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Î±ÏÏÎµÎ¯Î± (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Î±ÏÏÎµÎ¯Î± (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÎÎ»Î± ÏÎ± Î±ÏÏÎµÎ¯Î± (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -371,6 +371,8 @@ IDS_ERR_DELETEVALUE "Â¡Incapaz de borrar todos los valores especificados!" IDS_ERR_RENVAL_CAPTION "Error Renombrando Valor" IDS_ERR_RENVAL_TOEMPTY "No puede renombrar %s. El nombre de valor especificado esta vacio. Trate otro nombre y comienze otra vez." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nueva Clave #%d" IDS_NEW_VALUE "Nuevo Valor #%d" END @@ -394,6 +396,8 @@ IDS_FLT_REGFILE "Fichero de Registro" IDS_FLT_REGFILES "Fichero de Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos los archivos (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -364,6 +364,8 @@ IDS_ERR_DELETEVALUE "Impossible de supprimer toutes les valeurs selÃ©ctionnÃ©es !" IDS_ERR_RENVAL_CAPTION "Erreur lors de la tentative pour renommer la valeur." IDS_ERR_RENVAL_TOEMPTY "Impossible de renommer %s. Le nom de valeur spÃ©cifiÃ© est vide. Essayez Ã nouveau avec un autre nom." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirmation de la restauration de la clÃ©" + IDS_QUERY_IMPORT_HIVE_MSG "Une clÃ© sera restaurÃ©e en remplacement de la clÃ© sÃ©lectionnÃ©e.\nToutes les valeurs et les sous-clÃ©s contenues dans cette clÃ© seront supprimÃ©es.\nVoulez-vous continuer l'opÃ©ration ?" IDS_NEW_KEY "Nouvelle clÃ© #%d" IDS_NEW_VALUE "Nouvelle valeur #%d" END @@ -387,6 +389,8 @@ IDS_FLT_REGFILE "Fichier d'enregistrement" IDS_FLT_REGFILES "Fichiers d'enregistrement (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Fichiers ruche du Registre (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Fichiers d'enregistrement Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tous les fichiers (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -392,6 +394,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -367,6 +367,8 @@ IDS_ERR_DELETEVALUE "Tidak bisa menghapus semua nilai yang ditetapkan!" IDS_ERR_RENVAL_CAPTION "Kesalahan Mengganti nama Nilai" IDS_ERR_RENVAL_TOEMPTY "Tidak bisa mengganti nama %s. Nama nilai yang ditetapkan kosong. Coba nama lain dan coba lagi." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Kunci Baru #%d" IDS_NEW_VALUE "Nilai Baru #%d" END @@ -390,6 +392,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "File Registrasi (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "File Registrasi Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Semua File (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -370,6 +370,8 @@ IDS_ERR_DELETEVALUE "Impossibile cancellare tutti i valori indicati!" IDS_ERR_RENVAL_CAPTION "Errore nel rinominare il valore" IDS_ERR_RENVAL_TOEMPTY "Impossibile rinominare %s. Il nome indicato Ã¨ vuoto. Riprovate con un altro nome." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nuova chiave #%d" IDS_NEW_VALUE "Nuovo valore #%d" END @@ -393,6 +395,8 @@ IDS_FLT_REGFILE "File di Registrazione" IDS_FLT_REGFILES "File di Registrazione (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "File di Registrazione Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tutti i file (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "æå®ãããå¤ã®ãã¹ã¦ãåé¤ã§ãã¾ãã!" IDS_ERR_RENVAL_CAPTION "å¤ã®ååãå¤æ´ããã¨ãã«ã¨ã©ã¼ãçºçãã¾ããã" IDS_ERR_RENVAL_TOEMPTY "%s ã®ååãå¤æ´ã§ãã¾ãããæå®ãããå¤ã®ååã«ã¯æåãå«ã¾ãã¦ãã¾ãããå¥ã®ååã§ããç´ãã¦ãã ããã" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "æ°ãããã¼ #%d" IDS_NEW_VALUE "æ°ããå¤ #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "ç»é²ãã¡ã¤ã«" IDS_FLT_REGFILES "ç»é²ãã¡ã¤ã« (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 ç»é²ãã¡ã¤ã« (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ãã¹ã¦ã®ãã¡ã¤ã« (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -353,6 +353,8 @@ IDS_ERR_DELETEVALUE "ëª¨ë ì íë ê°ì ì ê±°í ì ììµëë¤!" IDS_ERR_RENVAL_CAPTION "ê° ì´ë¦ ë°ê¾¸ê¸° ì¤ë¥" IDS_ERR_RENVAL_TOEMPTY "%sì ì´ë¦ì ë°ê¿ ì ììµëë¤. ê°ì ì´ë¦ì´ ììµëë¤. ë¤ë¥¸ ì´ë¦ì¼ë¡ í´ ë³´ì¸ì." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "ì í¤ #%d" IDS_NEW_VALUE "ì ê° #%d" END @@ -376,6 +378,8 @@ IDS_FLT_REGFILE "ë ì§ì¤í¸ë¦¬ íì¼" IDS_FLT_REGFILES "ë ì§ì¤í¸ë¦¬ íì¼ë¤ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 ë ì§ì¤í¸ë¦¬ íì¼ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ëª¨ë íì¼ (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Kunne ikke slette alle angitte verdier!" IDS_ERR_RENVAL_CAPTION "Feil ved endring av navn" IDS_ERR_RENVAL_TOEMPTY "Kan ikke gi nytt navn til %s. Den angitte verdien er tom. PrÃ¸v et annet navn, og forsÃ¸k pÃ¥ nytt." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Ny nÃ¸kkel #%d" IDS_NEW_VALUE "Ny verdi #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Filer (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -375,6 +375,8 @@ IDS_ERR_DELETEVALUE "Nie moÅ¼na usunÄÄ wszystkich podanych wartoÅci!" IDS_ERR_RENVAL_CAPTION "BÅÄd przy zmianie wartoÅci" IDS_ERR_RENVAL_TOEMPTY "Nie moÅ¼na zmieniÄ nazwy %s. OkreÅlona nazwa klucza jest pusta. Wpisz innÄ nazwÄ i sprÃ³buj ponownie." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nowy klucz #%d" IDS_NEW_VALUE "Nowa wartoÅÄ #%d" END @@ -398,6 +400,8 @@ IDS_FLT_REGFILE "Plik rejestru" IDS_FLT_REGFILES "Pliki rejestru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "NÃ£o foi possÃvel excluir todos os valores especificados" IDS_ERR_RENVAL_CAPTION "Erro renomeando valor" IDS_ERR_RENVAL_TOEMPTY "NÃ£o pode renomear %s. O nome do valor especificado estÃ¡ vazio. Tente novamente com outro nome." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nova chave #%d" IDS_NEW_VALUE "Novo valor #%d" END @@ -392,6 +394,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Arquivos do Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Arquivos do Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os arquivos (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -370,6 +370,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -393,6 +395,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -366,6 +366,8 @@ IDS_ERR_DELETEVALUE "Nu s-a reuÈit Ètergerea tuturor valorilor specificate!" IDS_ERR_RENVAL_CAPTION "Eroare la redenumirea de valori" IDS_ERR_RENVAL_TOEMPTY "Nu se poate redenumi %s. Numele valorii specificate este gol. ÃncercaÈi introducerea unui alt nume." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Cheia nouÄ #%d" IDS_NEW_VALUE "Valoarea nouÄ #%d" END @@ -389,6 +391,8 @@ IDS_FLT_REGFILE "FiÈier registru" IDS_FLT_REGFILES "FiÈiere registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "FiÈiere registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Orice fiÈier (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -365,6 +365,8 @@ IDS_ERR_DELETEVALUE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐµ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ!" IDS_ERR_RENVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" IDS_ERR_RENVAL_TOEMPTY "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ %s. Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÑÑÐ¾Ðµ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»ÑÑ #%d" IDS_NEW_VALUE "ÐÐ¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ #%d" END @@ -388,6 +390,8 @@ IDS_FLT_REGFILE "Ð¤Ð°Ð¹Ð» ÑÐµÐµÑÑÑÐ°" IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -353,6 +353,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "NovÃ½ kÄ¾ÃºÄ #%d" IDS_NEW_VALUE "NovÃ¡ hodnota #%d" END @@ -376,6 +378,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "VÅ¡etky sÃºbory (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Det gick inte att ta bort alla specificerade vÃ¤rden!" IDS_ERR_RENVAL_CAPTION "Fel vid namnÃ¤ndring av vÃ¤rde" IDS_ERR_RENVAL_TOEMPTY "Kunde inte byta namn pÃ¥ %s. Det specificerade vÃ¤rdenamnet Ã¤r tomt. Ange ett annat namn och fÃ¶rsÃ¶k igen." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Ny Nyckel #%d" IDS_NEW_VALUE "Nytt VÃ¤rde #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registerfil" IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alla filer (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "Registration File" IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÑ Ð·Ð°Ð´Ð°Ð½Ñ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ!" IDS_ERR_RENVAL_CAPTION "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð¿ÐµÑÐµÐ¹Ð¼ÐµÐ½ÑÐ²Ð°Ð½Ð½Ñ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ" IDS_ERR_RENVAL_TOEMPTY "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¿ÐµÑÐµÐ¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸ %s. ÐÐ¼'Ñ Ð·Ð°Ð´Ð°Ð½Ð¾Ð³Ð¾ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð¿Ð¾ÑÐ¾Ð¶Ð½Ñ. Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÑÐ½ÑÐµ ÑÐ¼'Ñ ÑÐ° Ð¿Ð¾Ð²ÑÐ¾ÑÑÑÑ ÑÐ¿ÑÐ¾Ð±Ñ." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "ÐÐ¾Ð²Ð¸Ð¹ ÑÐ¾Ð·Ð´ÑÐ» #%d" IDS_NEW_VALUE "ÐÐ¾Ð²Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ #%d" END @@ -392,6 +394,8 @@ IDS_FLT_REGFILE "Ð¤Ð°Ð¹Ð» ÑÐµÑÑÑÑÑ" IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Ð£ÑÑ ÑÐ°Ð¹Ð»Ð¸ (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "æ æ³å é¤æææå®çå¼!" IDS_ERR_RENVAL_CAPTION "éå½åå¼æ¶äº§çéè¯¯" IDS_ERR_RENVAL_TOEMPTY "æ³¨åè¡¨ç¼è¾å¨æ æ³éå½å %sãæå®çå¼åä¸ºç©ºãè¯·é®å¥å¶ä»åç§°ï¼åè¯ä¸æ¬¡ã" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "æ°é¡¹ #%d" IDS_NEW_VALUE "æ°å¼ #%d" END @@ -391,6 +393,8 @@ IDS_FLT_REGFILE "æ³¨åæä»¶" IDS_FLT_REGFILES "æ³¨åæä»¶ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 æ³¨åæä»¶ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "æææä»¶ (*.*)" Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "ç¡æ³åªé¤æææå®çå¼ï¼" IDS_ERR_RENVAL_CAPTION "éæ°å½åå¼æç¢çé¯èª¤" IDS_ERR_RENVAL_TOEMPTY "ç»éç·¨è¼¯å¨ç¡æ³éæ°å½å %sãæå®çå¼çºç©ºãè«è¼¸å¥å¶ä»åç¨±ï¼åè©¦ä¸æ¬¡ã" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "æ°æ©ç¢¼ #%d" IDS_NEW_VALUE "æ°å¼ #%d" END @@ -392,6 +394,8 @@ IDS_FLT_REGFILE "ç»éæä»¶" IDS_FLT_REGFILES "ç»éæä»¶ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 ç»éæä»¶ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "æææä»¶ (*.*)" Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -136,12 +136,14 @@ #define IDS_ERR_DELETEVALUE 32855 #define IDS_ERR_RENVAL_CAPTION 32856 #define IDS_ERR_RENVAL_TOEMPTY 32857 -#define IDS_BAD_KEY 32858 -#define IDS_LOAD_HIVE 32859 -#define IDS_UNLOAD_HIVE 32860 - -#define ID_EDIT_NEW_MULTISTRINGVALUE 32861 -#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 +#define IDS_QUERY_IMPORT_HIVE_CAPTION 32858 +#define IDS_QUERY_IMPORT_HIVE_MSG 32859 +#define IDS_BAD_KEY 32860 +#define IDS_LOAD_HIVE 32861 +#define IDS_UNLOAD_HIVE 32862 + +#define ID_EDIT_NEW_MULTISTRINGVALUE 32863 +#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32864 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 @@ -158,10 +160,12 @@ #define IDS_FLT_REGFILE 31000 #define IDS_FLT_REGFILES 31001 #define IDS_FLT_REGFILES_FLT 31002 -#define IDS_FLT_REGEDIT4 31003 -#define IDS_FLT_REGEDIT4_FLT 31004 -#define IDS_FLT_ALLFILES 31005 -#define IDS_FLT_ALLFILES_FLT 31006 +#define IDS_FLT_HIVFILES 31003 +#define IDS_FLT_HIVFILES_FLT 31004 +#define IDS_FLT_REGEDIT4 31005 +#define IDS_FLT_REGEDIT4_FLT 31006 +#define IDS_FLT_ALLFILES 31007 +#define IDS_FLT_ALLFILES_FLT 31008 #define IDS_ACCESS_FULLCONTROL 31101 #define IDS_ACCESS_READ 31102 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jul 11 23:04:41 2012 @@ -1375,6 +1375,7 @@ #define REG_WHOLE_HIVE_VOLATILE 1 #define REG_REFRESH_HIVE 2 #define REG_NO_LAZY_FLUSH 4 +#define REG_FORCE_RESTORE 8 #define REG_OPTION_RESERVED 0 #define REG_OPTION_NON_VOLATILE 0 #define REG_OPTION_VOLATILE 1

1 0

[tfaber] 56868: [REGEDIT] - Apply the "Refresh" command to the ListView in addition to the TreeView - Use COUNT_OF where applicable; miscellaneous readability and consistency fixes - Space fixes in...
by tfaber＠svn.reactos.org 11 Jul '12

11 Jul '12

Author: tfaber Date: Wed Jul 11 21:49:43 2012 New Revision: 56868 URL: http://svn.reactos.org/svn/reactos?rev=56868&view=rev Log: [REGEDIT] - Apply the "Refresh" command to the ListView in addition to the TreeView - Use COUNT_OF where applicable; miscellaneous readability and consistency fixes - Space fixes in resource files; French translation fixes - Patch by Hermes Belusca See issue #7180 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -275,7 +275,7 @@ FilterPairs[1].FilterID = IDS_FLT_REGEDIT4_FLT; FilterPairs[2].DisplayID = IDS_FLT_ALLFILES; FilterPairs[2].FilterID = IDS_FLT_ALLFILES_FLT; - BuildFilterStrings(Filter, FilterPairs, sizeof(FilterPairs) / sizeof(FILTERPAIR)); + BuildFilterStrings(Filter, FilterPairs, COUNT_OF(FilterPairs)); pofn->lpstrFilter = Filter; pofn->lpstrFile = FileNameBuffer; @@ -434,8 +434,8 @@ { OPENFILENAME ofn; TCHAR Caption[128], szTitle[256], szText[256]; + HKEY hKeyRoot; LPCTSTR pszKeyPath; - HKEY hRootKey; InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_IMPORT_REG_FILE, Caption, COUNT_OF(Caption)); @@ -465,9 +465,10 @@ CheckCommDlgError(hWnd); } + /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); - pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, pszKeyPath); return TRUE; } @@ -539,7 +540,7 @@ GetKeyName(ExportKeyPath, COUNT_OF(ExportKeyPath), hKeyRoot, pszKeyPath); InitOpenFileName(hWnd, &ofn); - LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, COUNT_OF(Caption)); ofn.lpstrTitle = Caption; /* Only set the path if a key (not the root node) is selected */ @@ -572,6 +573,7 @@ { CheckCommDlgError(hWnd); } + return TRUE; } @@ -1055,8 +1057,8 @@ if(nSelected >= 1) { TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, COUNT_OF(caption)); + LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, COUNT_OF(msg)); if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) { int ni, errs; @@ -1076,8 +1078,8 @@ RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); if(errs > 0) { - LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, COUNT_OF(caption)); + LoadString(hInst, IDS_ERR_DELETEVALUE, msg, COUNT_OF(msg)); MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); } } @@ -1135,7 +1137,8 @@ case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); - /*RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); */ + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -59,9 +59,9 @@ MENUITEM "&ÐÐ·Ð½Ð¾Ñ...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð¹...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ÐÐ·Ð¾ÑÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° ÑÐ¾Ð¹...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð¹...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "ÐÐ·Ð¾ÑÑÐ°Ð²ÑÐ½Ðµ Ð½Ð° ÑÐ¾Ð¹...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Ð¡Ð²ÑÑÐ·Ð²Ð°Ð½Ðµ Ñ Ð¼ÑÐµÐ¶Ð¾Ð² ÑÐµÐ³Ð¸ÑÑÑÑ...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -366,8 +366,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "ÐÑÐµÑÐºÐ°" - IDS_WARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" + IDS_ERROR "ÐÑÐµÑÐºÐ°" + IDS_WARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" IDS_BAD_KEY "ÐÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð²Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° ÐºÐ»ÑÑ '%s'" IDS_BAD_VALUE "ÐÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð²Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ '%s'" IDS_UNSUPPORTED_TYPE "ÐÑÐ¾Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ðµ Ð¾Ñ ÑÐ¾Ð·Ð¸ Ð²Ð¸Ð´ Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð° (%ld)" @@ -404,9 +404,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "ÐÐ¿Ð¸ÑÐ²Ð°Ñ ÑÐ°Ð¹Ð»" - IDS_FLT_REGFILES "ÐÐ¿Ð¸ÑÐ²Ð°ÑÐ¸ (ÑÐµÐ³Ð¸ÑÑÑÑÐ½Ð¸) ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ" + IDS_FLT_REGFILES "ÐÐ¿Ð¸ÑÐ²Ð°ÑÐ¸ (ÑÐµÐ³Ð¸ÑÑÑÑÐ½Ð¸) ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Ð²Ð¿Ð¸ÑÐ²Ð°ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Ð²Ð¿Ð¸ÑÐ²Ð°ÑÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÐÑÐ¸ÑÐºÐ¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Exportovat do souboru registru...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "NaÄÃst strom registru...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "NaÄÃst strom registru...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&PÅipojit sÃÅ¥ovÃ½ registr...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Soubor registru" - IDS_FLT_REGFILES "Soubory registru" + IDS_FLT_REGFILES "Soubory registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "VÅ¡echny soubory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Exportieren...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Zweig laden...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Zweig entladen...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Zweig laden...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Zweig entladen...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Mit Netzwerkregistrierung verbinden...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Fehler" - IDS_WARNING "Warnung" + IDS_ERROR "Fehler" + IDS_WARNING "Warnung" IDS_BAD_KEY "Kann den SchlÃ¼ssel '%s' nicht lesen" IDS_BAD_VALUE "Kann den Wert '%s' nicht lesen" IDS_UNSUPPORTED_TYPE "Kann den SchlÃ¼ssel des Typs (%ld) nicht Ã¤ndern" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registrierungsdatei" - IDS_FLT_REGFILES "Registrierungsdateien" + IDS_FLT_REGFILES "Registrierungsdateien (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4-Registrierungsdateien (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4-Registrierungsdateien (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Dateien (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&ÎÎ¾Î±Î³ÏÎ³Î®...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Î¦ÏÏÏÏÏÎ· Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ÎÏÎ±Î¯ÏÎµÏÎ· Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Î¦ÏÏÏÏÏÎ· Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "ÎÏÎ±Î¯ÏÎµÏÎ· Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Î£ÏÎ¬Î»Î¼Î±" - IDS_WARNING "Î ÏÎ¿ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·" + IDS_ERROR "Î£ÏÎ¬Î»Î¼Î±" + IDS_WARNING "Î ÏÎ¿ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "ÎÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´ÏÎ½Î±ÏÎ® Î· ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÎ¯Î± ÎºÎ»ÎµÎ¹Î´Î¹ÏÎ½ Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÏÏÎ¿Ï (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Î±ÏÏÎµÎ¯Î±" + IDS_FLT_REGFILES "Registration Î±ÏÏÎµÎ¯Î± (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Î±ÏÏÎµÎ¯Î± (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Î±ÏÏÎµÎ¯Î± (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÎÎ»Î± ÏÎ± Î±ÏÏÎµÎ¯Î± (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Export...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -56,10 +56,10 @@ MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR - MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectar al Registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -354,8 +354,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Aviso" + IDS_ERROR "Error" + IDS_WARNING "Aviso" IDS_BAD_KEY "No puede averiguar valor clave '%s'" IDS_BAD_VALUE "No puede averiguar valor '%s'" IDS_UNSUPPORTED_TYPE "No puede editar claves de este tipo (%ld)" @@ -392,9 +392,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Fichero de Registro" - IDS_FLT_REGFILES "Fichero de Registro" + IDS_FLT_REGFILES "Fichero de Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos los archivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -53,19 +53,13 @@ POPUP "&Fichier" BEGIN MENUITEM "&Importer...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Exporter...", ID_REGISTRY_EXPORTREGISTRYFILE - - MENUITEM SEPARATOR - MENUITEM "Charger un fichier registre...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "DÃ©charger un fichier registre...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Charger la ruche...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "DÃ©charger la ruche...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "&Connecter Ã des registres via le rÃ©seau...", ID_REGISTRY_CONNECTNETWORKREGISTRY - - MENUITEM "&DÃ©connecter de registres rÃ©seau...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED - - MENUITEM SEPARATOR MENUITEM "Im&primer\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -321,13 +315,12 @@ ID_EDIT_NEW_STRINGVALUE "Ajoute une nouvelle valeur chaÃ®ne" ID_EDIT_NEW_BINARYVALUE "Ajoute une nouvelle valeur binaire" ID_EDIT_NEW_DWORDVALUE "Ajoute une nouvelle valeur mot double" - ID_REGISTRY_IMPORTREGISTRYFILE "Importe un fichier texte dans les registres" + ID_REGISTRY_IMPORTREGISTRYFILE + "Importe un fichier texte dans les registres" ID_REGISTRY_EXPORTREGISTRYFILE "Exporte tout ou une partie des registres dans un fichier texte" - ID_REGISTRY_LOADHIVE - "Loads a hive file into the registry" - ID_REGISTRY_UNLOADHIVE - "Unloads a hive from the registry" + ID_REGISTRY_LOADHIVE "Charge un fichier ruche dans le Registre" + ID_REGISTRY_UNLOADHIVE "DÃ©charge une ruche Ã partir du Registre" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connecte aux registres d'un ordinateur distant" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -354,22 +347,22 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erreur" - IDS_WARNING "Attention" + IDS_ERROR "Erreur" + IDS_WARNING "Attention" IDS_BAD_KEY "Impossible de rÃ©cupÃ©rer la clÃ© '%s'" IDS_BAD_VALUE "Impossible de rÃ©cupÃ©rer la valeur '%s'" IDS_UNSUPPORTED_TYPE "Impossible d'Ã©diter les clÃ©s de ce type (%ld)" IDS_TOO_BIG_VALUE "La valeur est trop importante (%ld)" IDS_MULTI_SZ_EMPTY_STRING "Les donnÃ©es de type REG_MULTI_SZ ne peuvent contenir des chaÃ®nes vides.\nLes chaÃ®nes vides ont Ã©tÃ© supprimÃ©es de la liste." - IDS_QUERY_DELETE_KEY_ONE "Ãtes-vous sÃ»r de vouloir supprimer cette clÃ©?" - IDS_QUERY_DELETE_KEY_MORE "Ãtes-vous sÃ»r de vouloir supprimer ces clÃ©s?" + IDS_QUERY_DELETE_KEY_ONE "Ãtes-vous sÃ»r de vouloir supprimer cette clÃ© ?" + IDS_QUERY_DELETE_KEY_MORE "Ãtes-vous sÃ»r de vouloir supprimer ces clÃ©s ?" IDS_QUERY_DELETE_KEY_CONFIRM "Confirmation de la suppression de la clÃ©" - IDS_QUERY_DELETE_ONE "Ãtes-vous sÃ»r de vouloir supprimer cette valeur?" - IDS_QUERY_DELETE_MORE "Ãtes-vous sÃ»r de vouloir supprimer ces valeurs?" + IDS_QUERY_DELETE_ONE "Ãtes-vous sÃ»r de vouloir supprimer cette valeur ?" + IDS_QUERY_DELETE_MORE "Ãtes-vous sÃ»r de vouloir supprimer ces valeurs ?" IDS_QUERY_DELETE_CONFIRM "Confirmation de la suppression de la valeur" - IDS_ERR_DELVAL_CAPTION "Erreur lors de la suppression des valeurs" - IDS_ERR_DELETEVALUE "Impossible de supprimer toutes les valeurs selÃ©ctionnÃ©es!" - IDS_ERR_RENVAL_CAPTION "Erreur lors de la tentative pour renommer la valeur" + IDS_ERR_DELVAL_CAPTION "Erreur lors de la suppression des valeurs." + IDS_ERR_DELETEVALUE "Impossible de supprimer toutes les valeurs selÃ©ctionnÃ©es !" + IDS_ERR_RENVAL_CAPTION "Erreur lors de la tentative pour renommer la valeur." IDS_ERR_RENVAL_TOEMPTY "Impossible de renommer %s. Le nom de valeur spÃ©cifiÃ© est vide. Essayez Ã nouveau avec un autre nom." IDS_NEW_KEY "Nouvelle clÃ© #%d" IDS_NEW_VALUE "Nouvelle valeur #%d" @@ -377,24 +370,24 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BINARY_EMPTY "(valeur binaire de longueur nulle)" + IDS_BINARY_EMPTY "(valeur binaire de longueur nulle)" IDS_DEFAULT_VALUE_NAME "(DÃ©faut)" IDS_VALUE_NOT_SET "(valeur non dÃ©finie)" IDS_UNKNOWN_TYPE "Type inconnu: (0x%lx)" IDS_MY_COMPUTER "Mon ordinateur" IDS_IMPORT_REG_FILE "Importer un fichier registre" IDS_EXPORT_REG_FILE "Exporter un fichier registre" - IDS_LOAD_HIVE "Load Hive" - IDS_UNLOAD_HIVE "Unload Hive" + IDS_LOAD_HIVE "Charger la ruche" + IDS_UNLOAD_HIVE "DÃ©charger la ruche" IDS_INVALID_DWORD "(valeur mot double invalide)" END STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Fichier registre" - IDS_FLT_REGFILES "Fichiers registre" + IDS_FLT_REGFILE "Fichier d'enregistrement" + IDS_FLT_REGFILES "Fichiers d'enregistrement (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Fichiers registres de Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Fichiers d'enregistrement Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tous les fichiers (*.*)" IDS_FLT_ALLFILES_FLT "*.*" @@ -433,8 +426,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Voulez-vous ajouter des informations dans le Registre ?" + IDS_IMPORTED_OK "Les informations ont bien Ã©tÃ© ajoutÃ©es dans le Registre." END STRINGTABLE DISCARDABLE @@ -502,18 +495,18 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 - CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 - CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + GROUPBOX "Ãtendue de l'exportation",IDC_STATIC,2,0,366,48 + CONTROL "T&out",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "&Branche sÃ©lectionnÃ©e",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Load Hive" +CAPTION "Charger une ruche" FONT 8, "Ms Shell Dlg" { - LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + LTEXT "&ClÃ©:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -55,9 +55,9 @@ MENUITEM "&Export Registry File...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -390,9 +390,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,15 +54,14 @@ MENUITEM "&Ekspor...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Ambil Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Buang Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Ambil Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Buang Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Sambung Registri Jaringan...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Putus Registri Jaringan...", - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - , GRAYED + ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "&Cetak\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -351,8 +350,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Salah" - IDS_WARNING "Peringatan" + IDS_ERROR "Salah" + IDS_WARNING "Peringatan" IDS_BAD_KEY "Tidak bisa menanyakan kunci '%s'" IDS_BAD_VALUE "Tidak bisa menanyakan nilai '%s'" IDS_UNSUPPORTED_TYPE "Tidak bisa mengedit kunci jenis ini (%ld)" @@ -389,9 +388,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "File Registrasi" + IDS_FLT_REGFILES "File Registrasi (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "File Registrasi Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "File Registrasi Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Semua File (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -52,20 +52,19 @@ BEGIN POPUP "&Registro" BEGIN - MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE - - MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE - - MENUITEM SEPARATOR - MENUITEM "Carica Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "Carica Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "&Connetti a Registro in rete...", - ID_REGISTRY_CONNECTNETWORKREGISTRY + ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Disconnetti da Registro di rete...", - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - ,GRAYED + ID_REGISTRY_DISCONNECTNETWORKREGISTRY,GRAYED MENUITEM SEPARATOR MENUITEM "&Stampa\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -354,8 +353,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Errore" - IDS_WARNING "Segnalazione" + IDS_ERROR "Errore" + IDS_WARNING "Segnalazione" IDS_BAD_KEY "Impossibile interrogare la chiave '%s'" IDS_BAD_VALUE "Impossibile interrogare il valore '%s'" IDS_UNSUPPORTED_TYPE "Impossibile editare valori di questo tipo (%ld)" @@ -392,9 +391,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "File di Registrazione" - IDS_FLT_REGFILES "File di Registrazione" + IDS_FLT_REGFILES "File di Registrazione (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "File di Registrazione Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "File di Registrazione Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tutti i file (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -55,7 +55,7 @@ MENUITEM SEPARATOR MENUITEM "ãã¤ãã®èªã¿è¾¼ã¿...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ãã¤ãã®ã¢ã³ãã¼ã...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "ãã¤ãã®ã¢ã³ãã¼ã...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "ãããã¯ã¼ã¯ ã¬ã¸ã¹ããªã¸ã®æ¥ç¶(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "ç»é²ãã¡ã¤ã«" - IDS_FLT_REGFILES "ç»é²ãã¡ã¤ã«" + IDS_FLT_REGFILES "ç»é²ãã¡ã¤ã« (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 ç»é²ãã¡ã¤ã« (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 ç»é²ãã¡ã¤ã« (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ãã¹ã¦ã®ãã¡ã¤ã« (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -39,9 +39,9 @@ MENUITEM "ë´ë³´ë´ê¸°(&E)", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "íì´ë¸ ë¡ë...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "íì´ë¸ ì¸ë¡ë...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "íì´ë¸ ë¡ë...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "íì´ë¸ ì¸ë¡ë...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "ë¤í¸ìí¬ ë ì§ì¤í¸ë¦¬ì ì°ê²°(&C)", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -336,8 +336,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "ìë¬" - IDS_WARNING "ê²½ê³ " + IDS_ERROR "ìë¬" + IDS_WARNING "ê²½ê³ " IDS_BAD_KEY "'%s' í¤ë¥¼ ì¡°íí ì ììµëë¤" IDS_BAD_VALUE "'%s' ê°ì ì¡°íí ì ììµëë¤" IDS_UNSUPPORTED_TYPE "ì´ë° íìì í¤ë¥¼ í¸ì§í ì ììµëë¤ (%ld)" @@ -374,9 +374,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "ë ì§ì¤í¸ë¦¬ íì¼" - IDS_FLT_REGFILES "ë ì§ì¤í¸ë¦¬ íì¼ë¤" + IDS_FLT_REGFILES "ë ì§ì¤í¸ë¦¬ íì¼ë¤ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 ë ì§ì¤í¸ë¦¬ íì¼ (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 ë ì§ì¤í¸ë¦¬ íì¼ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ëª¨ë íì¼ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "Registerbestand &exporteren...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "Verbinding &maken met netwerkregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Eksport...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "Koble til nettverksregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Feil" - IDS_WARNING "Advarsel" + IDS_ERROR "Feil" + IDS_WARNING "Advarsel" IDS_BAD_KEY "Kan ikke lese nÃ¸kkel '%s'" IDS_BAD_VALUE "Kan ikke lese verdi '%s'" IDS_UNSUPPORTED_TYPE "Kan ikke endre nÃ¸kkel av type (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -61,9 +61,9 @@ MENUITEM "&Eksportuj plik rejestru...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Åaduj Drzewo....", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "WyÅaduj Drzewo..", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Åaduj Drzewo....", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "WyÅaduj Drzewo..", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&PodÅÄcz rejestr sieciowy...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -358,8 +358,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "BÅÄd" - IDS_WARNING "OstrzeÅ¼enie" + IDS_ERROR "BÅÄd" + IDS_WARNING "OstrzeÅ¼enie" IDS_BAD_KEY "Nie moÅ¼na odczytaÄ klucza '%s'" IDS_BAD_VALUE "Nie moÅ¼na odczytaÄ wartoÅci '%s'" IDS_UNSUPPORTED_TYPE "Nie moÅ¼na edytowaÄ kluczy tego typu (%ld)" @@ -396,9 +396,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Plik rejestru" - IDS_FLT_REGFILES "Pliki rejestru" + IDS_FLT_REGFILES "Pliki rejestru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -55,9 +55,9 @@ MENUITEM "&Exportar...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Carregar SeÃ§Ã£o...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "&Descarregar SeÃ§Ã£o...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "&Carregar SeÃ§Ã£o...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "&Descarregar SeÃ§Ã£o...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "C&onectar Registro da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erro" - IDS_WARNING "Aviso" + IDS_ERROR "Erro" + IDS_WARNING "Aviso" IDS_BAD_KEY "NÃ£o pode consultar chave '%s'" IDS_BAD_VALUE "NÃ£o pode consultar valor '%s'" IDS_UNSUPPORTED_TYPE "NÃ£o pode editar chaves deste tipo (%ld)" @@ -390,9 +390,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Arquivos do Registro" + IDS_FLT_REGFILES "Arquivos do Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Arquivos do Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Arquivos do Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os arquivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -55,9 +55,9 @@ MENUITEM "&Exportar arquivo do Registro...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectar Registro da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -353,8 +353,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erro" - IDS_WARNING "Warning" + IDS_ERROR "Erro" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "NÃ£o pode perguntar o valor '%s'" IDS_UNSUPPORTED_TYPE "NÃ£o pode editar chaves deste tipo (%ld)" @@ -391,9 +391,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -57,9 +57,9 @@ MENUITEM "E&xportareâ¦", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Ã&ncÄrcare registruâ¦", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Eli&berare registruâ¦", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Ã&ncÄrcare registruâ¦", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Eli&berare registruâ¦", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectare la un registru din reÈeaâ¦", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -349,8 +349,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Eroare" - IDS_WARNING "Avertisment" + IDS_ERROR "Eroare" + IDS_WARNING "Avertisment" IDS_BAD_KEY "Nu se poate citi cheia â%sâ" IDS_BAD_VALUE "Nu se poate citi valoarea â%sâ" IDS_UNSUPPORTED_TYPE "Nu se poate edita acest tip de cheie (%ld)" @@ -387,9 +387,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "FiÈier registru" - IDS_FLT_REGFILES "FiÈiere registru" + IDS_FLT_REGFILES "FiÈiere registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "FiÈiere registru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "FiÈiere registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Orice fiÈier (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&ÐÐºÑÐ¿Ð¾ÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¹Ð» ÑÐµÐµÑÑÑÐ°...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ÐÑÐ³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "ÐÑÐ³ÑÑÐ·Ð¸ÑÑ ÐºÑÑÑ...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&ÐÐ¾Ð´ÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ ÑÐµÐµÑÑÑ...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&ÐÑÐºÐ»ÑÑÐ¸ÑÑ ÑÐµÑÐµÐ²Ð¾Ð¹ ÑÐµÐµÑÑÑ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED @@ -348,25 +348,25 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" - IDS_WARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" - IDS_BAD_KEY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ ÐºÐ»ÑÑ '%s'" - IDS_BAD_VALUE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ '%s'" - IDS_UNSUPPORTED_TYPE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»ÑÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð° (%ld)" - IDS_TOO_BIG_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ðµ (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "ÐÐ°Ð½Ð½ÑÐµ ÑÐ¸Ð¿Ð° REG_MULTI_SZ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑ Ð¿ÑÑÑÑÐµ ÑÑÑÐ¾ÐºÐ¸.\nÐÑÐµ Ð¿ÑÑÑÑÐµ ÑÑÑÐ¾ÐºÐ¸ Ð±ÑÐ´ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ." - IDS_QUERY_DELETE_KEY_ONE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ñ ÐºÐ»ÑÑ?" - IDS_QUERY_DELETE_KEY_MORE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ ÐºÐ»ÑÑÐ¸?" - IDS_QUERY_DELETE_KEY_CONFIRM "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ»ÑÑÐ°" - IDS_QUERY_DELETE_ONE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ?" - IDS_QUERY_DELETE_MORE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?" - IDS_QUERY_DELETE_CONFIRM "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" - IDS_ERR_DELVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" - IDS_ERR_DELETEVALUE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐµ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ!" - IDS_ERR_RENVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" - IDS_ERR_RENVAL_TOEMPTY "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ %s. Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÑÑÐ¾Ðµ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." - IDS_NEW_KEY "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»ÑÑ #%d" - IDS_NEW_VALUE "ÐÐ¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ #%d" + IDS_ERROR "ÐÑÐ¸Ð±ÐºÐ°" + IDS_WARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" + IDS_BAD_KEY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ ÐºÐ»ÑÑ '%s'" + IDS_BAD_VALUE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ '%s'" + IDS_UNSUPPORTED_TYPE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»ÑÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ð° (%ld)" + IDS_TOO_BIG_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑÑÐ¾Ðµ (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "ÐÐ°Ð½Ð½ÑÐµ ÑÐ¸Ð¿Ð° REG_MULTI_SZ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑ Ð¿ÑÑÑÑÐµ ÑÑÑÐ¾ÐºÐ¸.\nÐÑÐµ Ð¿ÑÑÑÑÐµ ÑÑÑÐ¾ÐºÐ¸ Ð±ÑÐ´ÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ." + IDS_QUERY_DELETE_KEY_ONE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ñ ÐºÐ»ÑÑ?" + IDS_QUERY_DELETE_KEY_MORE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ ÐºÐ»ÑÑÐ¸?" + IDS_QUERY_DELETE_KEY_CONFIRM "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ ÐºÐ»ÑÑÐ°" + IDS_QUERY_DELETE_ONE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ?" + IDS_QUERY_DELETE_MORE "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ?" + IDS_QUERY_DELETE_CONFIRM "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" + IDS_ERR_DELVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" + IDS_ERR_DELETEVALUE "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð²ÑÐµ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ!" + IDS_ERR_RENVAL_CAPTION "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" + IDS_ERR_RENVAL_TOEMPTY "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ %s. Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¿ÑÑÑÐ¾Ðµ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." + IDS_NEW_KEY "ÐÐ¾Ð²ÑÐ¹ ÐºÐ»ÑÑ #%d" + IDS_NEW_VALUE "ÐÐ¾Ð²Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ #%d" END STRINGTABLE DISCARDABLE @@ -386,9 +386,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Ð¤Ð°Ð¹Ð» ÑÐµÐµÑÑÑÐ°" - IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ°" + IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ñ ÑÐµÐµÑÑÑÐ° Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -39,9 +39,9 @@ MENUITEM "&ExportovaÅ¥...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&PripojiÅ¥ registre v sieti...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -374,9 +374,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "VÅ¡etky sÃºbory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Izvozi registrsko datoteko ...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "P&oveÅ¾i se z omreÅ¾nim registrom ...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&Exportera registerfil...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "LÃ¤s in Registerdata...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Ta bort Registerdata...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "LÃ¤s in Registerdata...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Ta bort Registerdata...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Anslut NÃ¤tverksregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Fel" - IDS_WARNING "Varning" + IDS_ERROR "Fel" + IDS_WARNING "Varning" IDS_BAD_KEY "Kan inte lÃ¤sa nyckel '%s'" IDS_BAD_VALUE "Kan inte lÃ¤sa vÃ¤rdet '%s'" IDS_UNSUPPORTED_TYPE "Kan inte Ã¤ndra nycklar av typen %ld" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registerfil" - IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alla filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "&à¸ªà¹à¸à¸à¸à¸...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -55,9 +55,9 @@ MENUITEM "&ÐÐºÑÐ¿Ð¾ÑÑ...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ°Ð¹Ð» ÑÐµÑÑÑÑÑ...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ÐÐ¸Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ°Ð¹Ð» ÑÐµÑÑÑÑÑ...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ°Ð¹Ð» ÑÐµÑÑÑÑÑ...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "ÐÐ¸Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÑÐ°Ð¹Ð» ÑÐµÑÑÑÑÑ...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ Ð¼ÐµÑÐµÐ¶ÐµÐ²Ð¸Ð¹ ÑÐµÑÑÑÑ...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" - IDS_WARNING "Ð£Ð²Ð°Ð³Ð°" + IDS_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" + IDS_WARNING "Ð£Ð²Ð°Ð³Ð°" IDS_BAD_KEY "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ¸ÑÐ¸ ÑÐ¾Ð·Ð´ÑÐ» '%s'" IDS_BAD_VALUE "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ¸ÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ '%s'" IDS_UNSUPPORTED_TYPE "ÐÐµ Ð¼Ð¾Ð¶Ñ ÑÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ ÑÐ¾Ð·Ð´ÑÐ»Ð¸ ÑÑÐ¾Ð³Ð¾ ÑÐ¸Ð¿Ñ (%ld)" @@ -390,9 +390,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "Ð¤Ð°Ð¹Ð» ÑÐµÑÑÑÑÑ" - IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ" + IDS_FLT_REGFILES "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐµÑÑÑÑÑ Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Ð£ÑÑ ÑÐ°Ð¹Ð»Ð¸ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -54,9 +54,9 @@ MENUITEM "å¯¼åº(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "å è½½éç½®åå...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "å¸è½½éç½®åå...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "å è½½éç½®åå...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "å¸è½½éç½®åå...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "è¿æ¥ç½ç»æ³¨åè¡¨(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "éè¯¯" - IDS_WARNING "è¦å" + IDS_ERROR "éè¯¯" + IDS_WARNING "è¦å" IDS_BAD_KEY "ä¸è½æ¥è¯¢é¡¹ '%s'" IDS_BAD_VALUE "ä¸è½æ¥è¯¢å¼ '%s'" IDS_UNSUPPORTED_TYPE "ä¸è½ç¼è¾è¿ç±»åçé¡¹ (%ld)" @@ -389,9 +389,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "æ³¨åæä»¶" - IDS_FLT_REGFILES "æ³¨åæä»¶" + IDS_FLT_REGFILES "æ³¨åæä»¶ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 æ³¨åæä»¶ (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 æ³¨åæä»¶ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "æææä»¶ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -56,9 +56,9 @@ MENUITEM "å¯åº(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "è¼å¥ç»éå...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "å¸è¼ç»éå...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "è¼å¥ç»éå...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "å¸è¼ç»éå...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "é£æ¥ç¶²çµ¡ç»é(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "é¯èª¤" - IDS_WARNING "è¦å" + IDS_ERROR "é¯èª¤" + IDS_WARNING "è¦å" IDS_BAD_KEY "ä¸è½æ¥è©¢æ©ç¢¼ '%s'" IDS_BAD_VALUE "ä¸è½æ¥è©¢å¼ '%s'" IDS_UNSUPPORTED_TYPE "ä¸è½ç·¨è¼¯éé¡åçæ©ç¢¼ (%ld)" @@ -390,9 +390,9 @@ STRINGTABLE DISCARDABLE BEGIN IDS_FLT_REGFILE "ç»éæä»¶" - IDS_FLT_REGFILES "ç»éæä»¶" + IDS_FLT_REGFILES "ç»éæä»¶ (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 ç»éæä»¶ (REGEDIT4)" + IDS_FLT_REGEDIT4 "Win9x/NT4 ç»éæä»¶ (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "æææä»¶ (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Wed Jul 11 21:49:43 2012 @@ -140,8 +140,8 @@ #define IDS_LOAD_HIVE 32859 #define IDS_UNLOAD_HIVE 32860 -#define ID_EDIT_NEW_MULTISTRINGVALUE 32861 -#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 +#define ID_EDIT_NEW_MULTISTRINGVALUE 32861 +#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 @@ -176,9 +176,9 @@ #define IDS_ACCESS_WRITEOWNER 31111 #define IDS_ACCESS_READCONTROL 31112 -#define IDS_INHERIT_THISKEYONLY 31121 -#define IDS_INHERIT_THISKEYANDSUBKEYS 31122 -#define IDS_INHERIT_SUBKEYSONLY 31123 +#define IDS_INHERIT_THISKEYONLY 31121 +#define IDS_INHERIT_THISKEYANDSUBKEYS 31122 +#define IDS_INHERIT_SUBKEYSONLY 31123 #define IDS_EXPAND 31124 #define IDS_COLLAPSE 31125 #define IDS_NEW_KEY 31126

1 0

[tfaber] 56867: [NTDLL_WINETEST] - Add test for RtlIpv4StringToAddress. Already applied upstream.
by tfaber＠svn.reactos.org 11 Jul '12

11 Jul '12

Author: tfaber Date: Wed Jul 11 07:38:36 2012 New Revision: 56867 URL: http://svn.reactos.org/svn/reactos?rev=56867&view=rev Log: [NTDLL_WINETEST] - Add test for RtlIpv4StringToAddress. Already applied upstream. Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Wed Jul 11 07:38:36 2012 @@ -88,6 +88,7 @@ static IMAGE_BASE_RELOCATION *(WINAPI *pLdrProcessRelocationBlock)(void*,UINT,USHORT*,INT_PTR); static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); +static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -131,6 +132,7 @@ pLdrProcessRelocationBlock = (void *)GetProcAddress(hntdll, "LdrProcessRelocationBlock"); pRtlIpv4AddressToStringA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringA"); pRtlIpv4AddressToStringExA = (void *)GetProcAddress(hntdll, "RtlIpv4AddressToStringExA"); + pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1312,6 +1314,177 @@ res, size, buffer); } +static void test_RtlIpv4StringToAddress(void) +{ + NTSTATUS res; + IN_ADDR ip, expected_ip; + PCSTR terminator; + CHAR dummy; + struct + { + PCSTR address; + NTSTATUS res; + int terminator_offset; + int ip[4]; + BOOL strict_is_different; + NTSTATUS res_strict; + int terminator_offset_strict; + int ip_strict[4]; + } tests[] = + { + { "", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { " ", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1.1.1.1", STATUS_SUCCESS, 7, { 1, 1, 1, 1 } }, + { "0.0.0.0", STATUS_SUCCESS, 7, { 0, 0, 0, 0 } }, + { "255.255.255.255", STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, + { "255.255.255.255:123", + STATUS_SUCCESS, 15, { 255, 255, 255, 255 } }, + { "255.255.255.256", STATUS_INVALID_PARAMETER, 15, { -1 } }, + { "255.255.255.4294967295", + STATUS_INVALID_PARAMETER, 22, { -1 } }, + { "255.255.255.4294967296", + STATUS_INVALID_PARAMETER, 21, { -1 } }, + { "255.255.255.4294967297", + STATUS_INVALID_PARAMETER, 21, { -1 } }, + { "a", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "1.1.1.0xaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0XaA", STATUS_SUCCESS, 10, { 1, 1, 1, 170 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x", STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0xff", STATUS_SUCCESS, 10, { 1, 1, 1, 255 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x100", STATUS_INVALID_PARAMETER, 11, { -1 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0xffffffff",STATUS_INVALID_PARAMETER, 16, { -1 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.0x100000000", + STATUS_INVALID_PARAMETER, 16, { -1, 0, 0, 0 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "1.1.1.010", STATUS_SUCCESS, 9, { 1, 1, 1, 8 }, + TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.00", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, + TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.007", STATUS_SUCCESS, 9, { 1, 1, 1, 7 }, + TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.08", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.008", STATUS_SUCCESS, 8, { 1, 1, 1, 0 }, + TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "1.1.1.0a", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, + { "1.1.1.0o10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, + { "1.1.1.0b10", STATUS_SUCCESS, 7, { 1, 1, 1, 0 } }, + { "1.1.1.-2", STATUS_INVALID_PARAMETER, 6, { -1 } }, + { "1", STATUS_SUCCESS, 1, { 0, 0, 0, 1 }, + TRUE, STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "-1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "203569230", STATUS_SUCCESS, 9, { 12, 34, 56, 78 }, + TRUE, STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "1.223756", STATUS_SUCCESS, 8, { 1, 3, 106, 12 }, + TRUE, STATUS_INVALID_PARAMETER, 8, { -1 } }, + { "3.4.756", STATUS_SUCCESS, 7, { 3, 4, 2, 244 }, + TRUE, STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "3.4.756.1", STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "3.4.65536", STATUS_INVALID_PARAMETER, 9, { -1 } }, + { "3.4.5.6.7", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "3.4.5.+6", STATUS_INVALID_PARAMETER, 6, { -1 } }, + { " 3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "\t3.4.5.6", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "3.4.5.6 ", STATUS_SUCCESS, 7, { 3, 4, 5, 6 } }, + { "3. 4.5.6", STATUS_INVALID_PARAMETER, 2, { -1 } }, + { ".", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "..", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "1.", STATUS_INVALID_PARAMETER, 2, { -1 } }, + { "1..", STATUS_INVALID_PARAMETER, 3, { -1 } }, + { ".1", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { ".1.", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { ".1.2.3", STATUS_INVALID_PARAMETER, 1, { -1 } }, + { "0.1.2.3", STATUS_SUCCESS, 7, { 0, 1, 2, 3 } }, + { "0.1.2.3.", STATUS_INVALID_PARAMETER, 7, { -1 } }, + { "[0.1.2.3]", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, + }; + const int testcount = sizeof(tests) / sizeof(tests[0]); + int i; + + if (!pRtlIpv4StringToAddressA) + { + skip("RtlIpv4StringToAddress not available\n"); + return; + } + + if (0) + { + /* leaving either parameter NULL crashes on Windows */ + res = pRtlIpv4StringToAddressA(NULL, FALSE, &terminator, &ip); + res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, NULL, &ip); + res = pRtlIpv4StringToAddressA("1.1.1.1", FALSE, &terminator, NULL); + /* same for the wide char version */ + /* + res = pRtlIpv4StringToAddressW(NULL, FALSE, &terminatorW, &ip); + res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, NULL, &ip); + res = pRtlIpv4StringToAddressW(L"1.1.1.1", FALSE, &terminatorW, NULL); + */ + } + + for (i = 0; i < testcount; i++) + { + /* non-strict */ + terminator = &dummy; + ip.S_un.S_addr = 0xabababab; + res = pRtlIpv4StringToAddressA(tests[i].address, FALSE, &terminator, &ip); + ok(res == tests[i].res, + "[%s] res = 0x%08x, expected 0x%08x\n", + tests[i].address, res, tests[i].res); + ok(terminator == tests[i].address + tests[i].terminator_offset, + "[%s] terminator = %p, expected %p\n", + tests[i].address, terminator, tests[i].address + tests[i].terminator_offset); + if (tests[i].ip[0] == -1) + expected_ip.S_un.S_addr = 0xabababab; + else + { + expected_ip.S_un.S_un_b.s_b1 = tests[i].ip[0]; + expected_ip.S_un.S_un_b.s_b2 = tests[i].ip[1]; + expected_ip.S_un.S_un_b.s_b3 = tests[i].ip[2]; + expected_ip.S_un.S_un_b.s_b4 = tests[i].ip[3]; + } + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, + "[%s] ip = %08x, expected %08x\n", + tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + + if (!tests[i].strict_is_different) + { + tests[i].res_strict = tests[i].res; + tests[i].terminator_offset_strict = tests[i].terminator_offset; + tests[i].ip_strict[0] = tests[i].ip[0]; + tests[i].ip_strict[1] = tests[i].ip[1]; + tests[i].ip_strict[2] = tests[i].ip[2]; + tests[i].ip_strict[3] = tests[i].ip[3]; + } + /* strict */ + terminator = &dummy; + ip.S_un.S_addr = 0xabababab; + res = pRtlIpv4StringToAddressA(tests[i].address, TRUE, &terminator, &ip); + ok(res == tests[i].res_strict, + "[%s] res = 0x%08x, expected 0x%08x\n", + tests[i].address, res, tests[i].res_strict); + ok(terminator == tests[i].address + tests[i].terminator_offset_strict, + "[%s] terminator = %p, expected %p\n", + tests[i].address, terminator, tests[i].address + tests[i].terminator_offset_strict); + if (tests[i].ip_strict[0] == -1) + expected_ip.S_un.S_addr = 0xabababab; + else + { + expected_ip.S_un.S_un_b.s_b1 = tests[i].ip_strict[0]; + expected_ip.S_un.S_un_b.s_b2 = tests[i].ip_strict[1]; + expected_ip.S_un.S_un_b.s_b3 = tests[i].ip_strict[2]; + expected_ip.S_un.S_un_b.s_b4 = tests[i].ip_strict[3]; + } + ok(ip.S_un.S_addr == expected_ip.S_un.S_addr, + "[%s] ip = %08x, expected %08x\n", + tests[i].address, ip.S_un.S_addr, expected_ip.S_un.S_addr); + } +} START_TEST(rtl) { @@ -1336,4 +1509,5 @@ test_LdrProcessRelocationBlock(); test_RtlIpv4AddressToString(); test_RtlIpv4AddressToStringEx(); -} + test_RtlIpv4StringToAddress(); +}

1 0

[tfaber] 56866: [NTDLL_WINETEST] - Sync to Wine 1.5.4 - Reverts r55730 (Skip an obviously nonsensical test of trying to sprintf into NULL)
by tfaber＠svn.reactos.org 11 Jul '12

11 Jul '12

Author: tfaber Date: Wed Jul 11 07:04:50 2012 New Revision: 56866 URL: http://svn.reactos.org/svn/reactos?rev=56866&view=rev Log: [NTDLL_WINETEST] - Sync to Wine 1.5.4 - Reverts r55730 (Skip an obviously nonsensical test of trying to sprintf into NULL) Modified: trunk/rostests/winetests/ntdll/ (props changed) trunk/rostests/winetests/ntdll/atom.c trunk/rostests/winetests/ntdll/error.c trunk/rostests/winetests/ntdll/generated.c trunk/rostests/winetests/ntdll/info.c trunk/rostests/winetests/ntdll/path.c trunk/rostests/winetests/ntdll/pipe.c trunk/rostests/winetests/ntdll/reg.c trunk/rostests/winetests/ntdll/rtl.c trunk/rostests/winetests/ntdll/string.c Propchange: trunk/rostests/winetests/ntdll/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jul 11 07:04:50 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/ntdll/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/ntdll/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/winetests/ntdll/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/rostests/winetests/ntdll/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/atom.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/atom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/atom.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -443,7 +443,7 @@ ok(!res, "Added atom (%x)\n", res); - memset(abi->Name, 0xcc, 255 * sizeof(WCHAR)); + memset( ptr, 0xcc, sizeof(ptr) ); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup\n"); ok(!lstrcmpW(abi->Name, testAtom1), "ok strings\n"); @@ -457,7 +457,7 @@ ok(abi->NameLength == lstrlenW(testAtom1) * sizeof(WCHAR) || broken(abi->NameLength == sizeof(WCHAR)), /* nt4 */ "string length %u\n",abi->NameLength); - memset(abi->Name, 0xcc, lstrlenW(testAtom1) * sizeof(WCHAR)); + memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + lstrlenW(testAtom1) * sizeof(WCHAR); res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "atom lookup %x\n", res); @@ -466,8 +466,8 @@ ok(abi->Name[lstrlenW(testAtom1)] == 0, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1)]); ok(abi->Name[lstrlenW(testAtom1) + 1] == 0xcccc, "buffer overwrite %x\n", abi->Name[lstrlenW(testAtom1) + 1]); + memset( ptr, 0xcc, sizeof(ptr) ); ptr_size = sizeof(ATOM_BASIC_INFORMATION) + 4 * sizeof(WCHAR); - abi->Name[0] = abi->Name[1] = abi->Name[2] = abi->Name[3] = '\0'; res = pNtQueryInformationAtom( atom, AtomBasicInformation, (void*)ptr, ptr_size, NULL ); ok(!res, "couldn't find atom\n"); ok(abi->NameLength == 8, "wrong string length %u\n", abi->NameLength); Modified: trunk/rostests/winetests/ntdll/error.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/error.c?r… ============================================================================== --- trunk/rostests/winetests/ntdll/error.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/error.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -2,7 +2,7 @@ * Unit tests for RtlNtStatusToDosError function * * Copyright (c) 2002 Andriy Palamarchuk - * Copyright (c) 2010 André Hentschel + * Copyright (c) 2010 AndrÃ© Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… ============================================================================== --- trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -375,7 +375,6 @@ /* CCHAR */ TEST_TYPE_SIZE (CCHAR, 1) TEST_TYPE_ALIGN (CCHAR, 1) - TEST_TYPE_SIGNED(CCHAR) } static void test_pack_CHAR(void) @@ -383,7 +382,6 @@ /* CHAR */ TEST_TYPE_SIZE (CHAR, 1) TEST_TYPE_ALIGN (CHAR, 1) - TEST_TYPE_SIGNED(CHAR) } static void test_pack_DWORDLONG(void) @@ -438,42 +436,6 @@ TEST_TYPE_SIZE (EXECUTION_STATE, 4) TEST_TYPE_ALIGN (EXECUTION_STATE, 4) TEST_TYPE_UNSIGNED(EXECUTION_STATE) -} - -static void test_pack_FLOATING_SAVE_AREA(void) -{ -#if 0 // this doesn't exist on amd64 - /* FLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) - TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ControlWord, 0) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, TagWord, 8) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorOffset, 12) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorSelector, 16) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataOffset, 20) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataSelector, 24) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, RegisterArea, 80) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, RegisterArea, 1) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, RegisterArea, 28) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) -#endif } static void test_pack_FPO_DATA(void) @@ -877,7 +839,9 @@ static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void) { /* IMAGE_LOAD_CONFIG_DIRECTORY */ -// TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) +#ifndef __REACTOS__ + TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) +#endif TEST_TYPE_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, 8) TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) @@ -900,7 +864,7 @@ TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 20) -#if 0 // wine headers are broken +#ifndef __REACTOS__ // wine headers are broken TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 24) @@ -1982,17 +1946,6 @@ TEST_TARGET_ALIGN(PEXCEPTION_RECORD, 8) } -static void test_pack_PFLOATING_SAVE_AREA(void) -{ -#if 0 - /* PFLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 8) - TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 8) - TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) - TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) -#endif -} - static void test_pack_PFPO_DATA(void) { /* PFPO_DATA */ @@ -2163,7 +2116,7 @@ /* PIMAGE_LOAD_CONFIG_DIRECTORY */ TEST_TYPE_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) TEST_TYPE_ALIGN (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) -#if 0// wine headers are broken +#ifndef __REACTOS__ // wine headers are broken TEST_TARGET_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 88) #endif TEST_TARGET_ALIGN(PIMAGE_LOAD_CONFIG_DIRECTORY, 8) @@ -3794,7 +3747,6 @@ /* CCHAR */ TEST_TYPE_SIZE (CCHAR, 1) TEST_TYPE_ALIGN (CCHAR, 1) - TEST_TYPE_SIGNED(CCHAR) } static void test_pack_CHAR(void) @@ -3802,7 +3754,6 @@ /* CHAR */ TEST_TYPE_SIZE (CHAR, 1) TEST_TYPE_ALIGN (CHAR, 1) - TEST_TYPE_SIGNED(CHAR) } static void test_pack_DWORDLONG(void) @@ -3857,40 +3808,6 @@ TEST_TYPE_SIZE (EXECUTION_STATE, 4) TEST_TYPE_ALIGN (EXECUTION_STATE, 4) TEST_TYPE_UNSIGNED(EXECUTION_STATE) -} - -static void test_pack_FLOATING_SAVE_AREA(void) -{ - /* FLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) - TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ControlWord, 0) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, TagWord, 8) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorOffset, 12) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorSelector, 16) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataOffset, 20) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataSelector, 24) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, RegisterArea, 80) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, RegisterArea, 1) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, RegisterArea, 28) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) } static void test_pack_FPO_DATA(void) @@ -5397,15 +5314,6 @@ TEST_TARGET_ALIGN(PEXCEPTION_RECORD, 4) } -static void test_pack_PFLOATING_SAVE_AREA(void) -{ - /* PFLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 4) - TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 4) - TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) - TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) -} - static void test_pack_PFPO_DATA(void) { /* PFPO_DATA */ @@ -6933,7 +6841,6 @@ test_pack_EXECUTION_STATE(); test_pack_FARPROC(); test_pack_FLOAT(); - test_pack_FLOATING_SAVE_AREA(); test_pack_FPO_DATA(); test_pack_GENERIC_MAPPING(); test_pack_GLOBALHANDLE(); @@ -7033,7 +6940,6 @@ test_pack_PCWSTR(); test_pack_PEXCEPTION_POINTERS(); test_pack_PEXCEPTION_RECORD(); - test_pack_PFLOATING_SAVE_AREA(); test_pack_PFPO_DATA(); test_pack_PGENERIC_MAPPING(); test_pack_PHANDLE(); Modified: trunk/rostests/winetests/ntdll/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/info.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/info.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -1293,7 +1293,8 @@ { ok (mbi.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "mbi.AllocationProtect is 0x%x, expected 0x%x\n", mbi.AllocationProtect, PAGE_EXECUTE_WRITECOPY); ok (mbi.State == MEM_COMMIT, "mbi.State is 0x%x, expected 0x%X\n", mbi.State, MEM_COMMIT); - ok (mbi.Protect == PAGE_READWRITE, "mbi.Protect is 0x%x, expected 0x%X\n", mbi.Protect, PAGE_READWRITE); + ok (mbi.Protect == PAGE_READWRITE || mbi.Protect == PAGE_WRITECOPY, + "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ } Modified: trunk/rostests/winetests/ntdll/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/path.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/path.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -135,6 +135,7 @@ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\nul.txt", 1000, 6 }, + // ReactOS r54114 { "c:\\nul", 6, 6 }, { NULL, 0 } }; Modified: trunk/rostests/winetests/ntdll/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/pipe.c?re… ============================================================================== --- trunk/rostests/winetests/ntdll/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/pipe.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -147,20 +147,34 @@ timeout.QuadPart = -100000000000ll; -/* create a pipe with sharing = 0 */ - res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/, +/* create a pipe with FILE_OVERWRITE */ + res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 4 /*FILE_OVERWRITE*/, 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); if (!res) CloseHandle(handle); +/* create a pipe with FILE_OVERWRITE_IF */ + res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ, 5 /*FILE_OVERWRITE_IF*/, + 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); + todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + if (!res) + CloseHandle(handle); + +/* create a pipe with sharing = 0 */ + res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/, + 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); + ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + if (!res) + CloseHandle(handle); + /* create a pipe without r/w access */ res = pNtCreateNamedPipeFile(&handle, SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /*FILE_CREATE*/, 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); ok(!res, "NtCreateNamedPipeFile returned %x\n", res); res = pNtQueryInformationFile(handle, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); - todo_wine ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); + ok(res == STATUS_ACCESS_DENIED, "NtQueryInformationFile returned %x\n", res); /* test FILE_CREATE creation disposition */ res = pNtCreateNamedPipeFile(&handle2, SYNCHRONIZE, &attr, &iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, 2 /*FILE_CREATE*/, @@ -172,6 +186,60 @@ CloseHandle(handle); } +static void test_create(void) +{ + HANDLE hserver; + NTSTATUS res; + int j, k; + FILE_PIPE_LOCAL_INFORMATION info; + IO_STATUS_BLOCK iosb; + + static const DWORD access[] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE}; + static const DWORD sharing[] = { FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE }; + static const DWORD pipe_config[]= { 1, 0, 2 }; + + for (j = 0; j < sizeof(sharing) / sizeof(DWORD); j++) { + for (k = 0; k < sizeof(access) / sizeof(DWORD); k++) { + HANDLE hclient; + BOOL should_succeed = TRUE; + + res = create_pipe(&hserver, sharing[j], FILE_SYNCHRONOUS_IO_NONALERT); + if (res) { + ok(0, "NtCreateNamedPipeFile returned %x, sharing: %x\n", res, sharing[j]); + continue; + } + + res = pNtQueryInformationFile(hserver, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for server returned %x, sharing: %x\n", res, sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); + + hclient = CreateFileW(testpipe, access[k], 0, 0, OPEN_EXISTING, 0, 0); + if (hclient != INVALID_HANDLE_VALUE) { + res = pNtQueryInformationFile(hclient, &iosb, &info, sizeof(info), (FILE_INFORMATION_CLASS)24); + ok(!res, "NtQueryInformationFile for client returned %x, access: %x, sharing: %x\n", + res, access[k], sharing[j]); + ok(info.NamedPipeConfiguration == pipe_config[j], "wrong duplex status for pipe: %d, expected %d\n", + info.NamedPipeConfiguration, pipe_config[j]); + CloseHandle(hclient); + } + + if (access[k] & GENERIC_WRITE) + should_succeed &= !!(sharing[j] & FILE_SHARE_WRITE); + if (access[k] & GENERIC_READ) + should_succeed &= !!(sharing[j] & FILE_SHARE_READ); + + if (should_succeed) + ok(hclient != INVALID_HANDLE_VALUE, "CreateFile failed for sharing %x, access: %x, GetLastError: %d\n", + sharing[j], access[k], GetLastError()); + else + ok(hclient == INVALID_HANDLE_VALUE, "CreateFile succeeded for sharing %x, access: %x\n", sharing[j], access[k]); + + CloseHandle(hserver); + } + } +} + static BOOL ioapc_called; static void CALLBACK ioapc(void *arg, PIO_STATUS_BLOCK io, ULONG reserved) { @@ -238,8 +306,10 @@ Sleep(400); if (main_thread) { + DWORD ret; userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, main_thread, 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, main_thread, 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); CloseHandle(main_thread); } @@ -264,6 +334,7 @@ HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -275,7 +346,8 @@ /* queue an user apc before calling listen */ userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(res == STATUS_CANCELLED, "NtFsControlFile returned %x\n", res); @@ -332,6 +404,7 @@ HANDLE hPipe; NTSTATUS res; HANDLE hThread; + DWORD ret; memset(&iosb, 0x55, sizeof(iosb)); @@ -345,7 +418,8 @@ ok(hThread != INVALID_HANDLE_VALUE, "can't create thread, GetLastError: %x\n", GetLastError()); userapc_called = FALSE; - ok(pQueueUserAPC(&userapc, GetCurrentThread(), 0), "can't queue user apc, GetLastError: %x\n", GetLastError()); + ret = pQueueUserAPC(&userapc, GetCurrentThread(), 0); + ok(ret, "can't queue user apc, GetLastError: %x\n", GetLastError()); res = listen_pipe(hPipe, hEvent, &iosb, TRUE); todo_wine ok(!res, "NtFsControlFile returned %x\n", res); @@ -413,6 +487,9 @@ trace("starting invalid create tests\n"); test_create_invalid(); + trace("starting create tests\n"); + test_create(); + trace("starting overlapped tests\n"); test_overlapped(); Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -396,7 +396,8 @@ /* Only attributes */ status = pNtCreateKey(NULL, 0, &attr, 0, 0, 0, 0); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_ACCESS_DENIED /* Win7 */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_ACCESS_DENIED, got: 0x%08x\n", status); /* Length > sizeof(OBJECT_ATTRIBUTES) */ attr.Length *= 2; @@ -1243,6 +1244,41 @@ pNtClose( key64 ); } +static void test_long_value_name(void) +{ + HANDLE key; + NTSTATUS status, expected; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ValName; + DWORD i; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_WRITE|KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + ValName.MaximumLength = 0xfffc; + ValName.Length = ValName.MaximumLength - sizeof(WCHAR); + ValName.Buffer = HeapAlloc(GetProcessHeap(), 0, ValName.MaximumLength); + for (i = 0; i < ValName.Length / sizeof(WCHAR); i++) + ValName.Buffer[i] = 'a'; + ValName.Buffer[i] = 0; + + status = pNtDeleteValueKey(key, &ValName); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtDeleteValueKey with nonexistent long value name returned 0x%08x\n", status); + status = pNtSetValueKey(key, &ValName, 0, REG_DWORD, &i, sizeof(i)); + ok(status == STATUS_INVALID_PARAMETER || broken(status == STATUS_SUCCESS) /* nt4 */, + "NtSetValueKey with long value name returned 0x%08x\n", status); + expected = (status == STATUS_SUCCESS) ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND; + status = pNtDeleteValueKey(key, &ValName); + ok(status == expected, "NtDeleteValueKey with long value name returned 0x%08x\n", status); + + status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, NULL, 0, &i); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryValueKey with nonexistent long value name returned 0x%08x\n", status); + + pRtlFreeUnicodeString(&ValName); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1264,6 +1300,7 @@ test_RtlpNtQueryValueKey(); test_NtFlushKey(); test_NtQueryValueKey(); + test_long_value_name(); test_NtDeleteKey(); test_symlinks(); test_redirection(); Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -1154,7 +1154,7 @@ CHAR buffer[20]; CHAR *res; IN_ADDR ip; - DWORD len; + DWORD_PTR len; if (!pRtlIpv4AddressToStringA) { @@ -1173,13 +1173,10 @@ len = strlen(buffer); ok(res == (buffer + len), "got %p with '%s' (expected %p)\n", res, buffer, buffer + len); - if (0) { - /* this crashes in windows */ - res = pRtlIpv4AddressToStringA(&ip, NULL); - ok( (res == (char *)~0) || - broken(res == (char *)0 + len), /* XP and w2003 */ - "got %p (expected ~0)\n", res); - } + res = pRtlIpv4AddressToStringA(&ip, NULL); + ok( (res == (char *)~0) || + broken(res == (char *)len), /* XP and w2003 */ + "got %p (expected ~0)\n", res); if (0) { /* this crashes in windows */ Modified: trunk/rostests/winetests/ntdll/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/string.c?… ============================================================================== --- trunk/rostests/winetests/ntdll/string.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/string.c [iso-8859-1] Wed Jul 11 07:04:50 2012 @@ -1146,8 +1146,8 @@ static void test_wcslwrupr(void) { static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; - static WCHAR emptyW[1] = {0}; - static const WCHAR constemptyW[1] = {0}; + static WCHAR emptyW[] = {0}; + static const WCHAR constemptyW[] = {0}; if (0) /* crashes on native */ { @@ -1255,9 +1255,9 @@ static void test_bsearch(void) { int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; - int *x, l, i,j ; - - /* just try all all sizes */ + int *x, l, i, j; + + /* just try all array sizes */ for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { for (i=0;i<j;i++) { l = arr[i];

1 0

[fireball] 56865: [EXPLORER] - Edijs Kolesnikovics: Expand environment strings during processing startup items in HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run. See issue #6053 fo...
by fireball＠svn.reactos.org 10 Jul '12

10 Jul '12

Author: fireball Date: Tue Jul 10 22:48:23 2012 New Revision: 56865 URL: http://svn.reactos.org/svn/reactos?rev=56865&view=rev Log: [EXPLORER] - Edijs Kolesnikovics: Expand environment strings during processing startup items in HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run. See issue #6053 for more details. Modified: trunk/reactos/base/shell/explorer/services/startup.c Modified: trunk/reactos/base/shell/explorer/services/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/servic… ============================================================================== --- trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/services/startup.c [iso-8859-1] Tue Jul 10 22:48:23 2012 @@ -364,6 +364,7 @@ { DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; DWORD type; + WCHAR szCmdLineExp[MAX_PATH+1]= L"\0"; --i; @@ -390,7 +391,8 @@ continue; } - if ((res=runCmd(szCmdLine, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) + ExpandEnvironmentStrings(szCmdLine, szCmdLineExp, sizeof(szCmdLineExp)); + if ((res=runCmd(szCmdLineExp, NULL, bSynchronous, FALSE))==INVALID_RUNCMD_RETURN) { printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); }

1 0

[jimtabor] 56864: [User32] - Fixing graphics glitches when clicking the arrow button. See bug 4251.
by jimtabor＠svn.reactos.org 10 Jul '12

10 Jul '12

Author: jimtabor Date: Tue Jul 10 22:40:59 2012 New Revision: 56864 URL: http://svn.reactos.org/svn/reactos?rev=56864&view=rev Log: [User32] - Fixing graphics glitches when clicking the arrow button. See bug 4251. Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c Modified: trunk/reactos/win32ss/user/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/scrollbar.c [iso-8859-1] Tue Jul 10 22:40:59 2012 @@ -895,6 +895,9 @@ ScrollBarInfo.rgstate[ScrollTrackHitTest] &= ~STATE_SYSTEM_PRESSED; NewInfo.rgstate[ScrollTrackHitTest] = ScrollBarInfo.rgstate[ScrollTrackHitTest]; NtUserSetScrollBarInfo(Wnd, IntScrollGetObjectId(SBType), &NewInfo); + + IntDrawScrollArrows(Dc, &ScrollBarInfo, Vertical); + break; case WM_SYSTIMER:

1 0

[fireball] 56863: [SCSIPORT] - Don't stop enumerating functions of a PCI device if current function returned invalid vendor id. Also add a check for returned data size. This fixes detection of some...
by fireball＠svn.reactos.org 10 Jul '12

10 Jul '12

Author: fireball Date: Tue Jul 10 20:58:34 2012 New Revision: 56863 URL: http://svn.reactos.org/svn/reactos?rev=56863&view=rev Log: [SCSIPORT] - Don't stop enumerating functions of a PCI device if current function returned invalid vendor id. Also add a check for returned data size. This fixes detection of some storage controllers, e.g. Intel ICH8, ICH9, ICH10 chipsets. Thanks to Alter (UniATA author) for finding the problem and providing solution. See issue #7147 for more details. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Tue Jul 10 20:58:34 2012 @@ -2350,10 +2350,13 @@ if (DataSize == 0) return FALSE; - /* If result is PCI_INVALID_VENDORID, then this device has no more - "Functions" */ - if (PciConfig.VendorID == PCI_INVALID_VENDORID) - break; + /* Check if result is PCI_INVALID_VENDORID or too small */ + if ((DataSize < (ULONG)PCI_COMMON_HDR_LENGTH) || + (PciConfig.VendorID == PCI_INVALID_VENDORID)) + { + /* Continue to try the next function */ + continue; + } sprintf (VendorIdString, "%04hx", PciConfig.VendorID); sprintf (DeviceIdString, "%04hx", PciConfig.DeviceID);

1 0

[tfaber] 56862: [USER32_APITEST] - Handle some wsprintf-specific cases in the CRT sprintf test
by tfaber＠svn.reactos.org 10 Jul '12

10 Jul '12

Author: tfaber Date: Tue Jul 10 08:07:44 2012 New Revision: 56862 URL: http://svn.reactos.org/svn/reactos?rev=56862&view=rev Log: [USER32_APITEST] - Handle some wsprintf-specific cases in the CRT sprintf test Modified: trunk/rostests/apitests/crt/sprintf.c Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Tue Jul 10 08:07:44 2012 @@ -151,9 +151,11 @@ ok_str(Buffer, "hello"); ok_int(Length, 5); - /* TODO: wsprintf can't do * */ -#ifndef TEST_USER32 Length = sprintf(Buffer, "%*s", -8, "hello"); +#ifdef TEST_USER32 + ok_str(Buffer, "*s"); + ok_int(Length, 2); +#else ok_str(Buffer, "hello "); ok_int(Length, 8); #endif @@ -179,13 +181,16 @@ ok_str(Buffer, "hell"); ok_int(Length, 4); -#ifndef TEST_USER32 StartSeh() Length = sprintf(Buffer, "%.*s", -1, "hello"); - ok_str(Buffer, "hello"); - ok_int(Length, 5); - EndSeh(STATUS_SUCCESS); -#endif +#ifdef TEST_USER32 + ok_str(Buffer, "*s"); + ok_int(Length, 2); +#else + ok_str(Buffer, "hello"); + ok_int(Length, 5); +#endif + EndSeh(STATUS_SUCCESS); String = AllocateGuarded(6); if (!String) @@ -219,32 +224,47 @@ ok_int(Length, 4); EndSeh(STATUS_SUCCESS); - /* TODO: wsprintf can't do *, and also seems to use strlen despite a - * precision being given */ -#ifndef TEST_USER32 String[5] = '!'; StartSeh() Length = sprintf(Buffer, "%.5s", String); ok_str(Buffer, "hello"); ok_int(Length, 5); - EndSeh(STATUS_SUCCESS); +#ifdef TEST_USER32 + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif StartSeh() Length = sprintf(Buffer, "%.6s", String); ok_str(Buffer, "hello!"); ok_int(Length, 6); - EndSeh(STATUS_SUCCESS); +#ifdef TEST_USER32 + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif StartSeh() Length = sprintf(Buffer, "%.*s", 5, String); - ok_str(Buffer, "hello"); - ok_int(Length, 5); +#ifdef TEST_USER32 + ok_str(Buffer, "*s"); + ok_int(Length, 2); +#else + ok_str(Buffer, "hello"); + ok_int(Length, 5); +#endif EndSeh(STATUS_SUCCESS); StartSeh() Length = sprintf(Buffer, "%.*s", 6, String); +#ifdef TEST_USER32 + ok_str(Buffer, "*s"); + ok_int(Length, 2); +#else ok_str(Buffer, "hello!"); ok_int(Length, 6); +#endif EndSeh(STATUS_SUCCESS); /* both field width and precision */ @@ -252,20 +272,33 @@ Length = sprintf(Buffer, "%8.5s", String); ok_str(Buffer, " hello"); ok_int(Length, 8); - EndSeh(STATUS_SUCCESS); +#ifdef TEST_USER32 + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif StartSeh() Length = sprintf(Buffer, "%-*.6s", -8, String); +#ifdef TEST_USER32 + ok_str(Buffer, "*.6s"); + ok_int(Length, 4); +#else ok_str(Buffer, "hello! "); ok_int(Length, 8); +#endif EndSeh(STATUS_SUCCESS); StartSeh() Length = sprintf(Buffer, "%*.*s", -8, 6, String); +#ifdef TEST_USER32 + ok_str(Buffer, "*.*s"); + ok_int(Length, 4); +#else ok_str(Buffer, "hello! "); ok_int(Length, 8); - EndSeh(STATUS_SUCCESS); -#endif +#endif + EndSeh(STATUS_SUCCESS); FreeGuarded(String); }

1 0

[ekohl] 56861: [SERVICES] Correct comments and code error introduced in rev 56844. Patch by Hermes Belusca. I used a helper variable to determine whether or not ScmDeleteNamedPipeCriticalSection mu...
by ekohl＠svn.reactos.org 08 Jul '12

08 Jul '12

Author: ekohl Date: Sun Jul 8 23:08:19 2012 New Revision: 56861 URL: http://svn.reactos.org/svn/reactos?rev=56861&view=rev Log: [SERVICES] Correct comments and code error introduced in rev 56844. Patch by Hermes Belusca. I used a helper variable to determine whether or not ScmDeleteNamedPipeCriticalSection must be called. Changing the order in which functions are called could cause a deadlock. See issue #7172 for more details. Modified: trunk/reactos/base/system/services/lock.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c Modified: trunk/reactos/base/system/services/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lock.… ============================================================================== --- trunk/reactos/base/system/services/lock.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lock.c [iso-8859-1] Sun Jul 8 23:08:19 2012 @@ -22,9 +22,9 @@ /* FUNCTIONS *****************************************************************/ /* - * TRUE if locked by the Service Control Manager, FALSE otherwise + * NOTE: IsServiceController is TRUE if locked by the + * Service Control Manager, and FALSE otherwise. */ - DWORD ScmAcquireServiceStartLock(IN BOOL IsServiceController, OUT LPSC_RPC_LOCK lpLock) @@ -146,7 +146,7 @@ lpLockStatus->dwLockDuration = 0; } - /* Unlock the whole SC manager */ + /* Unlock the service database */ ScmUnlockDatabase(); return; @@ -178,7 +178,7 @@ lpLockStatus->dwLockDuration = 0; } - /* Unlock the whole SC manager */ + /* Unlock the service database */ ScmUnlockDatabase(); return; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Jul 8 23:08:19 2012 @@ -2877,7 +2877,7 @@ return ERROR_ACCESS_DENIED; } - /* HACK: we need to compute instead the real length of the owner name */ + /* FIXME: we need to compute instead the real length of the owner name */ dwRequiredSize = sizeof(QUERY_SERVICE_LOCK_STATUSW) + sizeof(WCHAR); *pcbBytesNeeded = dwRequiredSize; @@ -4243,16 +4243,13 @@ } } - /* Start the service */ - dwError = ScmStartService(lpService, argc, lpVector); - /* Acquire the service start lock until the service has been started */ dwError = ScmAcquireServiceStartLock(TRUE, &Lock); if (dwError != ERROR_SUCCESS) goto done; - /* Start the service */ - dwError = ScmStartService(lpService, argc, lpVector); + /* Start the service */ + dwError = ScmStartService(lpService, argc, lpVector); /* Release the service start lock */ ScmReleaseServiceStartLock(&Lock); Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Jul 8 23:08:19 2012 @@ -378,6 +378,7 @@ { HANDLE hScmStartEvent = NULL; SC_RPC_LOCK Lock = NULL; + BOOL bDeleteCriticalSection = FALSE; DWORD dwError; DPRINT("SERVICES: Service Control Manager\n"); @@ -442,6 +443,7 @@ AcquireLoadDriverPrivilege(); ScmInitNamedPipeCriticalSection(); + bDeleteCriticalSection = TRUE; /* Acquire the service start lock until autostart services have been started */ dwError = ScmAcquireServiceStartLock(TRUE, &Lock); @@ -465,7 +467,8 @@ WaitForSingleObject(hScmShutdownEvent, INFINITE); done: - ScmDeleteNamedPipeCriticalSection(); + if (bDeleteCriticalSection == TRUE) + ScmDeleteNamedPipeCriticalSection(); /* Close the shutdown event */ if (hScmShutdownEvent != NULL)

1 0

← Newer
1
...
12
13
14
15
16
17
18
19
20
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 July 2012