Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

01/01: [NTOKSNRL] Always flush dirty VACB.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c049bd6ef0a906aff0f… commit 54c049bd6ef0a906aff0f434f724765f009485d8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 22:19:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 22:24:30 2018 +0200 [NTOKSNRL] Always flush dirty VACB. Recent changes seem to show that it's not required to be exclusive on VACB to be able to flush it. This commit goes with f2c44aa and fixes the last issues going with copying huge files. There are no longer BSODs (be it in Mm or Cc). I could, with 750MB RAM extract a 2GB file from a 53MB archive and copy a 2,5GB file from a VBox share to the disk. Note that writes are often deferred, so if copy works, it's not that fast for now. Note that it also brings some beloved behavior from Windows: copy times are totally unreliable now when writes are deferred. Little remaining times when actively copying, high remaining times when deferred writes in action. And goes between both... Sorry! ;-) https://xkcd.com/612/ CORE-9696 CORE-11175 --- ntoskrnl/cc/view.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index d3c32f9046..9a7f716854 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -207,8 +207,6 @@ CcRosFlushDirtyPages ( while ((current_entry != &DirtyVacbListHead) && (Target > 0)) { - ULONG Refs; - current = CONTAINING_RECORD(current_entry, ROS_VACB, DirtyVacbListEntry); @@ -234,17 +232,6 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); - /* One reference is added above */ - Refs = CcRosVacbGetRefCount(current); - if ((Refs > 3 && current->PinCount == 0) || - (Refs > 4 && current->PinCount > 1)) - { - current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( - current->SharedCacheMap->LazyWriteContext); - CcRosVacbDecRefCount(current); - continue; - } - KeReleaseGuardedMutex(&ViewLock); Status = CcRosFlushVacb(current);

1 0

01/01: [SDK] Add description to MANUALLY_INITIATED_CRASH (#509)
by David Knapp 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7673837a8577fb7aee4ad… commit 7673837a8577fb7aee4ad9219908eca4d8e5eef2 Author: David Knapp <mazecraze96(a)gmail.com> AuthorDate: Mon Apr 30 06:55:34 2018 -0400 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Mon Apr 30 12:55:34 2018 +0200 [SDK] Add description to MANUALLY_INITIATED_CRASH (#509) --- sdk/include/reactos/mc/bugcodes.mc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/bugcodes.mc b/sdk/include/reactos/mc/bugcodes.mc index d1d701c962..52e18cbf06 100644 --- a/sdk/include/reactos/mc/bugcodes.mc +++ b/sdk/include/reactos/mc/bugcodes.mc @@ -1557,7 +1557,7 @@ Severity=Success Facility=System SymbolicName=MANUALLY_INITIATED_CRASH Language=English -MANUALLY_INITIATED_CRASH +The user manually generated the crash dump. . MessageId=0xE3

1 0

01/01: [NTOSKRNL] Free unused VACB when required.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74c5d8b6bd6e8668eaab5… commit 74c5d8b6bd6e8668eaab5f6467c80cfc2d899825 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 12:10:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 12:10:24 2018 +0200 [NTOSKRNL] Free unused VACB when required. Same mechanism exists in Windows (even their Cc is way different from ours...) where when Cc is out of memory (in their case, out of VACB), we will start scavenge old & unused VACB to free some of the memory. It's useful in case we're operating we big files operations, we may run out of memory where to map VACB for them, so start to scavenge VACB to free some of that memory. With this, I am able to install Qt 4.8.6 with 2,5GB of RAM, scavenging acting when needed! CORE-12081 CORE-14582 --- ntoskrnl/cc/view.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 5bd1f41411..d3c32f9046 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -699,6 +699,88 @@ CcRosMapVacbInKernelSpace( return STATUS_SUCCESS; } +static +BOOLEAN +CcRosFreeUnusedVacb ( + PULONG Count) +{ + ULONG cFreed; + BOOLEAN Freed; + KIRQL oldIrql; + PROS_VACB current; + LIST_ENTRY FreeList; + PLIST_ENTRY current_entry; + + cFreed = 0; + Freed = FALSE; + InitializeListHead(&FreeList); + + KeAcquireGuardedMutex(&ViewLock); + + /* Browse all the available VACB */ + current_entry = VacbLruListHead.Flink; + while (current_entry != &VacbLruListHead) + { + ULONG Refs; + + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + VacbLruListEntry); + current_entry = current_entry->Flink; + + KeAcquireSpinLock(&current->SharedCacheMap->CacheMapLock, &oldIrql); + + /* Only deal with unused VACB, we will free them */ + Refs = CcRosVacbGetRefCount(current); + if (Refs < 2) + { + ASSERT(!current->Dirty); + ASSERT(!current->MappedCount); + ASSERT(Refs == 1); + + /* Reset and move to free list */ + RemoveEntryList(&current->CacheMapVacbListEntry); + RemoveEntryList(&current->VacbLruListEntry); + InitializeListHead(&current->VacbLruListEntry); + InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); + } + + KeReleaseSpinLock(&current->SharedCacheMap->CacheMapLock, oldIrql); + + } + + KeReleaseGuardedMutex(&ViewLock); + + /* And now, free any of the found VACB, that'll free memory! */ + while (!IsListEmpty(&FreeList)) + { + ULONG Refs; + + current_entry = RemoveHeadList(&FreeList); + current = CONTAINING_RECORD(current_entry, + ROS_VACB, + CacheMapVacbListEntry); + InitializeListHead(&current->CacheMapVacbListEntry); + Refs = CcRosVacbDecRefCount(current); + ASSERT(Refs == 0); + ++cFreed; + } + + /* If we freed at least one VACB, return success */ + if (cFreed != 0) + { + Freed = TRUE; + } + + /* If caller asked for free count, return it */ + if (Count != NULL) + { + *Count = cFreed; + } + + return Freed; +} + static NTSTATUS CcRosCreateVacb ( @@ -712,6 +794,7 @@ CcRosCreateVacb ( NTSTATUS Status; KIRQL oldIrql; ULONG Refs; + BOOLEAN Retried; ASSERT(SharedCacheMap); @@ -745,9 +828,25 @@ CcRosCreateVacb ( CcRosVacbIncRefCount(current); + Retried = FALSE; +Retry: + /* Map VACB in kernel space */ Status = CcRosMapVacbInKernelSpace(current); if (!NT_SUCCESS(Status)) { + ULONG Freed; + /* If no space left, try to prune unused VACB + * to recover space to map our VACB + * If it succeed, retry to map, otherwise + * just fail. + */ + if (!Retried && CcRosFreeUnusedVacb(&Freed)) + { + DPRINT("Prunned %d VACB, trying again\n", Freed); + Retried = TRUE; + goto Retry; + } + CcRosVacbDecRefCount(current); ExFreeToNPagedLookasideList(&VacbLookasideList, current); return Status;

1 0

01/01: [NTOSKRNL] Unmark dirty first, and then write.
by Pierre Schweitzer 30 Apr '18

30 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc54e51495f99a90df3bb… commit cc54e51495f99a90df3bb46eacc6f6aead518ca5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Apr 30 10:36:19 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Apr 30 10:36:19 2018 +0200 [NTOSKRNL] Unmark dirty first, and then write. This will avoid trying to flush twice a dirty VACB under high IOs pressure. CORE-14584 --- ntoskrnl/cc/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index e1d064312f..5bd1f41411 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -168,10 +168,12 @@ CcRosFlushVacb ( { NTSTATUS Status; + CcRosUnmarkDirtyVacb(Vacb, TRUE); + Status = CcWriteVirtualAddress(Vacb); - if (NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { - CcRosUnmarkDirtyVacb(Vacb, TRUE); + CcRosMarkDirtyVacb(Vacb); } return Status;

1 0

02/02: [FASTFAT] Implement write IOs defering.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a7d16727a840b631076a… commit 2a7d16727a840b631076aaaa1cd00d09b9a32a80 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 20:42:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 20:42:53 2018 +0200 [FASTFAT] Implement write IOs defering. Before any write operation that would involve caching, ask the cache controler whether writing would make it exceed its memory consumption. If so, queue the write operation for later execution. In case the write operation can wait, then, the FSD operation will be halted until the write is allowed. I could test it successfully by copying huge files from a FAT volume to another. The write is halted until some portions of the file is written to the disk. I could also properly install Qt (SDK) on ReactOS with this and less than 1GB RAM: - https://www.heisspiter.net/~Pierre/rostests/Qt_OS.png - https://www.heisspiter.net/~Pierre/rostests/Qt_OS2.png CORE-12081 CORE-14582 CORE-14313 --- drivers/filesystems/fastfat/misc.c | 9 +++++++++ drivers/filesystems/fastfat/rw.c | 17 +++++++++++++++++ drivers/filesystems/fastfat/vfat.h | 7 +++++++ 3 files changed, 33 insertions(+) diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/fastfat/misc.c index 7797f37ab2..0d291776b5 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/fastfat/misc.c @@ -213,6 +213,15 @@ VfatDispatchRequest( return Status; } +VOID +NTAPI +VfatHandleDeferredWrite( + IN PVOID IrpContext, + IN PVOID Unused) +{ + VfatDispatchRequest((PVFAT_IRP_CONTEXT)IrpContext); +} + NTSTATUS NTAPI VfatBuildRequest( diff --git a/drivers/filesystems/fastfat/rw.c b/drivers/filesystems/fastfat/rw.c index 25114f25cf..4dd59933c4 100644 --- a/drivers/filesystems/fastfat/rw.c +++ b/drivers/filesystems/fastfat/rw.c @@ -895,6 +895,23 @@ VfatWrite( } } + if (!NoCache && !CcCanIWrite(IrpContext->FileObject, Length, CanWait, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE))) + { + BOOLEAN Retrying; + + Retrying = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE); + SetFlag(IrpContext->Flags, IRPCONTEXT_DEFERRED_WRITE); + + Status = STATUS_PENDING; + CcDeferWrite(IrpContext->FileObject, VfatHandleDeferredWrite, + IrpContext, NULL, Length, Retrying); + + DPRINT1("Dererring write!\n"); + + goto ByeBye; + } + if (IsVolume) { Resource = &IrpContext->DeviceExt->DirResource; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 5bb5289feb..cb38b16699 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -544,6 +544,7 @@ DOSDATE, *PDOSDATE; #define IRPCONTEXT_COMPLETE 0x0002 #define IRPCONTEXT_QUEUE 0x0004 #define IRPCONTEXT_PENDINGRETURNED 0x0008 +#define IRPCONTEXT_DEFERRED_WRITE 0x0010 typedef struct { @@ -1085,6 +1086,12 @@ vfatReportChange( IN ULONG FilterMatch, IN ULONG Action); +VOID +NTAPI +VfatHandleDeferredWrite( + IN PVOID IrpContext, + IN PVOID Unused); + /* pnp.c */ NTSTATUS

1 0

01/02: [NTOSKRNL] Fix lazy writer for in-use VACB.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2c44aa4838de066069a5… commit f2c44aa4838de066069a532758965522f482de10 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 20:34:28 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 20:42:53 2018 +0200 [NTOSKRNL] Fix lazy writer for in-use VACB. Adjusting refcount and enabling lazy-write for pinned VACB makes it actually more efficient, often purging data to disk, reducing memory stress for the system. This is required for defering writes. This commit unfortunately (?) reverts a previous revert. CORE-12081 CORE-14582 CORE-14313 --- ntoskrnl/cc/pin.c | 4 ++++ ntoskrnl/cc/view.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index d81f09d470..2d48a27a0a 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -275,6 +275,10 @@ CcSetDirtyPinnedData ( Bcb, Lsn); iBcb->Dirty = TRUE; + if (!iBcb->Vacb->Dirty) + { + CcRosMarkDirtyVacb(iBcb->Vacb); + } } diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index c2b8913132..e1d064312f 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -205,6 +205,8 @@ CcRosFlushDirtyPages ( while ((current_entry != &DirtyVacbListHead) && (Target > 0)) { + ULONG Refs; + current = CONTAINING_RECORD(current_entry, ROS_VACB, DirtyVacbListEntry); @@ -231,7 +233,9 @@ CcRosFlushDirtyPages ( ASSERT(current->Dirty); /* One reference is added above */ - if (CcRosVacbGetRefCount(current) > 2) + Refs = CcRosVacbGetRefCount(current); + if ((Refs > 3 && current->PinCount == 0) || + (Refs > 4 && current->PinCount > 1)) { current->SharedCacheMap->Callbacks->ReleaseFromLazyWrite( current->SharedCacheMap->LazyWriteContext);

1 0

01/01: [MODE] Improve the way the DOS device statuses are enumerated via the "mode" command (without parameters).
by Hermès Bélusca-Maïto 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3055afce81f5f6683bd22… commit 3055afce81f5f6683bd22a361610d9c9d8deb34a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 19:33:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 19:36:13 2018 +0200 [MODE] Improve the way the DOS device statuses are enumerated via the "mode" command (without parameters). --- base/applications/cmdutils/mode/lang/de-DE.rc | 13 +- base/applications/cmdutils/mode/lang/en-US.rc | 13 +- base/applications/cmdutils/mode/lang/ro-RO.rc | 13 +- base/applications/cmdutils/mode/lang/ru-RU.rc | 13 +- base/applications/cmdutils/mode/lang/tr-TR.rc | 13 +- base/applications/cmdutils/mode/lang/zh-CN.rc | 13 +- base/applications/cmdutils/mode/mode.c | 192 ++++++++++++++------------ base/applications/cmdutils/mode/resource.h | 17 +-- 8 files changed, 152 insertions(+), 135 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/de-DE.rc b/base/applications/cmdutils/mode/lang/de-DE.rc index 883bc567ae..5355ac86e8 100644 --- a/base/applications/cmdutils/mode/lang/de-DE.rc +++ b/base/applications/cmdutils/mode/lang/de-DE.rc @@ -14,13 +14,13 @@ Codepagestatus: MODE CON[:] CP [/STATUS]\n\ Anzeigemodus: MODE CON[:] [COLS=c] [LINES=n]\n\ Tastaturwiederholrate: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Serieller Anschluss gefunden - %s\n" - IDS_QUERY_PRINTER_FOUND " Drucker gefunden - %s\n" - IDS_QUERY_PARALLEL_FOUND " Paralleler Anschluss gefunden - %s\n" - IDS_QUERY_DOSDEV_FOUND " Found DOS device - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Serieller Anschluss gefunden - %s\n" + IDS_QUERY_PRINTER_FOUND "Drucker gefunden - %s\n" + IDS_QUERY_PARALLEL_FOUND "Paralleler Anschluss gefunden - %s\n" + IDS_QUERY_DOSDEV_FOUND "Found DOS device - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Unzulässiger Parameter - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Unzulässiger Gerätename - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/en-US.rc b/base/applications/cmdutils/mode/lang/en-US.rc index 9663215a3b..ce84d5d0e5 100644 --- a/base/applications/cmdutils/mode/lang/en-US.rc +++ b/base/applications/cmdutils/mode/lang/en-US.rc @@ -14,13 +14,13 @@ Code page status: MODE CON[:] CP [/STATUS]\n\ Display mode: MODE CON[:] [COLS=c] [LINES=n]\n\ Typematic rate: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Found serial device - %s\n" - IDS_QUERY_PRINTER_FOUND " Found printer device - %s\n" - IDS_QUERY_PARALLEL_FOUND " Found parallel device - %s\n" - IDS_QUERY_DOSDEV_FOUND " Found DOS device - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Found serial device - %s\n" + IDS_QUERY_PRINTER_FOUND "Found printer device - %s\n" + IDS_QUERY_PARALLEL_FOUND "Found parallel device - %s\n" + IDS_QUERY_DOSDEV_FOUND "Found DOS device - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Invalid parameter - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Illegal device name - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc b/base/applications/cmdutils/mode/lang/ro-RO.rc index 6f92acd9db..767e215a6c 100644 --- a/base/applications/cmdutils/mode/lang/ro-RO.rc +++ b/base/applications/cmdutils/mode/lang/ro-RO.rc @@ -22,13 +22,13 @@ Modul de afișare:\n\ Rata de repetiție la menținerea unei taste apăsate:\n\ MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Depistat dispozitiv la portul serial - %s\n" - IDS_QUERY_PRINTER_FOUND " Depistat dispozitiv de imprimare - %s\n" - IDS_QUERY_PARALLEL_FOUND " Depistat dispozitiv la portul paralel - %s\n" - IDS_QUERY_DOSDEV_FOUND " Depistat dispozitiv de tip DOS - %s\n" - // IDS_QUERY_MISC_FOUND " Found other device - %s\n" + IDS_QUERY_SERIAL_FOUND "Depistat dispozitiv la portul serial - %s\n" + IDS_QUERY_PRINTER_FOUND "Depistat dispozitiv de imprimare - %s\n" + IDS_QUERY_PARALLEL_FOUND "Depistat dispozitiv la portul paralel - %s\n" + IDS_QUERY_DOSDEV_FOUND "Depistat dispozitiv de tip DOS - %s\n" + // IDS_QUERY_MISC_FOUND "Found other device - %s\n" - // IDS_QUERY_DEVICE_FOUND " Found %s device - %s\n" + // IDS_QUERY_DEVICE_FOUND "Found %s device - %s\n" // IDS_SERIAL "serial" // IDS_PRINTER "parallel" // IDS_OTHER "other" @@ -67,6 +67,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "EROARE: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Parametru nevalid - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Nume eronat de dispozitiv - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Nu poate fi determinată starea dispozitivului %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Nu poate fi schimbată starea pentru dispozitivul %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/ru-RU.rc b/base/applications/cmdutils/mode/lang/ru-RU.rc index 7ef70b2368..81d2190c7d 100644 --- a/base/applications/cmdutils/mode/lang/ru-RU.rc +++ b/base/applications/cmdutils/mode/lang/ru-RU.rc @@ -14,13 +14,13 @@ BEGIN Режим работы экрана: MODE CON[:] [COLS=c] [LINES=n]\n\ Ввод с клавиатуры: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Найдено последовательное устройство - %s\n" - IDS_QUERY_PRINTER_FOUND " Найдено устройство печати - %s\n" - IDS_QUERY_PARALLEL_FOUND " Найдено параллельное устройство - %s\n" - IDS_QUERY_DOSDEV_FOUND " Найдено устройство DOS - %s\n" - // IDS_QUERY_MISC_FOUND " Найдено другое устройство - %s\n" + IDS_QUERY_SERIAL_FOUND "Найдено последовательное устройство - %s\n" + IDS_QUERY_PRINTER_FOUND "Найдено устройство печати - %s\n" + IDS_QUERY_PARALLEL_FOUND "Найдено параллельное устройство - %s\n" + IDS_QUERY_DOSDEV_FOUND "Найдено устройство DOS - %s\n" + // IDS_QUERY_MISC_FOUND "Найдено другое устройство - %s\n" - // IDS_QUERY_DEVICE_FOUND " Найдено %s устройство - %s\n" + // IDS_QUERY_DEVICE_FOUND "Найдено %s устройство - %s\n" // IDS_SERIAL "последовательное" // IDS_PRINTER "параллельное" // IDS_OTHER "другое" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "ОШИБКА: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Неверный параметр - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Недопустимое имя устройства - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "Не удалось получить состояние устройства %s:\n" IDS_ERROR_STATUS_SET_DEVICE "Не удалось установить состояние устройства %s:\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/tr-TR.rc b/base/applications/cmdutils/mode/lang/tr-TR.rc index aa919dac56..31cfe37bfd 100644 --- a/base/applications/cmdutils/mode/lang/tr-TR.rc +++ b/base/applications/cmdutils/mode/lang/tr-TR.rc @@ -16,13 +16,13 @@ Kod sayfası durumu: MODE CON[:] CP [/STATUS]\n\ Görüntü kipi: MODE CON[:] [COLS=c] [LINES=n]\n\ Yineleme hızı: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " Dizilik aygıt bulundu - %s\n" - IDS_QUERY_PRINTER_FOUND " Yazıcı aygıtı bulundu - %s\n" - IDS_QUERY_PARALLEL_FOUND " Koşut aygıt bulundu - %s\n" - IDS_QUERY_DOSDEV_FOUND " DOS aygıtı bulundu - %s\n" - // IDS_QUERY_MISC_FOUND " Başka aygıt bulundu - %s\n" + IDS_QUERY_SERIAL_FOUND "Dizilik aygıt bulundu - %s\n" + IDS_QUERY_PRINTER_FOUND "Yazıcı aygıtı bulundu - %s\n" + IDS_QUERY_PARALLEL_FOUND "Koşut aygıt bulundu - %s\n" + IDS_QUERY_DOSDEV_FOUND "DOS aygıtı bulundu - %s\n" + // IDS_QUERY_MISC_FOUND "Başka aygıt bulundu - %s\n" - // IDS_QUERY_DEVICE_FOUND " %s aygıtı bulundu - %s\n" + // IDS_QUERY_DEVICE_FOUND "%s aygıtı bulundu - %s\n" // IDS_SERIAL "dizilik" // IDS_PRINTER "koşut" // IDS_OTHER "başka" @@ -61,6 +61,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "YANLIŞLIK: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "Geçersiz değişken - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "Geçersiz aygıt adı - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "%s: aygıtının durumu alınamıyor\n" IDS_ERROR_STATUS_SET_DEVICE "%s: aygıtının durumu ayarlanamıyor\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/lang/zh-CN.rc b/base/applications/cmdutils/mode/lang/zh-CN.rc index 99bf6f6802..7e8e841dcd 100644 --- a/base/applications/cmdutils/mode/lang/zh-CN.rc +++ b/base/applications/cmdutils/mode/lang/zh-CN.rc @@ -14,13 +14,13 @@ BEGIN 显示模式: MODE CON[:] [COLS=c] [LINES=n]\n\ 敲击速率: MODE CON[:] [RATE=r DELAY=d]\n" - IDS_QUERY_SERIAL_FOUND " 发现串口设备 - %s\n" - IDS_QUERY_PRINTER_FOUND " 发现打印设备 - %s\n" - IDS_QUERY_PARALLEL_FOUND " 发现并口设备 - %s\n" - IDS_QUERY_DOSDEV_FOUND " 发现 DOS 设备 - %s\n" - // IDS_QUERY_MISC_FOUND " 发现其他设备 - %s\n" + IDS_QUERY_SERIAL_FOUND "发现串口设备 - %s\n" + IDS_QUERY_PRINTER_FOUND "发现打印设备 - %s\n" + IDS_QUERY_PARALLEL_FOUND "发现并口设备 - %s\n" + IDS_QUERY_DOSDEV_FOUND "发现 DOS 设备 - %s\n" + // IDS_QUERY_MISC_FOUND "发现其他设备 - %s\n" - // IDS_QUERY_DEVICE_FOUND " 发现 %s 设备 - %s\n" + // IDS_QUERY_DEVICE_FOUND "发现 %s 设备 - %s\n" // IDS_SERIAL "串口" // IDS_PRINTER "并口" // IDS_OTHER "其他" @@ -59,6 +59,7 @@ BEGIN IDS_ERROR_SET_PARALLEL_STATE "错误: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" IDS_ERROR_INVALID_PARAMETER "无效参数 - %s\n" IDS_ERROR_ILLEGAL_DEVICE_NAME "非法设备名 - %s (0x%lx)\n" + IDS_ERROR_DEVICE_NOT_AVAILABLE "The device %s is not currently available.\n" IDS_ERROR_STATUS_GET_DEVICE "无法获得设备 %s: 的状态\n" IDS_ERROR_STATUS_SET_DEVICE "无法设置设备 %s: 的状态\n" IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index f571549dfb..054564e3dd 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -29,6 +29,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <windef.h> #include <winbase.h> @@ -40,7 +41,6 @@ #include "resource.h" #define MAX_PORTNAME_LEN 20 -#define MAX_COMPORT_NUM 10 #define ASSERT(a) @@ -72,76 +72,6 @@ UnderlinedResPrintf( ConStreamWrite(Stream, szMsgBuffer, Len); } -int QueryDevices(VOID) -{ - PWSTR Buffer, ptr; - DWORD dwLen = MAX_PATH; - - /* Pre-allocate a buffer for QueryDosDeviceW() */ - Buffer = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); - if (Buffer == NULL) - { - /* We failed, bail out */ - ConPuts(StdErr, L"ERROR: Not enough memory\n"); - return 0; - } - - for (;;) - { - *Buffer = UNICODE_NULL; - if (QueryDosDeviceW(NULL, Buffer, dwLen)) - break; - - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) - { - /* We failed, bail out */ - ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, Buffer); - return 0; - } - - /* The buffer was too small, try to re-allocate it */ - dwLen *= 2; - ptr = HeapReAlloc(GetProcessHeap(), 0, Buffer, dwLen * sizeof(WCHAR)); - if (ptr == NULL) - { - /* We failed, bail out */ - ConPuts(StdErr, L"ERROR: Not enough memory\n"); - HeapFree(GetProcessHeap(), 0, Buffer); - return 0; - } - Buffer = ptr; - } - - for (ptr = Buffer; *ptr != UNICODE_NULL; ptr += wcslen(ptr) + 1) - { - if (wcsstr(ptr, L"COM")) - { - ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); - } - else if (wcsstr(ptr, L"PRN")) - { - ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); - } - else if (wcsstr(ptr, L"LPT")) - { - ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); - } - else if (wcsstr(ptr, L"AUX") || wcsstr(ptr, L"NUL")) - { - ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); - } - else - { - // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); - } - } - - /* Free the buffer and return success */ - HeapFree(GetProcessHeap(), 0, Buffer); - return 1; -} - int ShowParallelStatus(INT nPortNum) { WCHAR buffer[250]; @@ -174,6 +104,7 @@ int ShowParallelStatus(INT nPortNum) { ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(%s) failed: 0x%lx\n", szPortName, GetLastError()); } + ConPuts(StdOut, L"\n"); return 1; } @@ -251,6 +182,8 @@ int ShowConsoleStatus(VOID) ConResPrintf(StdOut, IDS_CONSOLE_KBD_DELAY, dwKbdDelay); } ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); + ConPuts(StdOut, L"\n"); + return 0; } @@ -261,6 +194,8 @@ int ShowConsoleCPStatus(VOID) ConPuts(StdOut, L"\n"); ConResPrintf(StdOut, IDS_CONSOLE_CODEPAGE, GetConsoleOutputCP()); + ConPuts(StdOut, L"\n"); + return 0; } @@ -364,6 +299,7 @@ ResizeTextConsole( /* Update the console screen buffer information */ GetConsoleScreenBufferInfo(hConOut, pcsbi); + return TRUE; } @@ -570,7 +506,11 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr if (hPort == INVALID_HANDLE_VALUE) { - ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, GetLastError()); + DWORD dwLastError = GetLastError(); + if (dwLastError == ERROR_ACCESS_DENIED) + ConResPrintf(StdErr, IDS_ERROR_DEVICE_NOT_AVAILABLE, szPortName); + else + ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, dwLastError); return FALSE; } @@ -654,6 +594,8 @@ int ShowSerialStatus(INT nPortNum) control_strings[dcb.fDsrSensitivity ? 1 : 0]); ConResPrintf(StdOut, IDS_COM_STATUS_DTR_CIRCUIT, control_strings[dcb.fDtrControl]); ConResPrintf(StdOut, IDS_COM_STATUS_RTS_CIRCUIT, control_strings[dcb.fRtsControl]); + ConPuts(StdOut, L"\n"); + return 0; } @@ -1108,24 +1050,100 @@ int SetSerialState(INT nPortNum, IN PCWSTR ArgStr) static PCWSTR FindPortNum(PCWSTR argStr, PINT PortNum) { - *PortNum = -1; + PWSTR endptr = NULL; - if (*argStr >= L'0' && *argStr <= L'9') + *PortNum = wcstol(argStr, &endptr, 10); + if (endptr == argStr) { - *PortNum = *argStr - L'0'; - argStr++; - if (*argStr >= L'0' && *argStr <= L'9') + *PortNum = -1; + return NULL; + } + + return endptr; +} + +int EnumerateDevices(VOID) +{ + PWSTR Buffer, ptr; + PCWSTR argStr; + DWORD dwLen = MAX_PATH; + INT nPortNum; + + /* Pre-allocate a buffer for QueryDosDeviceW() */ + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + if (Buffer == NULL) + { + /* We failed, bail out */ + ConPuts(StdErr, L"ERROR: Not enough memory\n"); + return 0; + } + + for (;;) + { + *Buffer = UNICODE_NULL; + if (QueryDosDeviceW(NULL, Buffer, dwLen)) + break; + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + /* We failed, bail out */ + ConPrintf(StdErr, L"ERROR: QueryDosDeviceW(...) failed: 0x%lx\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, Buffer); + return 0; + } + + /* The buffer was too small, try to re-allocate it */ + dwLen *= 2; + ptr = HeapReAlloc(GetProcessHeap(), 0, Buffer, dwLen * sizeof(WCHAR)); + if (ptr == NULL) { - *PortNum *= 10; - *PortNum += *argStr - L'0'; + /* We failed, bail out */ + ConPuts(StdErr, L"ERROR: Not enough memory\n"); + HeapFree(GetProcessHeap(), 0, Buffer); + return 0; } + Buffer = ptr; } - else + + for (ptr = Buffer; *ptr != UNICODE_NULL; ptr += wcslen(ptr) + 1) { - return NULL; + if (_wcsnicmp(ptr, L"COM", 3) == 0) + { + argStr = FindPortNum(ptr+3, &nPortNum); + if (!argStr || *argStr || nPortNum == -1) + continue; + + // ConResPrintf(StdOut, IDS_QUERY_SERIAL_FOUND, ptr); + ShowSerialStatus(nPortNum); + } + else if (_wcsicmp(ptr, L"PRN") == 0) + { + ConResPrintf(StdOut, IDS_QUERY_PRINTER_FOUND, ptr); + } + else if (_wcsnicmp(ptr, L"LPT", 3) == 0) + { + argStr = FindPortNum(ptr+3, &nPortNum); + if (!argStr || *argStr || nPortNum == -1) + continue; + + // ConResPrintf(StdOut, IDS_QUERY_PARALLEL_FOUND, ptr); + ShowParallelStatus(nPortNum); + } + else if (_wcsicmp(ptr, L"AUX") == 0 || _wcsicmp(ptr, L"NUL") == 0) + { + ConResPrintf(StdOut, IDS_QUERY_DOSDEV_FOUND, ptr); + } + else + { + // ConResPrintf(StdOut, IDS_QUERY_MISC_FOUND, ptr); + } } - return argStr; + ShowConsoleStatus(); + + /* Free the buffer and return success */ + HeapFree(GetProcessHeap(), 0, Buffer); + return 1; } int wmain(int argc, WCHAR* argv[]) @@ -1273,15 +1291,7 @@ int wmain(int argc, WCHAR* argv[]) } show_status: - QueryDevices(); -/* - ShowParallelStatus(1); - for (nPortNum = 0; nPortNum < MAX_COMPORT_NUM; nPortNum++) - { - ShowSerialStatus(nPortNum + 1); - } - ShowConsoleStatus(); -*/ + EnumerateDevices(); goto Quit; invalid_parameter: diff --git a/base/applications/cmdutils/mode/resource.h b/base/applications/cmdutils/mode/resource.h index c54e8ac31e..2916e47c2c 100644 --- a/base/applications/cmdutils/mode/resource.h +++ b/base/applications/cmdutils/mode/resource.h @@ -38,13 +38,14 @@ #define IDS_ERROR_SET_PARALLEL_STATE 26 #define IDS_ERROR_INVALID_PARAMETER 27 #define IDS_ERROR_ILLEGAL_DEVICE_NAME 28 -#define IDS_ERROR_STATUS_GET_DEVICE 29 -#define IDS_ERROR_STATUS_SET_DEVICE 30 -#define IDS_ERROR_TIMEOUT_GET_DEVICE 31 -#define IDS_ERROR_TIMEOUT_SET_DEVICE 32 -#define IDS_ERROR_INVALID_PARITY_BITS 33 -#define IDS_ERROR_INVALID_STOP_BITS 34 -#define IDS_ERROR_NO_MEMORY 35 -#define IDS_ERROR_SCREEN_LINES_COL 36 +#define IDS_ERROR_DEVICE_NOT_AVAILABLE 29 +#define IDS_ERROR_STATUS_GET_DEVICE 30 +#define IDS_ERROR_STATUS_SET_DEVICE 31 +#define IDS_ERROR_TIMEOUT_GET_DEVICE 32 +#define IDS_ERROR_TIMEOUT_SET_DEVICE 33 +#define IDS_ERROR_INVALID_PARITY_BITS 34 +#define IDS_ERROR_INVALID_STOP_BITS 35 +#define IDS_ERROR_NO_MEMORY 36 +#define IDS_ERROR_SCREEN_LINES_COL 37 #endif /* RESOURCE_H */

1 0

01/01: [WINLOGON] Update french translation of the system shutdown dialog.
by Hermès Bélusca-Maïto 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37deb7593e8d6d8ca25fb… commit 37deb7593e8d6d8ca25fb0a7b2d47ba86e5bdd8d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 17:19:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 18:02:41 2018 +0200 [WINLOGON] Update french translation of the system shutdown dialog. --- base/system/winlogon/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index a551a2fb64..a25cde97c5 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -24,14 +24,14 @@ END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "Arrêt du système" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Un arrêt du système a été initié. Veuillez enregistrer tous les travaux en cours et quitter votre session. Toutes les modifications non enregistrées seront perdues.", -1, 38, 7, 135, 40 + LTEXT "Le système s'arrête dans :", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Message :", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END @@ -52,7 +52,7 @@ BEGIN IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" - IDS_TIMEOUTLONGFORMAT "%d days" + IDS_TIMEOUTLONGFORMAT "%d jours" END STRINGTABLE

1 0

01/01: [WINLOGON] Add german translation of the system shutdown dialog
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=153c645b2c57698e9bbe9… commit 153c645b2c57698e9bbe9a11ad36f960c13debad Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 17:44:41 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 17:44:41 2018 +0200 [WINLOGON] Add german translation of the system shutdown dialog --- base/system/winlogon/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 8b8ca8f14f..978292482d 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -28,10 +28,10 @@ CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Das System wird heruntergefahren. Speichern Sie alle Daten und melden Sie sich ab. Alle nicht gespeicherten Änderungen gehen verloren.", -1, 38, 7, 135, 40 + LTEXT "Zeit bis zum Herunterfahren:", -1, 38, 50, 93, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Meldung:", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END

1 0

01/01: [WINLOGON] Localize the shutdown timeout
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec2bfa2e1160070bdd83b… commit ec2bfa2e1160070bdd83b080121b81c439ee7e7a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 17:09:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 17:09:37 2018 +0200 [WINLOGON] Localize the shutdown timeout --- base/system/winlogon/lang/bg-BG.rc | 2 ++ base/system/winlogon/lang/cs-CZ.rc | 2 ++ base/system/winlogon/lang/de-DE.rc | 2 ++ base/system/winlogon/lang/el-GR.rc | 2 ++ base/system/winlogon/lang/en-US.rc | 2 ++ base/system/winlogon/lang/es-ES.rc | 2 ++ base/system/winlogon/lang/fr-FR.rc | 2 ++ base/system/winlogon/lang/he-IL.rc | 2 ++ base/system/winlogon/lang/hu-HU.rc | 2 ++ base/system/winlogon/lang/id-ID.rc | 2 ++ base/system/winlogon/lang/it-IT.rc | 2 ++ base/system/winlogon/lang/ja-JP.rc | 2 ++ base/system/winlogon/lang/lt-LT.rc | 2 ++ base/system/winlogon/lang/ms-MY.rc | 2 ++ base/system/winlogon/lang/nl-NL.rc | 2 ++ base/system/winlogon/lang/no-NO.rc | 2 ++ base/system/winlogon/lang/pl-PL.rc | 2 ++ base/system/winlogon/lang/pt-BR.rc | 2 ++ base/system/winlogon/lang/ro-RO.rc | 2 ++ base/system/winlogon/lang/ru-RU.rc | 2 ++ base/system/winlogon/lang/sk-SK.rc | 2 ++ base/system/winlogon/lang/sq-AL.rc | 2 ++ base/system/winlogon/lang/sv-SE.rc | 2 ++ base/system/winlogon/lang/tr-TR.rc | 2 ++ base/system/winlogon/lang/uk-UA.rc | 2 ++ base/system/winlogon/lang/zh-CN.rc | 2 ++ base/system/winlogon/lang/zh-TW.rc | 2 ++ base/system/winlogon/resource.h | 2 ++ base/system/winlogon/shutdown.c | 10 +++++++--- 29 files changed, 63 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index c4909af9af..d4b753de2a 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Приготвяне за сън..." IDS_SAVEYOURSETTINGS "Записване на настройките ви..." IDS_REACTOSISSTARTINGUP "РеактОС тръгва..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 0647df4545..29f7bb2246 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Příprava k přechodu do režimu hibernace..." IDS_SAVEYOURSETTINGS "Ukládání osobního nastavení..." IDS_REACTOSISSTARTINGUP "ReactOS se spouští..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 0c6065a3e8..8b8ca8f14f 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Vorbereiten für den Ruhezustand..." IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." IDS_REACTOSISSTARTINGUP "ReactOS startet..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d Tage" END STRINGTABLE diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index c1fa72745a..4a12e0f9a7 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Γίνεται αποθήκευση των ρυθμίσεών σας..." IDS_REACTOSISSTARTINGUP "Το ReactOS ξεκινά..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 1fa1c71d8b..151cd80e72 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Saving your settings..." IDS_REACTOSISSTARTINGUP "ReactOS is starting up..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 772184ebe3..450d66e697 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para hibernar..." IDS_SAVEYOURSETTINGS "Guardando su configuración personal..." IDS_REACTOSISSTARTINGUP "ReactOS se está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index b1f9b92512..a551a2fb64 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index d4f3785850..0fd7515079 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "מתכונן לשינה..." IDS_SAVEYOURSETTINGS "שומר את הגדרותיך..." IDS_REACTOSISSTARTINGUP "ReactOS מופעל..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index ef62ded49e..110a1bde93 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." IDS_REACTOSISSTARTINGUP "A ReactOS indul..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index 129140fff3..d48ecd14c9 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Menyiapkan untuk Hibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan setelan anda..." IDS_REACTOSISSTARTINGUP "ReactOS dimulai..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index dc2ab0d8ee..9c5556d2ed 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparazione Hibernate..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." IDS_REACTOSISSTARTINGUP "ReactOS sta avviandosi..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index 30eeb77fb2..5dbeabc573 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "休止状態の準備をしています..." IDS_SAVEYOURSETTINGS "設定を保存しています..." IDS_REACTOSISSTARTINGUP "ReactOS を起動しています..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index 6aba0931c6..e217a4a57c 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Ruošiamasi išjungti įrašant..." IDS_SAVEYOURSETTINGS "Išsaugomos nuostatos..." IDS_REACTOSISSTARTINGUP "Paleidžiama ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index 2d2bfff416..2e5bffa455 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Bersedia untuk berhibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan seting anda..." IDS_REACTOSISSTARTINGUP "ReactOS sedang bermula komputer anda..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index fa28236f5c..c4ea1c70f7 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." IDS_REACTOSISSTARTINGUP "ReactOS is aan het opstarten..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 0f7ef7e4b3..56527d56bc 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." IDS_REACTOSISSTARTINGUP "ReactOS starter opp..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 71e8e7828c..6bcff29401 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -56,6 +56,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawień..." IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 7715d3242c..691855be07 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." IDS_SAVEYOURSETTINGS "Salvando suas configurações..." IDS_REACTOSISSTARTINGUP "ReactOS está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index d8b13f0309..30bdee4a92 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -58,6 +58,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…" IDS_REACTOSISSTARTINGUP "Sistem de operare în curs de pornire…" + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index e38d1ff591..a8d1df0525 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Подготовка к переходу в спящий режим..." IDS_SAVEYOURSETTINGS "Сохраняются настройки..." IDS_REACTOSISSTARTINGUP "ReactOS загружается..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 59447f5e04..0b151f349a 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -54,6 +54,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Systém sa pripravuje na prechod do režimu dlhodobého spánku..." IDS_SAVEYOURSETTINGS "Systém ukladá Vaše nastavenia..." IDS_REACTOSISSTARTINGUP "Systém ReactOS sa spúšťa..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index 699ec03d25..5051bf3745 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -53,6 +53,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Pergatitet per letargji..." IDS_SAVEYOURSETTINGS "Ruan konfigurimin tuaj..." IDS_REACTOSISSTARTINGUP "ReactOS po fillon..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 6f1c3e42d6..a9451e329e 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Förbereder för viloläge..." IDS_SAVEYOURSETTINGS "Sparar dina inställningar..." IDS_REACTOSISSTARTINGUP "ReactOS startas..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 2a3119823f..3e7e4b609e 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Anıkta Beklemeye Anıklanıyor..." IDS_SAVEYOURSETTINGS "Ayarlarınız Saklanıyor..." IDS_REACTOSISSTARTINGUP "ReactOS Başlatılıyor..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index d88737ca63..dfccc9ab4b 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Підготовка до сплячого режиму..." IDS_SAVEYOURSETTINGS "Збереження параметрів..." IDS_REACTOSISSTARTINGUP "Запуск ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 346dc27fc2..328b22dd39 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -52,6 +52,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在准备休眠..." IDS_SAVEYOURSETTINGS "正在保存设置..." IDS_REACTOSISSTARTINGUP "ReactOS 正在启动..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 580707a5c3..a2d45339c0 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在準備休眠..." IDS_SAVEYOURSETTINGS "正在儲存設定..." IDS_REACTOSISSTARTINGUP "ReactOS 正在啟動..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index 41037647d1..b57902dbae 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -33,5 +33,7 @@ #define IDS_PREPARETOHIBERNATE 1686 #define IDS_SAVEYOURSETTINGS 1687 #define IDS_REACTOSISSTARTINGUP 1690 +#define IDS_TIMEOUTSHORTFORMAT 1695 +#define IDS_TIMEOUTLONGFORMAT 1696 #define IDS_FAILEDACTIVATEUSERSHELL 1001 diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index d3b86aa140..f708b9690a 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -77,7 +77,8 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR szBuffer[12]; + WCHAR szFormatBuffer[32]; + WCHAR szBuffer[32]; INT iSeconds, iMinutes, iHours, iDays; if (!pShutdownParams->bShuttingDown) @@ -95,12 +96,15 @@ OnTimer( iMinutes = iSeconds / 60; iSeconds -= iMinutes * 60; - swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + LoadStringW(hAppInstance, IDS_TIMEOUTSHORTFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iHours, iMinutes, iSeconds); } else { iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); - swprintf(szBuffer, L"%d days", iDays); // FIXME: Localize + + LoadStringW(hAppInstance, IDS_TIMEOUTLONGFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iDays); } SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer);

1 0

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 April 2018