Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[fireball] 29280: - Add ros_glue.cpp for implementing CrNt stubs. - Start changing CrNt to actual ReactOS functions (no need for supporting different versions / importing CrossNT lib).
by fireball＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: fireball Date: Fri Sep 28 16:35:41 2007 New Revision: 29280 URL: http://svn.reactos.org/svn/reactos?rev=29280&view=rev Log: - Add ros_glue.cpp for implementing CrNt stubs. - Start changing CrNt to actual ReactOS functions (no need for supporting different versions / importing CrossNT lib). Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp (with props) Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 16:35:41 2007 @@ -2648,7 +2648,7 @@ for (j = 0; j < 26; j += 2) { // Build a buffer based on the identify data. - MOV_DW_SWP(vendorId[j], ((PUCHAR)LunExt->IdentifyData.ModelNumber)[j]); + vendorId[j] = RtlUshortByteSwap(((PUCHAR)LunExt->IdentifyData.ModelNumber)[j]); } if (!AtapiStringCmp (vendorId, "CD-ROM CDR", 11)) { @@ -3054,9 +3054,9 @@ chan = &(deviceExtension->chan[c]); - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(chan->CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) == CHECK_INTR_DETECTED) { + if((ULONG)InterlockedCompareExchange(&chan->CheckIntr, + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) == CHECK_INTR_DETECTED) { //ASSERT(!deviceExtension->simplexOnly); chan->DpcState = DPC_STATE_ISR; if(!AtapiInterrupt__(HwDeviceExtension, (UCHAR)c)) { @@ -3144,17 +3144,17 @@ // if (deviceExtension->chan[c].CheckIntr == CHECK_INTR_DETECTED) { // deviceExtension->chan[c].CheckIntr = CHECK_INTR_ACTIVE; // } - c_state = (ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED); + c_state = (ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED); if(c_state == CHECK_INTR_IDLE) { // c_state = deviceExtension->chan[c].CheckIntr; // if (deviceExtension->chan[c].CheckIntr == CHECK_INTR_IDLE) { // deviceExtension->chan[c].CheckIntr = CHECK_INTR_ACTIVE // } - c_state = (ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_IDLE); + c_state = (ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_IDLE); } } while(c_state == CHECK_INTR_CHECK); KdPrint2((PRINT_PREFIX "AtapiInterrupt(base): locked\n")); @@ -3241,9 +3241,9 @@ continue; } - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_CHECK, - (PVOID)CHECK_INTR_IDLE) != CHECK_INTR_IDLE) { + if((ULONG)CrNtInterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_CHECK, + CHECK_INTR_IDLE) != CHECK_INTR_IDLE) { KdPrint2((PRINT_PREFIX "AtapiInterrupt2: !CHECK_INTR_IDLE\n")); // hunt on unexpected intr (Some devices generate double interrupts, // some controllers (at least CMD649) interrupt twice with small delay. @@ -3296,9 +3296,9 @@ if(!(deviceExtension->chan[c].ChannelCtrlFlags & CTRFLAGS_DPC_REQ)) { - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(deviceExtension->chan[c].CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { + if((ULONG)InterlockedCompareExchange(&(deviceExtension->chan[c].CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { continue; } @@ -3350,9 +3350,9 @@ } else { // check if other channel(s) interrupted // must do nothing in simplex mode - if((ULONG)CrNtInterlockedCompareExchange((PVOID*)&(chan->CheckIntr), - (PVOID)CHECK_INTR_ACTIVE, - (PVOID)CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { + if((ULONG)CrNtInterlockedCompareExchange(&(chan->CheckIntr), + CHECK_INTR_ACTIVE, + CHECK_INTR_DETECTED) != CHECK_INTR_DETECTED) { continue; } //ASSERT(!deviceExtension->simplexOnly); @@ -5569,7 +5569,7 @@ sectors)); // Get starting sector number from CDB. - MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); + startingSector = RtlUlongByteSwap((ULONG)((PCDB)Srb->Cdb)->CDB10.LBA); MOV_DW_SWP(sectorCount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); KdPrint2((PRINT_PREFIX @@ -6345,7 +6345,7 @@ // Fill in vendor identification fields. for (i = 0; i < 24; i += 2) { - MOV_DW_SWP(inquiryData->VendorId[i], ((PUCHAR)identifyData->ModelNumber)[i]); + inquiryData->VendorId[i] = RtlUshortByteSwap(((PUCHAR)identifyData->ModelNumber)[i]); } /* // Initialize unused portion of product id. @@ -6356,7 +6356,7 @@ // Move firmware revision from IDENTIFY data to // product revision in INQUIRY data. for (i = 0; i < 4; i += 2) { - MOV_DW_SWP(inquiryData->ProductRevisionLevel[i], ((PUCHAR)identifyData->FirmwareRevision)[i]); + inquiryData->ProductRevisionLevel[i] = RtlUshortByteSwap(((PUCHAR)identifyData->FirmwareRevision)[i]); } status = SRB_STATUS_SUCCESS; Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h Fri Sep 28 16:35:41 2007 @@ -16,7 +16,7 @@ ( SpinLock )) - +#if 0 CROSSNT_DECL( LONG, __fastcall, @@ -62,6 +62,12 @@ IN PVOID ExChange, IN PVOID Comperand )) +#endif + +#define CrNtInterlockedIncrement InterlockedIncrement +#define CrNtInterlockedDecrement InterlockedDecrement +#define CrNtInterlockedExchangeAdd InterlockedExchangeAdd +#define CrNtInterlockedCompareExchange InterlockedCompareExchange CROSSNT_DECL_EX("HAL.DLL", KIRQL,__stdcall, Added: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp (added) +++ trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp Fri Sep 28 16:35:41 2007 @@ -1,0 +1,7 @@ +#include "stdafx.h" + +extern "C" { +ULONG MajorVersion = 0x04; +ULONG MinorVersion = 0x01; +ULONG BuildNumber = 0x0; +} Propchange: trunk/reactos/drivers/storage/ide/uniata/ros_glue.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Fri Sep 28 16:35:41 2007 @@ -16,6 +16,7 @@ <file>id_probe.cpp</file> <file>id_queue.cpp</file> <file>id_sata.cpp</file> + <file>ros_glue.cpp</file> <file>stdafx.cpp</file> <file>idedma.rc</file> </module>

1 0

[hpoussin] 29279: Moved shared define to header file Patch by Marc Piulachs, marc (dot) piulachs (at) codexchange.net See issue #2700 for more details.
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 16:17:19 2007 New Revision: 29279 URL: http://svn.reactos.org/svn/reactos?rev=29279&view=rev Log: Moved shared define to header file Patch by Marc Piulachs, marc (dot) piulachs (at) codexchange.net See issue #2700 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/copy.c Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Fri Sep 28 16:17:19 2007 @@ -46,6 +46,9 @@ /* command line buffer length */ #define CMDLINE_LENGTH 8192 + +/* 16k = max buffer size */ +#define BUFF_SIZE 16384 /* global variables */ extern HANDLE hOut; Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Fri Sep 28 16:17:19 2007 @@ -46,10 +46,7 @@ COPY_RESTART = 0x080, /* /Z */ COPY_BINARY = 0x100, /* /B */ }; - -#define BUFF_SIZE 16384 /* 16k = max buffer size */ - - + INT copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH],

1 0

[hpoussin] 29278: RtlRandom is now part of NDK since r29254
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 16:13:44 2007 New Revision: 29278 URL: http://svn.reactos.org/svn/reactos?rev=29278&view=rev Log: RtlRandom is now part of NDK since r29254 Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c (original) +++ trunk/reactos/base/services/dhcp/dhclient.c Fri Sep 28 16:13:44 2007 @@ -113,13 +113,6 @@ #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len)) time_t scripttime; - -/* XXX Added this since it's not in the NDK ;0/ */ -ULONG -NTAPI -RtlRandom( - IN OUT PULONG Seed - ); /* XXX Implement me */ int check_arp( struct interface_info *ip, struct client_lease *lp ) {

1 0

[hpoussin] 29277: Fix compilation (but not linking!)
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 15:39:34 2007 New Revision: 29277 URL: http://svn.reactos.org/svn/reactos?rev=29277&view=rev Log: Fix compilation (but not linking!) Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/srb.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h Fri Sep 28 15:39:34 2007 @@ -927,30 +927,6 @@ ULONG DeviceNumber ); -/*#define IdeHardReset(BaseIoAddress,result) \ -{\ - UCHAR statusByte;\ - ULONG i;\ - SelectDrive(BaseIoAddress,DeviceNumber); \ - AtapiWritePort1(&BaseIoAddress->AltStatus,/*IDE_DC_DISABLE_INTERRUPTS | *//*IDE_DC_RESET_CONTROLLER );\ -/* ScsiPortStallExecution(50 * 1000);\ - AtapiWritePort1(&BaseIoAddress->AltStatus,IDE_DC_REENABLE_CONTROLLER);\ - /* 5 seconds for reset */ \ -/* for (i = 0; i < 1000 * (1+11); i++) {\ - statusByte = AtapiReadPort1(&BaseIoAddress->AltStatus);\ - if (statusByte != IDE_STATUS_IDLE && statusByte != IDE_STATUS_SUCCESS) {\ - ScsiPortStallExecution((i<1000) ? 5 : 500);\ - } else {\ - break;\ - }\ - }\ - KdPrint2((PRINT_PREFIX "IdeHardReset: Status %x\n", statusByte)); \ - if (i == 1000*1000) {\ - result = FALSE;\ - }\ - result = TRUE;\ -}*/ - #endif //USER_MODE #define IS_RDP(OperationCode)\ @@ -1158,7 +1134,7 @@ ); -//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) \ +//#define AtaCommand(de, devn, chan, cmd, cyl, hd, sec, cnt, feat, flg) extern LONG AtaPio2Mode(LONG pio); Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h Fri Sep 28 15:39:34 2007 @@ -702,18 +702,19 @@ ULONG NextDpcChan; PHW_TIMER HwScsiTimer; LONGLONG DpcTime; -/* +#if 0 PHW_TIMER HwScsiTimer1; PHW_TIMER HwScsiTimer2; LONGLONG DpcTime1; -/* PHW_TIMER CurDpc; - LARGE_INTEGER ActivationTime;*/ - -/* KDPC Dpc; - KTIMER Timer; - PHW_TIMER HwScsiTimer;*/ +// PHW_TIMER CurDpc; +// LARGE_INTEGER ActivationTime; + +// KDPC Dpc; +// KTIMER Timer; +// PHW_TIMER HwScsiTimer; // KSPIN_LOCK QueueSpinLock; // KIRQL QueueOldIrql; +#endif struct _HW_DEVICE_EXTENSION* DeviceExtension; struct _HW_LU_EXTENSION* lun[2]; @@ -731,7 +732,7 @@ LONGLONG IntersectCount; LONGLONG TryReorderCount; LONGLONG TryReorderHeadCount; - LONGLONG TryReorderTailCount; /* in-order requests */ + LONGLONG TryReorderTailCount; // in-order requests #endif //QUEUE_STATISTICS //ULONG BaseMemAddress; @@ -832,7 +833,7 @@ ULONG FirstChannelToCheck; #if 1 HW_LU_EXTENSION lun[IDE_MAX_LUN]; - HW_CHANNEL chan[AHCI_MAX_PORT/*IDE_MAX_CHAN*/]; + HW_CHANNEL chan[AHCI_MAX_PORT]; // IDE_MAX_CHAN #else PHW_LU_EXTENSION lun; PHW_CHANNEL chan; @@ -850,12 +851,12 @@ ULONG ActiveDpcChan; ULONG FirstDpcChan; -/* - PHW_TIMER HwScsiTimer1; - PHW_TIMER HwScsiTimer2; - LONGLONG DpcTime1; - LONGLONG DpcTime2; -*/ + +// PHW_TIMER HwScsiTimer1; +// PHW_TIMER HwScsiTimer2; +// LONGLONG DpcTime1; +// LONGLONG DpcTime2; + ULONG queue_depth; PDEVICE_OBJECT Isr2DevObj; @@ -921,8 +922,8 @@ extern PBUSMASTER_CONTROLLER_INFORMATION BMList; extern ULONG BMListLen; -extern const CHAR retry_Wdma[MAX_RETRIES+1]; -extern const CHAR retry_Udma[MAX_RETRIES+1]; +//extern const CHAR retry_Wdma[MAX_RETRIES+1]; +//extern const CHAR retry_Udma[MAX_RETRIES+1]; extern VOID UniataEnumBusMasterController( Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/config.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/config.h Fri Sep 28 15:39:34 2007 @@ -83,7 +83,7 @@ /* ReactOS-specific defines */ #ifdef DDKAPI #define USE_REACTOS_DDK -#endif DDKAPI +#endif //DDKAPI /* Are we under GNU C (mingw) ??? */ #if __GNUC__ >=3 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 15:39:34 2007 @@ -619,7 +619,7 @@ ULONG DeviceNumber ) { - ULONG c = chan->lChannel; + //ULONG c = chan->lChannel; ULONG i; UCHAR dma_status = 0; KdPrint2((PRINT_PREFIX "AtapiSoftReset:\n")); @@ -947,7 +947,7 @@ KdPrint2((PRINT_PREFIX "AtapiTimerDpc:\n")); lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan; - if(lChannel == -1) { + if(lChannel == (ULONG)-1) { KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no items\n")); return; } @@ -959,7 +959,7 @@ chan->HwScsiTimer = NULL; deviceExtension->FirstDpcChan = chan->NextDpcChan; - if(deviceExtension->FirstDpcChan != -1) { + if(deviceExtension->FirstDpcChan != (ULONG)-1) { recall = TRUE; } @@ -968,7 +968,7 @@ chan->NextDpcChan = -1; lChannel = deviceExtension->ActiveDpcChan = deviceExtension->FirstDpcChan; - if(lChannel == -1) { + if(lChannel == (ULONG)-1) { KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no more items\n")); deviceExtension->FirstDpcChan = deviceExtension->ActiveDpcChan = -1; @@ -1037,7 +1037,7 @@ i = deviceExtension->FirstDpcChan; chan = prev_chan = NULL; - while(i != -1) { + while(i != (ULONG)-1) { prev_chan = chan; chan = &deviceExtension->chan[i]; if(chan->DpcTime > time.QuadPart) { @@ -1822,7 +1822,7 @@ max_ldev = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2; if(CompleteType != RESET_COMPLETE_NONE) { #ifndef UNIATA_CORE - while(CurSrb = UniataGetCurRequest(chan)) { + while((CurSrb = UniataGetCurRequest(chan))) { PATA_REQ AtaReq = (PATA_REQ)(CurSrb->SrbExtension); @@ -2127,7 +2127,7 @@ PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); // ULONG i; UCHAR errorByte; - UCHAR srbStatus; + UCHAR srbStatus = SRB_STATUS_SUCCESS; UCHAR scsiStatus; ULONG ldev = GET_LDEV(Srb); @@ -2966,7 +2966,7 @@ chan->DpcState = DPC_STATE_TIMER; if(!AtapiInterrupt__(HwDeviceExtension, lChannel)) { InterlockedExchange(&(chan->CheckIntr), CHECK_INTR_IDLE); - KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???!!!\n")); + KdPrint2((PRINT_PREFIX "AtapiCallBack: What's fucking this ???\n")); } goto ReturnCallback; } @@ -3104,7 +3104,7 @@ ULONG c, _c; BOOLEAN status = FALSE; ULONG c_state; - ULONG i_res; + ULONG i_res = 0; ULONG pass; BOOLEAN checked[AHCI_MAX_PORT]; @@ -3253,7 +3253,7 @@ } c_count++; - if(i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c)) { + if((i_res = AtapiCheckInterrupt__(deviceExtension, (UCHAR)c))) { KdPrint2((PRINT_PREFIX "AtapiInterrupt2: intr\n")); if(i_res == 2) { @@ -3443,7 +3443,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG status; - ULONG pr_status; + ULONG pr_status = 0; UCHAR dma_status = 0; UCHAR reg8 = 0; UCHAR reg32 = 0; @@ -3583,7 +3583,7 @@ reg32 = AtapiReadPort1(chan, IDX_BM_DeviceSpecific0); KdPrint2((PRINT_PREFIX " Sii DS0 %x\n", reg32)); - if(reg32 == 0xffffffff) { + if(reg32 == (UCHAR)-1) { KdPrint2((PRINT_PREFIX " Sii mio unexpected\n")); return FALSE; } @@ -3806,11 +3806,11 @@ PATA_REQ AtaReq = srb ? (PATA_REQ)(srb->SrbExtension) : NULL; ULONG wordCount = 0, wordsThisInterrupt = DEV_BSIZE/2; - ULONG status; + ULONG status = SRB_STATUS_SUCCESS; UCHAR dma_status = 0; ULONG i; ULONG k; - UCHAR statusByte,interruptReason; + UCHAR statusByte = 0,interruptReason; BOOLEAN atapiDev = FALSE; @@ -5334,7 +5334,7 @@ ULONG ldev = GET_LDEV(Srb); UCHAR DeviceNumber = (UCHAR)(ldev & 1); ULONG startingSector; - ULONG wordCount; + ULONG wordCount = 0; UCHAR statusByte,statusByte2; UCHAR cmd; ULONGLONG lba; @@ -7670,10 +7670,10 @@ KdPrint2((PRINT_PREFIX "AtapiStartIo: Set transfer mode\n")); - if(AtaCtl->SetMode.OrigMode != -1) { + if(AtaCtl->SetMode.OrigMode != (ULONG)-1) { LunExt->OrigTransferMode = (UCHAR)(AtaCtl->SetMode.OrigMode); } - if(AtaCtl->SetMode.MaxMode != -1) { + if(AtaCtl->SetMode.MaxMode != (ULONG)-1) { LunExt->LimitedTransferMode = (UCHAR)(AtaCtl->SetMode.MaxMode); if(LunExt->LimitedTransferMode > LunExt->OrigTransferMode) { @@ -7813,7 +7813,7 @@ Srb); // Remove current Srb & get next one - if(Srb = UniataGetCurRequest(chan)) { + if((Srb = UniataGetCurRequest(chan))) { AtaReq = (PATA_REQ)(Srb->SrbExtension); if(AtaReq->ReqState > REQ_STATE_QUEUED) { // current request is under precessing, thus @@ -7851,7 +7851,7 @@ { int i; UCHAR command; - UCHAR flags; + UCHAR flags = 0; for(i=0, command=0; i<256; i++, command++) { Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp Fri Sep 28 15:39:34 2007 @@ -153,7 +153,7 @@ QueryTable[0].DefaultData = 0; QueryTable[0].DefaultLength = 0; - RtlZeroMemory(QueryTable + 1, sizeof RTL_QUERY_REGISTRY_TABLE); // EOF + RtlZeroMemory(QueryTable + 1, sizeof(RTL_QUERY_REGISTRY_TABLE)); // EOF NTSTATUS status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, L"UniATA\\Parameters\\BadBlocks", Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp Fri Sep 28 15:39:34 2007 @@ -50,7 +50,7 @@ static const CHAR retry_Wdma[MAX_RETRIES+1] = {2, 2, 2,-1,-1,-1}; static const CHAR retry_Udma[MAX_RETRIES+1] = {6, 2,-1,-1,-1,-1}; -PHYSICAL_ADDRESS ph4gb = {0xFFFFFFFF, 0}; +PHYSICAL_ADDRESS ph4gb = {{0xFFFFFFFF, 0}}; VOID cyrix_timing ( @@ -242,7 +242,7 @@ data = (PUCHAR)(chan->DB_IO); } else if(!dma_count || ((LONG)(dma_base) == -1)) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); return FALSE; } @@ -257,7 +257,7 @@ AtaReq->dma_tab[i].count = (dma_count & 0xffff); i++; if (i >= ATA_DMA_ENTRIES) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); return FALSE; } @@ -272,7 +272,7 @@ goto retry_DB_IO; } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { - AtaReq->dma_base = NULL; + AtaReq->dma_base = 0; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } @@ -783,7 +783,7 @@ if(deviceExtension->BaseIoAddressSATA_0.Addr) { //if(ChipFlags & UNIATA_SATA) { /****************/ - /* SATA Generic * + /* SATA Generic */ /****************/ UCHAR ModeByte; Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h Fri Sep 28 15:39:34 2007 @@ -133,4 +133,4 @@ }; // end extern "C" -#endif //__CROSS_VERSION_LIB_NT__H__ +#endif //__CROSS_VERSION_LIB_NT__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Fri Sep 28 15:39:34 2007 @@ -1,5 +1,8 @@ #ifndef __NTDDK_EX__H__ #define __NTDDK_EX__H__ + +#undef ASSERT +#define ASSERT typedef enum _SYSTEM_INFORMATION_CLASS { Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/srb.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/srb.h Fri Sep 28 15:39:34 2007 @@ -190,7 +190,9 @@ // ScsiQuerySupportedControlTypes: // +#ifdef _MSC_VER #pragma warning(disable:4200) +#endif typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST { // @@ -209,7 +211,9 @@ OUT BOOLEAN SupportedTypeList[0]; } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST; -#pragma warning(default:4200) +#ifdef _MSC_VER +#pragma warning(disable:4200) +#endif // // Uninitialized flag value. @@ -419,38 +423,38 @@ // typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_INITIALIZE) ( IN PVOID DeviceExtension ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_STARTIO) ( IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_INTERRUPT) ( IN PVOID DeviceExtension ); typedef -VOID +VOID DDKAPI (*PHW_TIMER) ( IN PVOID DeviceExtension ); typedef -VOID +VOID DDKAPI (*PHW_DMA_STARTED) ( IN PVOID DeviceExtension ); typedef -ULONG +ULONG DDKAPI (*PHW_FIND_ADAPTER) ( IN PVOID DeviceExtension, IN PVOID HwContext, @@ -461,14 +465,14 @@ ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_RESET_BUS) ( IN PVOID DeviceExtension, IN ULONG PathId ); typedef -BOOLEAN +BOOLEAN DDKAPI (*PHW_ADAPTER_STATE) ( IN PVOID DeviceExtension, IN PVOID Context, @@ -476,7 +480,7 @@ ); typedef -SCSI_ADAPTER_CONTROL_STATUS +SCSI_ADAPTER_CONTROL_STATUS DDKAPI (*PHW_ADAPTER_CONTROL) ( IN PVOID DeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, @@ -603,7 +607,7 @@ // SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortInitialize( IN PVOID Argument1, IN PVOID Argument2, @@ -612,14 +616,14 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortFreeDeviceBase( IN PVOID HwDeviceExtension, IN PVOID MappedAddress ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortGetBusData( IN PVOID DeviceExtension, IN ULONG BusDataType, @@ -630,7 +634,7 @@ ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortSetBusDataByOffset( IN PVOID DeviceExtension, IN ULONG BusDataType, @@ -642,7 +646,7 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetDeviceBase( IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, @@ -653,7 +657,7 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetLogicalUnit( IN PVOID HwDeviceExtension, IN UCHAR PathId, @@ -662,7 +666,7 @@ ); SCSIPORT_API -PSCSI_REQUEST_BLOCK +PSCSI_REQUEST_BLOCK DDKAPI ScsiPortGetSrb( IN PVOID DeviceExtension, IN UCHAR PathId, @@ -672,7 +676,7 @@ ); SCSIPORT_API -SCSI_PHYSICAL_ADDRESS +SCSI_PHYSICAL_ADDRESS DDKAPI ScsiPortGetPhysicalAddress( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -681,14 +685,14 @@ ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetVirtualAddress( IN PVOID HwDeviceExtension, IN SCSI_PHYSICAL_ADDRESS PhysicalAddress ); SCSIPORT_API -PVOID +PVOID DDKAPI ScsiPortGetUncachedExtension( IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, @@ -696,13 +700,13 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortFlushDma( IN PVOID DeviceExtension ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortIoMapTransfer( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, @@ -711,7 +715,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortNotification( IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, @@ -719,7 +723,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortLogError( IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, @@ -731,7 +735,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortCompleteRequest( IN PVOID HwDeviceExtension, IN UCHAR PathId, @@ -741,7 +745,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortMoveMemory( IN PVOID WriteBuffer, IN PVOID ReadBuffer, @@ -749,25 +753,25 @@ ); SCSIPORT_API -UCHAR +UCHAR DDKAPI ScsiPortReadPortUchar( IN PUCHAR Port ); SCSIPORT_API -USHORT +USHORT DDKAPI ScsiPortReadPortUshort( IN PUSHORT Port ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortReadPortUlong( IN PULONG Port ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -775,7 +779,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -783,7 +787,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadPortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -791,25 +795,25 @@ ); SCSIPORT_API -UCHAR +UCHAR DDKAPI ScsiPortReadRegisterUchar( IN PUCHAR Register ); SCSIPORT_API -USHORT +USHORT DDKAPI ScsiPortReadRegisterUshort( IN PUSHORT Register ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortReadRegisterUlong( IN PULONG Register ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -817,7 +821,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -825,7 +829,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortReadRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -833,34 +837,34 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortStallExecution( IN ULONG Delay ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUchar( IN PUCHAR Port, IN UCHAR Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUshort( IN PUSHORT Port, IN USHORT Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortUlong( IN PULONG Port, IN ULONG Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUchar( IN PUCHAR Port, IN PUCHAR Buffer, @@ -868,7 +872,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUshort( IN PUSHORT Port, IN PUSHORT Buffer, @@ -876,7 +880,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWritePortBufferUlong( IN PULONG Port, IN PULONG Buffer, @@ -884,28 +888,28 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUchar( IN PUCHAR Register, IN UCHAR Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUshort( IN PUSHORT Register, IN USHORT Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterUlong( IN PULONG Register, IN ULONG Value ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUchar( IN PUCHAR Register, IN PUCHAR Buffer, @@ -913,7 +917,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUshort( IN PUSHORT Register, IN PUSHORT Buffer, @@ -921,7 +925,7 @@ ); SCSIPORT_API -VOID +VOID DDKAPI ScsiPortWriteRegisterBufferUlong( IN PULONG Register, IN PULONG Buffer, @@ -929,13 +933,13 @@ ); SCSIPORT_API -SCSI_PHYSICAL_ADDRESS +SCSI_PHYSICAL_ADDRESS DDKAPI ScsiPortConvertUlongToPhysicalAddress( ULONG UlongAddress ); SCSIPORT_API -ULONG +ULONG DDKAPI ScsiPortConvertPhysicalAddressToUlong( SCSI_PHYSICAL_ADDRESS Address ); @@ -943,7 +947,7 @@ #define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart) SCSIPORT_API -BOOLEAN +BOOLEAN DDKAPI ScsiPortValidateRange( IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, @@ -956,7 +960,7 @@ // begin_ntminitape SCSIPORT_API -VOID +VOID DDKAPI ScsiDebugPrint( ULONG DebugPrintLevel, PCCHAR DebugMessage,

1 0

[fireball] 29276: - Reenable CrossNT stuff. - Fix some #else BLAH / #endif BLAH warnings. - Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now).
by fireball＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: fireball Date: Fri Sep 28 15:01:10 2007 New Revision: 29276 URL: http://svn.reactos.org/svn/reactos?rev=29276&view=rev Log: - Reenable CrossNT stuff. - Fix some #else BLAH / #endif BLAH warnings. - Change SYSTEM_INFORMATION_CLASS structure by what we have in NDK (duplication for now). Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h 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 (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Fri Sep 28 15:01:10 2007 @@ -4061,7 +4061,7 @@ #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4109,7 +4109,7 @@ } #ifndef UNIATA_CORE goto CallTimerDpc2; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); #endif //UNIATA_CORE } @@ -4304,7 +4304,7 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (drq0)\n")); #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4815,7 +4815,7 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: go to DPC (busy)\n")); #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -4873,7 +4873,7 @@ TimerValue = 100; #ifndef UNIATA_CORE goto PostToDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -5018,7 +5018,7 @@ TimerValue = 2000; #ifndef UNIATA_CORE goto CallTimerDpc; -#else UNIATA_CORE +#else //UNIATA_CORE AtapiStallExecution(TimerValue); goto ServiceInterrupt; #endif //UNIATA_CORE @@ -8057,10 +8057,10 @@ ((WinVer_Id() <= WinVer_NT) ? 0 : sizeof(hwInitializationData.w2k)); // Set entry points. - hwInitializationData.comm.HwInitialize = AtapiHwInitialize; - hwInitializationData.comm.HwResetBus = AtapiResetController; - hwInitializationData.comm.HwStartIo = AtapiStartIo; - hwInitializationData.comm.HwInterrupt = AtapiInterrupt; + hwInitializationData.comm.HwInitialize = (PHW_INITIALIZE)AtapiHwInitialize; + hwInitializationData.comm.HwResetBus = (PHW_RESET_BUS)AtapiResetController; + hwInitializationData.comm.HwStartIo = (PHW_STARTIO)AtapiStartIo; + hwInitializationData.comm.HwInterrupt = (PHW_INTERRUPT)AtapiInterrupt; // Specify size of extensions. hwInitializationData.comm.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); @@ -8072,7 +8072,7 @@ // Set PnP-specific API if(WinVer_Id() > WinVer_NT) { hwInitializationData.comm.NeedPhysicalAddresses = TRUE; - hwInitializationData.w2k.HwAdapterControl = AtapiAdapterControl; + hwInitializationData.w2k.HwAdapterControl = (PHW_ADAPTER_CONTROL)AtapiAdapterControl; } KdPrint2((PRINT_PREFIX "\n\nATAPI IDE enum supported BusMaster Devices\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_queue.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_queue.h Fri Sep 28 15:01:10 2007 @@ -38,4 +38,4 @@ IN PHW_CHANNEL chan ); -#endif __UNIATA_COMMAND_QUEUE_SUPPORT__H__ +#endif //__UNIATA_COMMAND_QUEUE_SUPPORT__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h Fri Sep 28 15:01:10 2007 @@ -33,4 +33,4 @@ IN ULONG Action ); -#endif __UNIATA_SATA__H__ +#endif //__UNIATA_SATA__H__ Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h Fri Sep 28 15:01:10 2007 @@ -1,12 +1,13 @@ #ifndef __NTDDK_EX__H__ #define __NTDDK_EX__H__ -typedef enum _SYSTEM_INFORMATION_CLASS { +typedef enum _SYSTEM_INFORMATION_CLASS +{ SystemBasicInformation, SystemProcessorInformation, SystemPerformanceInformation, SystemTimeOfDayInformation, - SystemPathInformation, + SystemPathInformation, /// Obsolete: Use KUSER_SHARED_DATA SystemProcessInformation, SystemCallCountInformation, SystemDeviceInformation, @@ -32,9 +33,9 @@ SystemUnloadGdiDriverInformation, SystemTimeAdjustmentInformation, SystemSummaryMemoryInformation, - SystemNextEventIdInformation, - SystemEventIdsInformation, - SystemCrashDumpInformation, + SystemMirrorMemoryInformation, + SystemPerformanceTraceInformation, + SystemObsolete0, SystemExceptionInformation, SystemCrashDumpStateInformation, SystemKernelDebuggerInformation, @@ -44,12 +45,64 @@ SystemPrioritySeperation, SystemPlugPlayBusInformation, SystemDockInformation, - SystemPowerInformation, + SystemPowerInformationNative, SystemProcessorSpeedInformation, SystemCurrentTimeZoneInformation, - SystemLookasideInformation + SystemLookasideInformation, + SystemTimeSlipNotification, + SystemSessionCreate, + SystemSessionDetach, + SystemSessionInformation, + SystemRangeStartInformation, + SystemVerifierInformation, + SystemAddVerifier, + SystemSessionProcessesInformation, + SystemLoadGdiDriverInSystemSpaceInformation, + SystemNumaProcessorMap, + SystemPrefetcherInformation, + SystemExtendedProcessInformation, + SystemRecommendedSharedDataAlignment, + SystemComPlusPackage, + SystemNumaAvailableMemory, + SystemProcessorPowerInformation, + SystemEmulationBasicInformation, + SystemEmulationProcessorInformation, + SystemExtendedHanfleInformation, + SystemLostDelayedWriteInformation, + SystemBigPoolInformation, + SystemSessionPoolTagInformation, + SystemSessionMappedViewInformation, + SystemHotpatchInformation, + SystemObjectSecurityMode, + SystemWatchDogTimerHandler, + SystemWatchDogTimerInformation, + SystemLogicalProcessorInformation, + SystemWo64SharedInformationObosolete, + SystemRegisterFirmwareTableInformationHandler, + SystemFirmwareTableInformation, + SystemModuleInformationEx, + SystemVerifierTriageInformation, + SystemSuperfetchInformation, + SystemMemoryListInformation, + SystemFileCacheInformationEx, + SystemThreadPriorityClientIdInformation, + SystemProcessorIdleCycleTimeInformation, + SystemVerifierCancellationInformation, + SystemProcessorPowerInformationEx, + SystemRefTraceInformation, + SystemSpecialPoolInformation, + SystemProcessIdInformation, + SystemErrorPortInformation, + SystemBootEnvironmentInformation, + SystemHypervisorInformation, + SystemVerifierInformationEx, + SystemTimeZoneInformation, + SystemImageFileExecutionOptionsInformation, + SystemCoverageInformation, + SystemPrefetchPathInformation, + SystemVerifierFaultsInformation, + MaxSystemInfoClass, } SYSTEM_INFORMATION_CLASS; - NTSYSAPI NTSTATUS @@ -105,7 +158,7 @@ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; typedef unsigned short WORD; -typedef unsigned int BOOL; +//typedef unsigned int BOOL; typedef unsigned long DWORD; typedef unsigned char BYTE; @@ -438,6 +491,7 @@ */ } KTHREAD_HDR, *PKTHREAD_HDR; +#ifdef __REACTOS__ typedef struct _IMAGE_DOS_HEADER { // DOS .EXE header WORD e_magic; // Magic number WORD e_cblp; // Bytes on last page of file @@ -543,6 +597,7 @@ DWORD AddressOfNames; // RVA from base of image DWORD AddressOfNameOrdinals; // RVA from base of image } IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY; +#endif NTHALAPI VOID Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h Fri Sep 28 15:01:10 2007 @@ -6,7 +6,7 @@ #include "stddef.h" #include "stdarg.h" -//#include "inc\CrossNt.h" +#include "inc/CrossNt.h" #include "atapi.h" // includes scsi.h #include "ntdddisk.h"

1 0

[dreimer] 29275: Forgot this translated file.
by dreimer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: dreimer Date: Fri Sep 28 14:49:35 2007 New Revision: 29275 URL: http://svn.reactos.org/svn/reactos?rev=29275&view=rev Log: Forgot this translated file. Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc Fri Sep 28 14:49:35 2007 @@ -41,7 +41,6 @@ Parameter Bezeichnet beliebige Angaben in der Befehlszeile, die von\n\ dem aufgerufenen Batchprogramm benötigt werden." - STRING_CD_HELP, "Wechselt das Verzeichnis oder zeigt dessen Namen an.\n\n\ CHDIR [Laufwerk:][Pfad]\n\ CHDIR[..|.]\n\ @@ -53,12 +52,10 @@ Laufwerk anzuzeigen.\n\ Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt." - STRING_CHCP_HELP, "Zeigt die aktuelle Codepage oder wechselt sie.\n\n\ CHCP [nnn]\n\n\ nnn Codepage angeben.\n\n\ Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." - STRING_CHOICE_HELP, "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option wählen muss.\n\n\ CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ @@ -92,7 +89,6 @@ /P CMD wird permanent und führt autoexec.bat aus\n\ (kann nicht beendet werden).\n\ /T:bf Setzt die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." - STRING_COLOR_HELP1, "Legt die standard Hinter- und Vordergrundfarben für die Konsole fest.\n\n\ COLOR [attr [/F]] \n\n\ @@ -129,7 +125,6 @@ Bestätigen auf.\n\n\ Die Option /Y ist möglicherweise in der Umgebungsvariablen COPYCMD.\n\ ..." - STRING_DATE_HELP1, "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): " @@ -200,8 +195,6 @@ Optionen können in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\ ""-"" vor einer Option setzt die Voreinstellung ausser Kraft, z.B. DIR /-W." - - STRING_DIR_HELP2, " Datenträger in Laufwerk %c ist %s\n" STRING_DIR_HELP3, " Datenträger in Laufwerk %c hat keinen Namen\n" STRING_DIR_HELP4, " Datenträger-Seriennummer ist %04X-%04X\n" @@ -385,6 +378,46 @@ STRING_REN_HELP3, " %lu Dateien umbennant\n" +STRING_REPLACE_HELP1, "Ersetzt Dateien.\n\n\ +REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/A] [/P] [/R] [/W]\n\ +REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [Laufwerk1:][Pfad1]dateiname Bezeichnet die Quelldatei(en).\n\ + [Laufwerk2:][Pfad2] Bezeichnet den Pfad in dem die Dateien ersetzt\n\ + werden sollen.\n\ + /A Fügt neue Dateien dem Zielpfad hinzu. Kann nicht\n\ + mit /S oder /U Parameter genutzt werden.\n\ + /P Wartet auf Bestätigung bevor eine Datei ersetzt\n\ + oder eine Quelldatei hinzugefügt wird.\n\ + /R Ersetzt schreibgeschützte Dateien.\n\ + /S Ersetzt Dateien in allen Unterordnern des Ziel-\n\ + pfades. Kann nicht mit Parameter /A genutzt\n\ + werden.\n\ + /W Wartet vor dem Start bis ein Datenträger\n\ + eingelegt wurde.\n\ + /U Ersetzt (aktualisiert) nur Dateien, die älter\n\ + sind als die Quelldaten.Kann nicht mit Paramater\n\ + /A genutzt werden\n" + +STRING_REPLACE_HELP2, "Quellpfad benötigt\n" + +STRING_REPLACE_HELP3, "Keine Dateien ersetzt\n" + +STRING_REPLACE_HELP4, "%lu Datei(en) ersetzt\n" + +STRING_REPLACE_HELP5, "Ersetze %s\n" + +STRING_REPLACE_HELP6, "Ersetze %s\n" + +STRING_REPLACE_HELP7, "Keine Dateien hinzugefügt\n" + +STRING_REPLACE_HELP8, "%lu Datei(en) hinzugefügt\n" + +STRING_REPLACE_HELP9, "Füge %s hinzu (Y/N) " + +STRING_REPLACE_HELP10, "Ersetze %s (Y/N) " + +STRING_REPLACE_HELP11, "Füge %s hinzu\n" + STRING_SHIFT_HELP, "Verändert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\ SHIFT [DOWN]" @@ -501,7 +534,6 @@ MAX maximieren das Fenster\n\ RESTORE stellt das Fenster wieder her\n\ title neuer Titel" - STRING_HELP1, "Übersicht aller verfügbaren Befehle und deren Kurzbeschreibungen\n\n\ Befehl /? Um nähere Informationen zu einem bestimmten Befehl\n\ @@ -548,6 +580,7 @@ REM Leitet Kommentare in einer Batchdatei.\n\ REN Benennt eine Datei bzw. Dateien um.\n\ RENAME Bennent eine Datei bzw. Dateien um.\n\ +REPLACE Ersetzt Dateien.\n\ RMDIR Löscht ein Verzeichnis.\n\ SCREEN Bewegt den Cursor und optional die Ausgabe.\n\ SET Setzt oder löscht die Umgebungsvariablen bzw. zeigt sie an.\n\ @@ -563,10 +596,8 @@ Datenträger geschrieben werden.\n\ VOL Zeigt die Datenträgervolumebezeichnung und die Seriennummer an.\n" - STRING_CHOICE_OPTION, "JN" STRING_COPY_OPTION, "JNA" - STRING_ALIAS_ERROR, "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" STRING_BATCH_ERROR, "Es trat ein Fehler auf, während die Batch-Datei geöffnet wurde.\n" @@ -604,21 +635,13 @@ STRING_FREE_ERROR2, "keine Bezeichnung" STRING_GOTO_ERROR1, "Keine Sprungmarke für GOTO gesetzt" STRING_GOTO_ERROR2, "Sprungmarke '%s' wurde nicht gefunden\n" - STRING_MOVE_ERROR1, "[OK]\n" STRING_MOVE_ERROR2, "[FEHLER]\n" - STRING_REN_ERROR1, "MoveFile() ist fehlgeschlagen. Fehler: %lu\n" - STRING_START_ERROR1, "Derzeit noch kein Batch Support!" - STRING_TIME_ERROR1, "Ungültige Zeit." - STRING_TYPE_ERROR1, "Ungültige Option '/%s'\n" - STRING_WINDOW_ERROR1, "Fenster nicht gefunden" - - STRING_ERROR_PARAMETERF_ERROR, "Parameterformat ist nicht korrekt - %c\n" STRING_ERROR_INVALID_SWITCH, "Ungültiger Parameter - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Zu viele Parameter - %s\n" @@ -632,9 +655,14 @@ STRING_ERROR_CANNOTPIPE, "Fehler: Cannot pipe! Temporäre Datei kann nicht geöffnet werden!\n" STRING_ERROR_D_PAUSEMSG, "Drücken Sie eine beliebige Taste . . ." STRING_ERROR_DRIVER_NOT_READY, "Laufwerk ist nicht bereit" - STRING_PATH_ERROR, "CMD: Nicht in environment '%s'\n" - +STRING_REPLACE_ERROR1, "Ungültiger Parameter - %s\n" +STRING_REPLACE_ERROR2, "Pfad wurde nicht gefunden - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Zugriff verweigert - %s\n" +STRING_REPLACE_ERROR6, "Keine Dateien gefunden - %s\n" +STRING_REPLACE_ERROR7, "Erweiterter Fehler 32\n" STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter" STRING_VERSION_RUNVER, " läuft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" @@ -643,7 +671,6 @@ STRING_SCREEN_COL, "ungültige Spalten-Angabe" STRING_SCREEN_ROW, "ungültige Zeilen-Angabe" STRING_TIMER_TIME "Timer %d ist %s: " - STRING_INVALID_OPERAND, "Ungültiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen."

1 0

[hpoussin] 29274: Fix some corner cases when processing <include> elements in .rbuild files
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 14:46:10 2007 New Revision: 29274 URL: http://svn.reactos.org/svn/reactos?rev=29274&view=rev Log: Fix some corner cases when processing <include> elements in .rbuild files Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Fri Sep 28 14:46:10 2007 @@ -59,6 +59,7 @@ Include::ProcessXML () { DirectoryLocation root = SourceDirectory; + const Module *base = module; string relative_path; const XMLAttribute* att = node->GetAttribute ( "base", false ); @@ -70,23 +71,24 @@ "'base' attribute illegal from global <include>" ); if ( att->value == project.name ) - { - relative_path = node->value; - } + base = NULL; else { - const Module* base = project.LocateModule ( att->value ); + base = project.LocateModule ( att->value ); if ( !base ) throw XMLInvalidBuildFileException ( node->location, "<include> attribute 'base' references non-existant project or module '%s'", att->value.c_str() ); root = GetDefaultDirectoryTree ( base ); + } + } - relative_path = base->output->relative_path; - if ( node->value.length () > 0 && node->value != "." ) - relative_path += sSep + node->value; - } + if ( base ) + { + relative_path = base->output->relative_path; + if ( node->value.length () > 0 && node->value != "." ) + relative_path += sSep + node->value; } else relative_path = node->value;

1 0

[dreimer] 29273: Bug 2699: Ukrainian translation update (temarez@yandex.ru) German Translation Update too.
by dreimer＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: dreimer Date: Fri Sep 28 14:03:38 2007 New Revision: 29273 URL: http://svn.reactos.org/svn/reactos?rev=29273&view=rev Log: Bug 2699: Ukrainian translation update (temarez(a)yandex.ru) German Translation Update too. Modified: trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Modified: trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/regedit/clb/lang/uk-UA.rc Fri Sep 28 14:03:38 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Column List Box * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/clb/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for PROJECT - * TRANSLATOR: Rostislav Zabolotny + * FILE: base/applications/regedit/clb/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for clb.dll + * TRANSLATOR: Rostislav Zabolotny, Artem Reznikov */ @@ -11,26 +11,27 @@ IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Column List Box Styles" +CAPTION "Ñòèë³ ñòîâïö³â â ñïèñêàõ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Column List Box ñòèë³", -1, 6, 7, 158, 71 - CHECKBOX "&Ñòàíäàðò", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Êðàé", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ñ&îðòóâàòè", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Ïîâ³äîìèòè", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Ãîðèçîíòàëüíà ñìóãà ïðîêðóòêè", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Ìíîæèííå âèä³ëåííÿ", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED - CHECKBOX "Çî&âí³øíº Âèä³ëåííÿ", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED - CHECKBOX "&Popout Headings", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Ñòèë³ ñòîâïö³â â ñïèñêàõ", -1, 6, 7, 158, 71 + CHECKBOX "Ñ&òàíäàðòíèé", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ìåæà", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ñ&îðòóâàííÿ", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ñïîâ³ùåííÿ", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Âåðòèêàëüíà ñìóãà ïðîêðóòêè", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Íåçâ'ÿçíèé âèá³ð", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Çâ'&ÿçíèé âèá³ð", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "Ñï&ëèâàþ÷³ çàãîëîâêè", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ïðóæèíÿ÷³ ñòîâïö³", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP GROUPBOX "Îñíîâí³ ñòèë³", -1, 6, 80, 158, 34 - CHECKBOX "&Âèäèìèé", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Â³äêëþ÷åíèé", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Ãðóïóâàòè", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Â&èäèìèé", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Â³ä&êëþ÷åíèé", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Ãðóïà", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ïî&çèö³¿ òàáóëÿö³¿", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP CHECKBOX "&Äîçâîëèòè ïðîêðóòêó", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP END + 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 (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc Fri Sep 28 14:03:38 2007 @@ -54,8 +54,8 @@ MENUITEM "&Åêñïîðò...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Çàâàíòàæèòè âóëèê...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Âèâàíòàæèòè âóëèê...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Çàâàíòàæèòè ôàéë ðåºñòðó...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Âèâàíòàæèòè ôàéë ðåºñòðó...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "&Ï³äêëþ÷èòè ìåðåæåâèé ðåºñòð...", ID_REGISTRY_CONNECTNETWORKREGISTRY Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Fri Sep 28 14:03:38 2007 @@ -393,6 +393,46 @@ STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" + +STRING_REPLACE_HELP1, "Replaces files.\n\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [drive1:][path1]filename Specifies the source file or files.\n\ + [drive2:][path2] Specifies the directory where files are to be\n\ + replaced.\n\ + /A Adds new files to destination directory. Cannot\n\ + use with /S or /U switches.\n\ + /P Prompts for confirmation before replacing a file or\n\ + adding a source file.\n\ + /R Replaces read-only files as well as unprotected\n\ + files.\n\ + /S Replaces files in all subdirectories of the\n\ + destination directory. Cannot use with the /A\n\ + switch.\n\ + /W Waits for you to insert a disk before beginning.\n\ + /U Replaces (updates) only files that are older than\n\ + source files. Cannot use with the /A switch.\n" + +STRING_REPLACE_HELP2, "Source path required\n" + +STRING_REPLACE_HELP3, "No files replaced\n" + +STRING_REPLACE_HELP4, "%lu file(s) replaced\n" + +STRING_REPLACE_HELP5, "Replacing %s\n" + +STRING_REPLACE_HELP6, "Replace %s\n" + +STRING_REPLACE_HELP7, "No files added\n" + +STRING_REPLACE_HELP8, "%lu file(s) added\n" + +STRING_REPLACE_HELP9, "Add %s (Y/N) " + +STRING_REPLACE_HELP10, "Replace %s (Y/N) " + +STRING_REPLACE_HELP11, "Adding %s\n" + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -551,6 +591,7 @@ REM Çàïèñóº êîìåíòàð³ (çàóâàæåííÿ) â êîìàíäíèõ ôàéëàõ.\n\ REN Ïåðåéìåíóâàííÿ ôàéëà àáî ôàéë³â.\n\ RENAME Ïåðåéìåíóâàííÿ ôàéëà àáî ôàéë³â.\n\ +REPLACE Çàì³íà ôàéë³â.\n\ RMDIR Ïåðåì³ùåííÿ ïàïêè.\n\ SCREEN Ïåðåì³ùåííÿ êóðñîðà ³ âèâåäåííÿ òåêñòó.\n\ SET Â³äîáðàæåííÿ, âñòàíîâëåííÿ, àáî âèäàëåííÿ çì³ííèõ îòî÷åííÿ ReactOS.\n\ @@ -639,6 +680,14 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" +STRING_REPLACE_ERROR1, "Invalid switch - %s\n" +STRING_REPLACE_ERROR2, "Path not found - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Access denied - %s\n" +STRING_REPLACE_ERROR6, "No files found - %s\n" +STRING_REPLACE_ERROR7, "Extended Error 32\n" + STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d ôàéë(³â) ñêîï³éîâàíî\n" Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Fri Sep 28 14:03:38 2007 @@ -7,6 +7,10 @@ BEGIN GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Monitoreinstellungen", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "Bild&schirmwiederholrate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Versteckt Modi, die der Monitor nicht anzeigen kann.", IDC_PRUNINGCHECK, 13, 106, 225, 10 END - Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Fri Sep 28 14:03:38 2007 @@ -20,4 +20,3 @@ IDS_USEDEFFRQUENCY "Use hardware default setting" IDS_FREQFMT "%u Hertz" END - Modified: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Fri Sep 28 14:03:38 2007 @@ -15,6 +15,16 @@ BEGIN GROUPBOX "Òèï ìîí³òîðà", -1, 7, 3, 237, 52 LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "Â&ëàñòèâîñò³", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Ïàðàìåòðè ìîí³òîðà", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&×àñòîòà îíîâëåííÿ åêðàíà:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Ïðèõîâàòè ðåæèìè, ÿê³ ìîí³òîð íå ìîæå âèêîðèñòîâóâàòè", IDC_PRUNINGCHECK, 13, 106, 225, 10 END +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "Çíà÷åííÿ çà çàìîâ÷óâàííÿì" + IDS_FREQFMT "%u Ãö" +END

1 0

[hpoussin] 29272: Add missing constants
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 12:56:45 2007 New Revision: 29272 URL: http://svn.reactos.org/svn/reactos?rev=29272&view=rev Log: Add missing constants Modified: trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Fri Sep 28 12:56:45 2007 @@ -694,6 +694,12 @@ #define SHGetSpecialFolderPath WINELIB_NAME_AW(SHGetSpecialFolderPath) HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) ; + +/********************************************************************** + * SHCreateShellFolderView () + */ + +HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, IShellView **ppsv); /********************************************************************** * SHGetSetSettings () Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl (original) +++ trunk/reactos/include/psdk/shobjidl.idl Fri Sep 28 12:56:45 2007 @@ -154,6 +154,10 @@ typedef DWORD SHCONTF; + cpp_quote("#define SHCIDS_ALLFIELDS 0x80000000L") + cpp_quote("#define SHCIDS_CANONICALONLY 0x10000000L") + cpp_quote("#define SHCIDS_BITMASK 0xFFFF0000L") + cpp_quote("#define SHCIDS_COLUMNMASK 0x0000FFFFL") cpp_quote("#define SFGAO_CANCOPY DROPEFFECT_COPY") cpp_quote("#define SFGAO_CANMOVE DROPEFFECT_MOVE") cpp_quote("#define SFGAO_CANLINK DROPEFFECT_LINK")

1 0

[hpoussin] 29271: Added history possibilities to right key See issue #2248 for more details.
by hpoussin＠svn.reactos.org 28 Sep '07

28 Sep '07

Author: hpoussin Date: Fri Sep 28 12:51:04 2007 New Revision: 29271 URL: http://svn.reactos.org/svn/reactos?rev=29271&view=rev Log: Added history possibilities to right key See issue #2248 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/history.c Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Fri Sep 28 12:51:04 2007 @@ -247,6 +247,7 @@ /* Prototypes for HISTORY.C */ #ifdef FEATURE_HISTORY +LPCTSTR PeekHistory(INT); VOID History (INT, LPTSTR);/*add entries browse history*/ VOID History_move_to_bottom(VOID);/*F3*/ VOID InitHistory(VOID); Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c Fri Sep 28 12:51:04 2007 @@ -95,6 +95,9 @@ * * 30-Apr-2004 (Filip Navara <xnavara(a)volny.cz>) * Fixed problems when the screen was scrolled away. + * + * 28-September-2007 (Hervé Poussineau) + * Added history possibilities to right key. */ #include <precomp.h> @@ -142,6 +145,9 @@ #ifdef FEATURE_4NT_FILENAME_COMPLETION TCHAR szPath[MAX_PATH]; #endif +#ifdef FEATURE_HISTORY + TCHAR PreviousChar; +#endif /* get screen size */ GetScreenSize (&maxx, &maxy); @@ -508,6 +514,20 @@ curx++; } } +#ifdef FEATURE_HISTORY + else + { + LPCTSTR last = PeekHistory(-1); + if (last && charcount < _tcslen (last)) + { + PreviousChar = last[current]; + ConOutChar(PreviousChar); + GetCursorXY(&curx, &cury); + str[current++] = PreviousChar; + charcount++; + } + } +#endif break; default: Modified: trunk/reactos/base/shell/cmd/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/history.c (original) +++ trunk/reactos/base/shell/cmd/history.c Fri Sep 28 12:51:04 2007 @@ -215,45 +215,6 @@ size--; } - -#if 0 -static -VOID add_before_last(LPTSTR string) -{ - LPHIST_ENTRY tmp,before,after; - - /*delete first entry if maximum number of entries is reached*/ - while(size>=max_size) - del(Top->prev); - - while (_istspace(*string)) - string++; - - if (*string==_T('\0')) - return; - - /*allocte entry and string*/ - tmp=cmd_alloc(sizeof(HIST_ENTRY)); - tmp->string=cmd_alloc((_tcslen(string)+1)*sizeof(TCHAR)); - _tcscpy(tmp->string,string); - - /*set links*/ - before=Bottom->next; - after=before->next; - - tmp->prev=before; - tmp->next=after; - - after->prev=tmp; - before->next=tmp; - - /*set new size*/ - size++; - - -} -#endif/*0*/ - static VOID add_at_bottom(LPTSTR string) { @@ -308,6 +269,42 @@ } +LPCTSTR PeekHistory(INT dir) +{ + LPHIST_ENTRY entry = curr_ptr; + + if (dir == 0) + return NULL; + + if (dir < 0) + { + /* key up */ + if (entry->next == Top || entry == Top) + { +#ifdef WRAP_HISTORY + entry = Bottom; +#else + return NULL; +#endif + } + entry = entry->next; + } + else + { + /* key down */ + if (entry->next == Bottom || entry == Bottom) + { +#ifdef WRAP_HISTORY + entry = Top; +#else + return NULL; +#endif + } + entry = entry->prev; + } + + return entry->string; +} VOID History (INT dir, LPTSTR commandline) { @@ -371,116 +368,4 @@ } } - - - - - -#if 0 - -LPTSTR history = NULL; /*buffer to sotre all the lines*/ -LPTSTR lines[MAXLINES]; /*array of pointers to each line(entry)*/ - /*located in history buffer*/ - -INT curline = 0; /*the last line recalled by user*/ -INT numlines = 0; /*number of entries, included the last*/ - /*empty one*/ - -INT maxpos = 0; /*index of last byte of last entry*/ - - - -VOID History (INT dir, LPTSTR commandline) -{ - - INT count; /*used in for loops*/ - INT length; /*used in the same loops of count*/ - /*both to make room when is full - either history or lines*/ - - /*first time History is called allocate mem*/ - if (!history) - { - history = cmd_alloc (history_size * sizeof (TCHAR)); - lines[0] = history; - history[0] = 0; - } - - if (dir > 0) - { - /* next command */ - if (curline < numlines) - { - curline++; - } - - if (curline == numlines) - { - commandline[0] = 0; - } - else - { - _tcscpy (commandline, lines[curline]); - } - } - else if (dir < 0) - { - /* prev command */ - if (curline > 0) - { - curline--; - } - - _tcscpy (commandline, lines[curline]); - } - else - { - /* add to history */ - /* remove oldest string until there's enough room for next one */ - /* strlen (commandline) must be less than history_size! */ - while ((maxpos + (INT)_tcslen (commandline) + 1 > history_size) || (numlines >= MAXLINES)) - { - length = _tcslen (lines[0]) + 1; - - for (count = 0; count < maxpos && count + (lines[1] - lines[0]) < history_size; count++) - { - history[count] = history[count + length]; - } - - maxpos -= length; - - for (count = 0; count <= numlines && count < MAXLINES; count++) - { - lines[count] = lines[count + 1] - length; - } - - numlines--; -#ifdef DEBUG - ConOutPrintf (_T("Reduced size: %ld lines\n"), numlines); - - for (count = 0; count < numlines; count++) - { - ConOutPrintf (_T("%d: %s\n"), count, lines[count]); - } -#endif - } - - /*copy entry in the history bufer*/ - _tcscpy (lines[numlines], commandline); - numlines++; - - /*set last lines[numlines] pointer next the end of last, valid, - just setted entry (the two lines above)*/ - lines[numlines] = lines[numlines - 1] + _tcslen (commandline) + 1; - maxpos += _tcslen (commandline) + 1; - /* last line, empty */ - - curline = numlines; - } - - return; -} - -#endif - -#endif //#if 0 +#endif //#if FEATURE_HISTORY

1 0

← Newer
1
2
3
4
5
6
7
8
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007