Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [HALARM] HalpActiveProcessors is a KAFFINITY (see headers)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c3f7b102721a57140a3b… commit 8c3f7b102721a57140a3b50949f496ee182a335f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Nov 28 12:17:48 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Nov 28 12:17:48 2023 +0100 [HALARM] HalpActiveProcessors is a KAFFINITY (see headers) --- hal/halarm/generic/processor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/halarm/generic/processor.c b/hal/halarm/generic/processor.c index 81fb5145b3a..e48358ab6c7 100644 --- a/hal/halarm/generic/processor.c +++ b/hal/halarm/generic/processor.c @@ -14,7 +14,7 @@ /* GLOBALS ********************************************************************/ -LONG HalpActiveProcessors; +KAFFINITY HalpActiveProcessors; KAFFINITY HalpDefaultInterruptAffinity; BOOLEAN HalpProcessorIdentified; BOOLEAN HalpTestCleanSupported;

1 year

[reactos] 01/01: [NTOS:PNP] Queue a device change event on interface enable or disable

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12a5971b7a31338b5171a… commit 12a5971b7a31338b5171a37a672751cf7c3fb701 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Nov 27 22:36:05 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Nov 27 22:36:52 2023 +0100 [NTOS:PNP] Queue a device change event on interface enable or disable --- ntoskrnl/include/internal/io.h | 6 ++++++ ntoskrnl/io/iomgr/deviface.c | 3 ++- ntoskrnl/io/pnpmgr/plugplay.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 680e20ef4e0..54a21832815 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -668,6 +668,12 @@ CODE_SEG("INIT") NTSTATUS IopInitPlugPlayEvents(VOID); +NTSTATUS +IopQueueDeviceChangeEvent( + _In_ const GUID *EventGuid, + _In_ const GUID *InterfaceClassGuid, + _In_ PUNICODE_STRING SymbolicLinkName); + NTSTATUS IopQueueTargetDeviceEvent( const GUID *Guid, diff --git a/ntoskrnl/io/iomgr/deviface.c b/ntoskrnl/io/iomgr/deviface.c index d640f7087b9..ed81e4407c4 100644 --- a/ntoskrnl/io/iomgr/deviface.c +++ b/ntoskrnl/io/iomgr/deviface.c @@ -6,7 +6,7 @@ * * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) * Matthew Brace (ismarc(a)austin.rr.com) - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -1465,6 +1465,7 @@ IoSetDeviceInterfaceState(IN PUNICODE_STRING SymbolicLinkName, EventGuid = Enable ? &GUID_DEVICE_INTERFACE_ARRIVAL : &GUID_DEVICE_INTERFACE_REMOVAL; PiNotifyDeviceInterfaceChange(EventGuid, &DeviceGuid, SymbolicLinkName); + IopQueueDeviceChangeEvent(EventGuid, &DeviceGuid, SymbolicLinkName); ObDereferenceObject(PhysicalDeviceObject); DPRINT("Status %x\n", Status); diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 9220b30dc9e..3b01ed06a1c 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -48,6 +48,51 @@ IopInitPlugPlayEvents(VOID) return STATUS_SUCCESS; } +NTSTATUS +IopQueueDeviceChangeEvent( + _In_ const GUID *EventGuid, + _In_ const GUID *InterfaceClassGuid, + _In_ PUNICODE_STRING SymbolicLinkName) +{ + PPNP_EVENT_ENTRY EventEntry; + UNICODE_STRING Copy; + ULONG TotalSize; + + /* Allocate a big enough buffer */ + Copy.Length = 0; + Copy.MaximumLength = SymbolicLinkName->Length + sizeof(UNICODE_NULL); + TotalSize = + FIELD_OFFSET(PLUGPLAY_EVENT_BLOCK, DeviceClass.SymbolicLinkName) + + Copy.MaximumLength; + + EventEntry = ExAllocatePool(NonPagedPool, + TotalSize + FIELD_OFFSET(PNP_EVENT_ENTRY, Event)); + if (!EventEntry) + return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(EventEntry, TotalSize + FIELD_OFFSET(PNP_EVENT_ENTRY, Event)); + + /* Fill the buffer with the event GUID */ + RtlCopyMemory(&EventEntry->Event.EventGuid, EventGuid, sizeof(GUID)); + EventEntry->Event.EventCategory = DeviceClassChangeEvent; + EventEntry->Event.TotalSize = TotalSize; + + /* Fill the interface class GUID */ + RtlCopyMemory(&EventEntry->Event.DeviceClass.ClassGuid, InterfaceClassGuid, sizeof(GUID)); + + /* Fill the symbolic link name */ + RtlCopyMemory(&EventEntry->Event.DeviceClass.SymbolicLinkName, + SymbolicLinkName->Buffer, SymbolicLinkName->Length); + EventEntry->Event.DeviceClass.SymbolicLinkName[SymbolicLinkName->Length / sizeof(WCHAR)] = UNICODE_NULL; + + InsertHeadList(&IopPnpEventQueueHead, + &EventEntry->ListEntry); + KeSetEvent(&IopPnpNotifyEvent, + 0, + FALSE); + + return STATUS_SUCCESS; +} + NTSTATUS IopQueueTargetDeviceEvent(const GUID *Guid, PUNICODE_STRING DeviceIds)

1 year

[reactos] 01/01: [TASKMGR] Fix 64-bit bugs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a64a6749807fc379bd362… commit a64a6749807fc379bd36211b52287ee82cc230b0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 26 11:57:29 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 27 23:30:51 2023 +0200 [TASKMGR] Fix 64-bit bugs --- base/applications/taskmgr/affinity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/taskmgr/affinity.c b/base/applications/taskmgr/affinity.c index 6470caa9526..dbf599dd01a 100644 --- a/base/applications/taskmgr/affinity.c +++ b/base/applications/taskmgr/affinity.c @@ -75,13 +75,13 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) /* * Enable a checkbox for each processor present in the system */ - if (dwSystemAffinityMask & (1 << nCpu)) + if (dwSystemAffinityMask & ((ULONG_PTR)1 << nCpu)) EnableWindow(GetDlgItem(hDlg, dwCpuTable[nCpu]), TRUE); /* * Check each checkbox that the current process * has affinity with */ - if (dwProcessAffinityMask & (1 << nCpu)) + if (dwProcessAffinityMask & ((ULONG_PTR)1 << nCpu)) CheckDlgButton(hDlg, dwCpuTable[nCpu], BST_CHECKED); } @@ -109,7 +109,7 @@ AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) * checkbox that the user checked. */ if (IsDlgButtonChecked(hDlg, dwCpuTable[nCpu])) - dwProcessAffinityMask |= (1 << nCpu); + dwProcessAffinityMask |= ((ULONG_PTR)1 << nCpu); } /*

1 year

[reactos] 01/01: [NTOSKRNL] Remove unused internal/amd64/asmmacro.S

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b386ea728f38361c6e6d6… commit b386ea728f38361c6e6d653a9fde6d339143fca2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Aug 17 23:15:55 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 27 22:51:51 2023 +0200 [NTOSKRNL] Remove unused internal/amd64/asmmacro.S Added, but never(?) used. Addendum to 99e6ad7 (r46620). --- ntoskrnl/include/internal/amd64/asmmacro.S | 81 ------------------------------ 1 file changed, 81 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/asmmacro.S b/ntoskrnl/include/internal/amd64/asmmacro.S deleted file mode 100644 index 3b1a9ce4cfa..00000000000 --- a/ntoskrnl/include/internal/amd64/asmmacro.S +++ /dev/null @@ -1,81 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/include/internal/amd64/asmmacro.S - * PURPOSE: Macros for x64 assembly - * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -.intel_syntax noprefix -.code64 - -/* Macros for x64 stack unwind OPs */ - -.macro .proc name - .func name - .global _\name - _\name: - .cfi_startproc - .equ cfa_current_offset, -8 -.endm - -.macro .endproc - .cfi_endproc - .endfunc -.endm - -.macro .allocstack size - .cfi_adjust_cfa_offset \size - .set cfa_current_offset, cfa_current_offset - \size -.endm - -.macro .pushframe code - .if (\code == 0) - .cfi_adjust_cfa_offset 0x28 - .set cfa_current_offset, cfa_current_offset - 0x28 - .else - .cfi_adjust_cfa_offset 0x30 - .set cfa_current_offset, cfa_current_offset - 0x30 - .endif -.endm - -.macro .pushreg reg - .cfi_adjust_cfa_offset 8 - .equ cfa_current_offset, cfa_current_offset - 8 - .cfi_offset \reg, cfa_current_offset -.endm - -.macro .savereg reg, offset - // checkme!!! - .cfi_offset \reg, \offset -.endm - -.macro .savexmm128 reg, offset - // checkme!!! - .cfi_offset \reg, \offset -.endm - -.macro .setframe reg, offset - .cfi_def_cfa reg, \offset - .equ cfa_current_offset, \offset -.endm - -.macro .endprolog -.endm - -.macro UNIMPLEMENTED2 line, func - jmp 3f - .equ expr, 12 -1: .asciz "\func" -2: .asciz __FILE__ -3: - sub rsp, 0x20 - lea rcx, _MsgUnimplemented[rip] - lea rdx, 1b[rip] - lea r8, 2b[rip] - mov r9, \line - call _DbgPrint - add rsp, 0x20 -.endm -#define UNIMPLEMENTED UNIMPLEMENTED2 __LINE__, -

1 year

[reactos] 01/01: [TASKMGR] Fix text cutoff statusbar2 CPU%, improve statusbar3 Mem (#5978)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=628d4a92e978eda0da873… commit 628d4a92e978eda0da873b4234bbded65dcde8b0 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon Nov 27 18:53:34 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 27 17:53:34 2023 +0000 [TASKMGR] Fix text cutoff statusbar2 CPU%, improve statusbar3 Mem (#5978) ReactOS taskmgr writes a bit more *useful* dynamically generated strings in the status-bar field 3 with the memory than MS Windows XP taskmgr does for example. Available space in the statusbar is very limited, therefore we use the following trick to get as much as possible of that helpful text visible for the majority of the translations: - We do shrink the CPU% column a bit in width and static text lengths, as it is the one which has very little variety in length of its dynamic part: 0% to 100% This improves the display for all languages, and for some languages it also fixes text-cutoff that we even had with the wider width in the CPU% column already. also fix an accelerator collision in nl-NL.rc --- base/applications/taskmgr/lang/bg-BG.rc | 2 +- base/applications/taskmgr/lang/cs-CZ.rc | 2 +- base/applications/taskmgr/lang/da-DK.rc | 2 +- base/applications/taskmgr/lang/de-DE.rc | 2 +- base/applications/taskmgr/lang/el-GR.rc | 2 +- base/applications/taskmgr/lang/en-US.rc | 2 +- base/applications/taskmgr/lang/es-ES.rc | 2 +- base/applications/taskmgr/lang/et-EE.rc | 2 +- base/applications/taskmgr/lang/fr-FR.rc | 2 +- base/applications/taskmgr/lang/he-IL.rc | 2 +- base/applications/taskmgr/lang/hu-HU.rc | 2 +- base/applications/taskmgr/lang/id-ID.rc | 2 +- base/applications/taskmgr/lang/it-IT.rc | 2 +- base/applications/taskmgr/lang/ja-JP.rc | 2 +- base/applications/taskmgr/lang/ko-KR.rc | 2 +- base/applications/taskmgr/lang/nl-NL.rc | 6 +++--- base/applications/taskmgr/lang/no-NO.rc | 2 +- base/applications/taskmgr/lang/pl-PL.rc | 2 +- base/applications/taskmgr/lang/pt-BR.rc | 2 +- base/applications/taskmgr/lang/pt-PT.rc | 2 +- base/applications/taskmgr/lang/ro-RO.rc | 2 +- base/applications/taskmgr/lang/ru-RU.rc | 2 +- base/applications/taskmgr/lang/sk-SK.rc | 2 +- base/applications/taskmgr/lang/sq-AL.rc | 2 +- base/applications/taskmgr/lang/sv-SE.rc | 2 +- base/applications/taskmgr/lang/tr-TR.rc | 2 +- base/applications/taskmgr/lang/uk-UA.rc | 2 +- base/applications/taskmgr/lang/zh-CN.rc | 2 +- base/applications/taskmgr/lang/zh-HK.rc | 2 +- base/applications/taskmgr/lang/zh-TW.rc | 2 +- base/applications/taskmgr/taskmgr.h | 10 ++++------ 31 files changed, 36 insertions(+), 38 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 15b41d3f761..81cff5498d1 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ: Промяната на първенството на това действие може да\nпричини нежелани последствия, включително неустойчивост на системата. Сигурен ли сте,\nче искате да смените старшинството?" IDS_MSG_TRAYICONCPUUSAGE "Заетост на ЦПУ: %d%%" IDS_STATUS_MEMUSAGE "Заета памет: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Заетост на ЦПУ: %3d%%" + IDS_STATUS_CPUUSAGE "ЦПУ: %3d%%" IDS_STATUS_PROCESSES "Действия: %d" IDS_NOT_RESPONDING "Не отговаря" IDS_RUNNING "Работи" diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 4361e84a41e..27bec85ddc6 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "Upozornění: Změna priority procesu může\nzpůsobit nestabilitu systému a jiné nepředvídatelné problémy. Jste si jisti\nse změnou priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "Využití CPU: %d%%" IDS_STATUS_MEMUSAGE "Využití paměti: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Využití CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "Neodpovídá" IDS_RUNNING "Běží" diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index 7786e84a487..8e8d4bde7bb 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" IDS_RUNNING "Running" diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 7e847cc6d83..1617aaf2c2f 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität, führen.\nSind Sie sicher, dass Sie diese ändern möchten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Last: %d%%" IDS_STATUS_MEMUSAGE "Speicher: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU-Last: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Prozesse: %d" IDS_NOT_RESPONDING "Keine Rückmeldung" IDS_RUNNING "Wird ausgeführt" diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index d09e503d52b..0ac9a133d3d 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" IDS_RUNNING "Running" diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index a9da3b690c1..98a77f88548 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" IDS_RUNNING "Running" diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index 79f1f7aee2f..d1ad6021ece 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: El cambio de prioridad en ciertos procesos podría provocar la inestabilidad del sistema.\n¿Seguro que desea cambiar la prioridad?" IDS_MSG_TRAYICONCPUUSAGE "Promedio CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso de memoria: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Procesos: %d" IDS_NOT_RESPONDING "No responde" IDS_RUNNING "En ejecución" diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 65b226461fd..240e524400f 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -436,7 +436,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "HOIATUS: Selle protsessi prioriteedi muutmine võib põhjustada soovimatuid\ntagajärgi sealhulgas süsteemi ebastabiilsust.\nKas olete kindel et tahate muuta prioriteeti?" IDS_MSG_TRAYICONCPUUSAGE "CPU hõivatus: %d%%" IDS_STATUS_MEMUSAGE "Hõivatud mälu: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU hõivatus: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Protsesse: %d" IDS_NOT_RESPONDING "Ei vasta" IDS_RUNNING "Töötab" diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 15d4ba4f6eb..d1b77e436a0 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "ATTENTION : Changer la priorité du processus peut causer des\neffets indésirables comme l'instabilité du système.\nÊtes-vous sûr de vouloir changer la priorité ?" IDS_MSG_TRAYICONCPUUSAGE "UC utilisée : %d%%" IDS_STATUS_MEMUSAGE "Fichier d'échange utilisé : %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "UC utilisée : %3d%%" + IDS_STATUS_CPUUSAGE "UC : %3d%%" IDS_STATUS_PROCESSES "Processus : %d" IDS_NOT_RESPONDING "Ne répond pas" IDS_RUNNING "En cours d'exécution" diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 7cd4206a16b..601f4834571 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "%3d%% :שימוש במעבד" IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "%3d%% :שימוש במעבד " + IDS_STATUS_CPUUSAGE "%3d%% :מעבד" IDS_STATUS_PROCESSES "%d :תהליכים" IDS_NOT_RESPONDING "לא מגיב" IDS_RUNNING "פועל" diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 03a8abb86eb..873a23dcf95 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "FIGYELEM: A prioritás megváltoztatása\nkellemetlenségeket, akár rendszer instabilitást is okozhat.\nBiztosan meg akarja változtatni a prioritást?" IDS_MSG_TRAYICONCPUUSAGE "CPU használat: %d%%" IDS_STATUS_MEMUSAGE "Mem használat: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU használat: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Folyamatok: %d" IDS_NOT_RESPONDING "Nem válaszol" IDS_RUNNING "Fut" diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index d129a36abd8..dcd24a51bdd 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "PERINGATAN: Mengubah kelas prioritas dari proses ini\ndapat menyebabkan hasil yang tidak diinginkan termasuk ketidakstabilan sistem.\nAnda yakin ingin mengubah kelas prioritas?" IDS_MSG_TRAYICONCPUUSAGE "Pemakaian CPU: %d%%" IDS_STATUS_MEMUSAGE "Pemakaian Mem: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Pemakaian CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Proses: %d" IDS_NOT_RESPONDING "Tidak Merespon" IDS_RUNNING "Berjalan" diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index 27cad122a69..cd21fbb829d 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di priorità può provocare\n effetti indesiderati compresa la perdita di dati o l'instabilità del sistema.\nSei sicuro di voler procedere?" IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso Mem: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Uso CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processi: %d" IDS_NOT_RESPONDING "Non risponde" IDS_RUNNING "In esecuzione" diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index aa61aa60694..a18d88b78f0 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "警告: このプロセスの優先度クラスを変更すると、システムが不安定に\nなるなど、予期しない結果になることがあります。\n優先度クラスを変更しますか?" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用率: %d%%" IDS_STATUS_MEMUSAGE "メモリ使用量: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU 使用率: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "プロセス: %d" IDS_NOT_RESPONDING "応答なし" IDS_RUNNING "実行中" diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 71850057b29..0fda421685b 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "경고: 이 프로세스의 우선 순위 클래스를 변경하면 시스템 불안정을 포함하여\n예기치 않은 결과를 초래할 수도 있습니다.\n우선 순위 클래스를 변경하시겠습니까?" IDS_MSG_TRAYICONCPUUSAGE "CPU 사용: %d%%" IDS_STATUS_MEMUSAGE "메모리 사용: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU 사용: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "프로세스: %d" IDS_NOT_RESPONDING "응답 없음" IDS_RUNNING "실행 중" diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 9c5f437a58f..e768cd6d12c 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -11,7 +11,7 @@ BEGIN POPUP "&Opties" BEGIN MENUITEM "&Altijd op voorgrond", ID_OPTIONS_ALWAYSONTOP, CHECKED - MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED //FIXME: accelerator collision &b with IDS_MENU_16BITTASK + MENUITEM "Minimaliseren &bij gebruik", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Verbergen indien geminimaliseerd", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED MENUITEM "", ID_OPTIONS_SHOW16BITTASKS, CHECKED END @@ -406,7 +406,7 @@ BEGIN IDS_TAB_IOOTHERBYTES "I/O: overige bytes" IDS_TAB_COMMANDLINE "Command Line" IDS_MENU_SELECTCOLUMNS "&Kolommen selecteren..." - IDS_MENU_16BITTASK "16-&bits taken weergeven" //FIXME: accelerator collision &b with ID_OPTIONS_MINIMIZEONUSE + IDS_MENU_16BITTASK "&16-bits taken weergeven" //FIXME: Please double-check this accelerator IDS_MENU_WINDOWS "&Vensters" IDS_MENU_LARGEICONS "&Grote pictogrammen" IDS_MENU_SMALLICONS "&Kleine pictogrammen" @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "Waarschuwing: het wijzigen van de prioriteitsklasse van dit proces\nkan ongewenste resultaten hebben, zoals een instabiel systeem. Weet u\nzeker dat u de prioriteitsklasse wilt wijzigen?" IDS_MSG_TRAYICONCPUUSAGE "CPU-gebruik: %d%%" IDS_STATUS_MEMUSAGE "Geheugengebruik: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU-gebruik: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processen: %d" IDS_NOT_RESPONDING "Reageert niet" IDS_RUNNING "Geactiveerd" diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 67730f81dc5..289ff3c1515 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "ADVARSEL: Endring av prioritet klasse av denne prosess kan\nforutsake uønsket resultat inkluderer systemet kan bli ustabilt. Er du\nsikker på at du vil endre prioritet klassen?" IDS_MSG_TRAYICONCPUUSAGE "Prosessorbruk: %d%%" IDS_STATUS_MEMUSAGE "Tildelt minne: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Prosessorbruk: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Prosesser: %d" IDS_NOT_RESPONDING "Ingen reaksjon" IDS_RUNNING "Kjører" diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index 96d5e6bff2c..f6c1f711eb4 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -435,7 +435,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "UWAGA: Zmiana priorytetu tego procesu może przynieść\nniepożądane skutki, w tym również niestabilność systemu.\nCzy na pewno chcesz zmieni priorytet?" IDS_MSG_TRAYICONCPUUSAGE "Użycie procesora: %d%%" IDS_STATUS_MEMUSAGE "Pam. zadeklar.: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Użycie procesora: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "Nie odpowiada" IDS_RUNNING "Uruchomiony" diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index 189c1e54bec..1f65f343855 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteração da classe de prioridade do processo\npode causar efeitos indesejáveis, inclusive a instabilidade do sistema. Tem\ncerteza de que deseja alterar a classe de prioridade?" IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso de Memória: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processo: %d" IDS_NOT_RESPONDING "Não respondendo" IDS_RUNNING "Execuando" diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index d2902236b57..f154a956ef9 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteração da classe de prioridade do processo\npode causar efeitos indesejáveis, inclusive a instabilidade do sistema. Tem\ncerteza de que deseja alterar a classe de prioridade?" IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%" IDS_STATUS_MEMUSAGE "Uso de Memória: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Uso de CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processo: %d" IDS_NOT_RESPONDING "Não responde" IDS_RUNNING "Em execução" diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index b5ab21b374e..db122334cab 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -433,7 +433,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "Schimbarea priorității poate duce la efecte colaterale\nprecum instabilitatea sistemului.\nSigur doriți schimbarea priorității procesului?" IDS_MSG_TRAYICONCPUUSAGE "Utilizare procesor: %d%%" IDS_STATUS_MEMUSAGE "Utilizare memorie: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Utilizare procesor: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Procese: %d" IDS_NOT_RESPONDING "EXECUȚIE ANORMALĂ" IDS_RUNNING "execuție normală" diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index 400046cd393..302c9530f09 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "ВНИМАНИЕ! Изменение класса приоритета этого\nпроцесса может привести к нежелательным результатам,\nв том числе к нестабильной работе системы. Вы\nдействительно хотите изменить класс приоритета?" IDS_MSG_TRAYICONCPUUSAGE "Загрузка ЦП: %d%%" IDS_STATUS_MEMUSAGE "Выделение памяти: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Загрузка ЦП: %3d%%" + IDS_STATUS_CPUUSAGE "ЦП: %3d%%" IDS_STATUS_PROCESSES "Процессов: %d" IDS_NOT_RESPONDING "Не отвечает" IDS_RUNNING "Работает" diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 721160da292..7f4fdbe288b 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu môže mať\nnežiadúce dôsledky vrátane nestability systému.\nNaozaj chcete zmeniť triedu priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "Využitie procesora: %d%%" IDS_STATUS_MEMUSAGE "Využitá pamäť: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Využitie procesora: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Procesy: %d" IDS_NOT_RESPONDING "Neodpovedá" IDS_RUNNING "Spustené" diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index fd8a285586f..2f1a3af7a46 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te\nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?" IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%" IDS_STATUS_MEMUSAGE "Perdorimi i Mem: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Perdorimi i CPU: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Proceset: %d" IDS_NOT_RESPONDING "Nuk pergjigjet" IDS_RUNNING "Ne pune" diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 50cf81c4a31..619952573f6 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "VARNING: Ändring av prioritetsklassen hos den här processen kan\norsaka oönskade effekter och påverka systemets stabilitet. Är du\nsäker på att du vill ändra prioritetsklassen?" IDS_MSG_TRAYICONCPUUSAGE "Processoranvändning: %d%%" IDS_STATUS_MEMUSAGE "Minnesanv: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Processoranv: %3d%%" + IDS_STATUS_CPUUSAGE "CPU: %3d%%" IDS_STATUS_PROCESSES "Processer: %d" IDS_NOT_RESPONDING "Svarar inte" IDS_RUNNING "Igång" diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index b108153265e..2ac8d2a2d37 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -432,7 +432,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu işlemin öncelik sınıfının değiştirilmesi, sistem\nkararsızlığı dahil pek çok istenmeyen sonuca neden olabilir. Öncelik\nsınıfını değiştirmek istediğinizden emin misiniz?" IDS_MSG_TRAYICONCPUUSAGE "CPU Kullanımı: %%%d" IDS_STATUS_MEMUSAGE "Ayrılmış Bellek: %s / %s (%%%d)" - IDS_STATUS_CPUUSAGE "CPU Kullanımı: %%%3d" + IDS_STATUS_CPUUSAGE "CPU: %%%3d" IDS_STATUS_PROCESSES "İşlem: %d" IDS_NOT_RESPONDING "Yanıt Vermiyor" IDS_RUNNING "Çalışıyor" diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 7eaefe2f718..1edb26fb65c 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -430,7 +430,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "УВАГА! Зміна класу пріоритету цього процесу може призвести до\nнебажаних наслідків, включаючи нестабільну роботу\nсистеми. Ви дійсно бажаєте змінити пріоритет класу?" IDS_MSG_TRAYICONCPUUSAGE "Використання ЦП: %d%%" IDS_STATUS_MEMUSAGE "Пам'ять: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "Використання ЦП: %3d%%" + IDS_STATUS_CPUUSAGE "ЦП: %3d%%" IDS_STATUS_PROCESSES "Процесів: %d" IDS_NOT_RESPONDING "Не відповідає" IDS_RUNNING "Виконується" diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index f79d04301a0..6491ef592bb 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -433,7 +433,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "警告：改变这一进程的优先级可能会\n导致意外的结果，包括系统不稳定。您确定\n要更改优先级类？" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情况：%d%%" IDS_STATUS_MEMUSAGE "内存使用情况：%s / %s（%d%%）" - IDS_STATUS_CPUUSAGE "CPU 使用情况：%3d%%" + IDS_STATUS_CPUUSAGE "CPU： %3d%%" IDS_STATUS_PROCESSES "进程数：%d" IDS_NOT_RESPONDING "未响应" IDS_RUNNING "正在运行" diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index 79456a30c85..da13b9d218e 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -438,7 +438,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "警告：更改此處理程序的優先順序可能導致系統不穩定。\n你確定要更改優先順序嗎？" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情況： %d%%" IDS_STATUS_MEMUSAGE "記憶體使用情況： %s ／ %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU 使用情況： %3d%%" + IDS_STATUS_CPUUSAGE "CPU： %3d%%" IDS_STATUS_PROCESSES "處理程序： %d" IDS_NOT_RESPONDING "沒有回應" IDS_RUNNING "正在執行" diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 519312b4038..303eca99727 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -438,7 +438,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "警告：更改此處理程序的優先順序可能導致系統不穩定。\n您確定要更改優先順序嗎？" IDS_MSG_TRAYICONCPUUSAGE "CPU 使用情況： %d%%" IDS_STATUS_MEMUSAGE "記憶體使用情況： %s ／ %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU 使用情況： %3d%%" + IDS_STATUS_CPUUSAGE "CPU： %3d%%" IDS_STATUS_PROCESSES "處理程序： %d" IDS_NOT_RESPONDING "沒有回應" IDS_RUNNING "正在執行" diff --git a/base/applications/taskmgr/taskmgr.h b/base/applications/taskmgr/taskmgr.h index d0a8920fa1d..58eee4692b2 100644 --- a/base/applications/taskmgr/taskmgr.h +++ b/base/applications/taskmgr/taskmgr.h @@ -15,7 +15,7 @@ #define STATUS_WINDOW 2001 #define STATUS_SIZE1 85 -#define STATUS_SIZE2 190 +#define STATUS_SIZE2 157 // he-IL.rc determines minimum width: 72 == 157 - 85 #define STATUS_SIZE3 400 typedef struct @@ -36,15 +36,14 @@ typedef struct BOOL HideWhenMinimized; BOOL Show16BitTasks; - /* Update speed settings */ - /* How many half-seconds in between updates (i.e. 0 - Paused, 1 - High, 2 - Normal, 4 - Low) */ + /* 0 - Paused, 1 - High, 2 - Normal, 4 - Low */ DWORD UpdateSpeed; /* Applications page settings */ DWORD ViewMode; /* Processes page settings */ - BOOL ShowProcessesFromAllUsers; /* Server-only? */ + BOOL ShowProcessesFromAllUsers; BOOL Columns[COLUMN_NMAX]; int ColumnOrderArray[COLUMN_NMAX]; int ColumnSizeArray[COLUMN_NMAX]; @@ -54,7 +53,6 @@ typedef struct /* Performance page settings */ BOOL CPUHistory_OneGraphPerCPU; BOOL ShowKernelTimes; - } TASKMANAGER_SETTINGS, *LPTASKMANAGER_SETTINGS; /* Global Variables: */ @@ -82,5 +80,5 @@ void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void); BOOL ConfirmMessageBox(HWND hWnd, LPCWSTR Text, LPCWSTR Title, UINT Type); VOID ShowWin32Error(DWORD dwError); -LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); +LPTSTR GetLastErrorText(LPTSTR lpszBuf, DWORD dwSize); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);

1 year

[reactos] 01/01: [USER32] Fix F1'97 Demo icon not showing in explorer (#5268)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75c67f9b515117b730a84… commit 75c67f9b515117b730a84800b7c0b5bf65ed192c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Nov 27 11:02:08 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 27 17:02:08 2023 +0000 [USER32] Fix F1'97 Demo icon not showing in explorer (#5268) Fixes the F1'97 Demo program (a racing game) not showing an icon in explorer. This fixes a very special kind of icons which are embedded into the executable by ancient Watcom C/C++ compilers. Windows XP/2k3sp2 can show that icon. Windows Vista/7 cannot show that icon. Due to the different behavior of the various Windows versions, we also added a testcase for our bots to protect that functionality in the future, we committed that test by 0.4.15-dev-7076-g c00d41d91c181746563e689d3390228f703053f5 (#6020) JIRA issue: CORE-10726 --- win32ss/user/user32/misc/exticon.c | 69 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index 2afd6e6d975..fec6103b2bb 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -743,9 +743,78 @@ static UINT ICO_ExtractIconExW( xresdir = find_entry_by_id(iconresdir, LOWORD(pIconId[i]), rootresdir); if( !xresdir ) { +#ifdef __REACTOS__ + /* XP/2K3 can decode icons this way. Vista/7 cannot. This handles + * damaged Resources in 'Icon Group' by falling back to 'Icon' resources. + * Older Watcom C/C++ compilers can generate such a case */ + const IMAGE_RESOURCE_DIRECTORY *resdir; + WARN("icon entry %d not found\n", LOWORD(pIconId[i])); + + /* Try to get an icon by walking the files Resource Section */ + if (iconresdir->NumberOfIdEntries > 0) + { + xresent = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*) + (ULONG_PTR)(iconresdir + 1); + } + else + { + RetPtr[i] = 0; + continue; + } + + /* Get the Resource Directory */ + resdir = (const IMAGE_RESOURCE_DIRECTORY *) + ((const char *)rootresdir + xresent->OffsetToDirectory); + + if (resdir->NumberOfIdEntries > 0) // Do we have entries + { + xresent = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*) + (ULONG_PTR)(resdir + 1); + } + else + { + RetPtr[i] = 0; + continue; + } + + /* Retrieve the data entry and find its address */ + igdataent = (const IMAGE_RESOURCE_DATA_ENTRY*) + ((const char *)rootresdir + xresent->OffsetToData); + idata = RtlImageRvaToVa(RtlImageNtHeader((HMODULE)peimage), + (HMODULE)peimage, igdataent->OffsetToData, NULL); + if (!idata) + { + RetPtr[i] = 0; + continue; + } + + /* Check to see if this looks like an icon bitmap */ + if (idata[0] == sizeof(BITMAPINFOHEADER)) + { + BITMAPINFOHEADER bmih; + RtlCopyMemory(&bmih, idata, sizeof(BITMAPINFOHEADER)); + /* Do the Width and Height look correct for an icon */ + if ((bmih.biWidth * 2) == bmih.biHeight) + { + RetPtr[0] = CreateIconFromResourceEx(idata, igdataent->Size, + TRUE, 0x00030000, cx1, cy1, flags); + if (cx2 && cy2) + RetPtr[1] = CreateIconFromResourceEx(idata, idataent->Size, + TRUE, 0x00030000, cx2, cy2, flags); + ret = 1; // Set number of icons found + goto end; // Success so Exit + } + } + else + { + RetPtr[i] = 0; + continue; + } +#else WARN("icon entry %d not found\n", LOWORD(pIconId[i])); RetPtr[i]=0; continue; +#endif } xresdir = find_entry_default(xresdir, rootresdir); idataent = (const IMAGE_RESOURCE_DATA_ENTRY*)xresdir;

1 year

[reactos] 01/01: [IEXPLORE][INF] Follow-up of 76b25a7

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f630bbce0a6851cd9dd5d… commit f630bbce0a6851cd9dd5df14468617ee33771584 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 27 21:19:05 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 27 21:19:05 2023 +0900 [IEXPLORE][INF] Follow-up of 76b25a7 Adapt icon location to ReactOS. CORE-18625 --- base/applications/iexplore/iexplore.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index 49ed75c74d0..655599ae755 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -26,7 +26,7 @@ HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,0x00020000,"%SystemRoot%\system32\she HKCR,"CLSID\%CLSID_Internet%\Shell",,,"open" HKCR,"CLSID\%CLSID_Internet%\Shell\open",,,"" HKCR,"CLSID\%CLSID_Internet%\Shell\open\Command",,,"rundll32.exe url,OpenURL https://google.com" -HKCR,"CLSID\%CLSID_Internet%\ShellFolder","",,"@%SystemRoot%\system32\ieframe.dll,-190" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","",,"@%SystemRoot%\system32\shell32.dll,-512" HKCR,"CLSID\%CLSID_Internet%\ShellFolder","Attributes",0x10001,0x24 HKCR,"CLSID\%CLSID_Internet%\ShellFolder","HideAsDeletePerUser",,"" HKCR,"CLSID\%CLSID_Internet%\ShellFolder","HideFolderVerbs",,""

1 year

[reactos] 01/01: [IEXPLORE][INF] Fix 'Internet Browser' registry settings

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76b25a747a17bd39b9453… commit 76b25a747a17bd39b9453934c3331f01fc29d940 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 27 21:07:54 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 27 21:07:54 2023 +0900 [IEXPLORE][INF] Fix 'Internet Browser' registry settings HKCR\CLSID\%CLSID_Internet%\ShellFolder" was wrong. CORE-18625 --- base/applications/iexplore/iexplore.inf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/iexplore/iexplore.inf b/base/applications/iexplore/iexplore.inf index ee7d404e792..49ed75c74d0 100644 --- a/base/applications/iexplore/iexplore.inf +++ b/base/applications/iexplore/iexplore.inf @@ -26,7 +26,12 @@ HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,0x00020000,"%SystemRoot%\system32\she HKCR,"CLSID\%CLSID_Internet%\Shell",,,"open" HKCR,"CLSID\%CLSID_Internet%\Shell\open",,,"" HKCR,"CLSID\%CLSID_Internet%\Shell\open\Command",,,"rundll32.exe url,OpenURL https://google.com" -HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","",,"@%SystemRoot%\system32\ieframe.dll,-190" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","Attributes",0x10001,0x24 +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","HideAsDeletePerUser",,"" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","HideFolderVerbs",,"" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","HideOnDesktopPerUser",,"" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder","WantsParseDisplayName",,"" HKCR,"CLSID\%CLSID_InternetExplorerManager%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe"" -startmanager"

1 year

[reactos] 01/01: [INPUT] Fix exception on SPI_SETDEFALTINPUTLANG (#6043)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7a4c26322d789e9f40be… commit f7a4c26322d789e9f40bed61484376b6cef930c5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 27 20:25:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 27 20:25:58 2023 +0900 [INPUT] Fix exception on SPI_SETDEFALTINPUTLANG (#6043) Follow-up to #4666. Fix an abnormal termination at setting the default language. - pCurrent was NULL at the scene. Don't use it there for SPI_SETDEFALTINPUTLANG. - Save the default keyboard layout. Use it. CORE-11700, CORE-13244, CORE-18364 --- dll/cpl/input/input_list.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index 8cb6b443cca..e7026fe8853 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -385,6 +385,7 @@ InputList_Process(VOID) DWORD dwNumber; BOOL bRet = FALSE; HKEY hPreloadKey, hSubstKey; + HKL hDefaultKL = NULL; if (!InputList_PrepareUserRegistry(&hPreloadKey, &hSubstKey)) { @@ -442,6 +443,9 @@ InputList_Process(VOID) /* Activate the DEFAULT entry */ ActivateKeyboardLayout(pCurrent->hkl, KLF_RESET); + + /* Save it */ + hDefaultKL = pCurrent->hkl; break; } } @@ -467,7 +471,7 @@ InputList_Process(VOID) } /* Change the default keyboard language */ - if (SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &pCurrent->hkl, 0)) + if (SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hDefaultKL, 0)) { DWORD dwRecipients = BSM_ALLDESKTOPS | BSM_APPLICATIONS; @@ -475,7 +479,7 @@ InputList_Process(VOID) &dwRecipients, WM_INPUTLANGCHANGEREQUEST, INPUTLANGCHANGE_SYSCHARSET, - (LPARAM)pCurrent->hkl); + (LPARAM)hDefaultKL); } /* Retry to delete (in case of failure to delete the default keyboard) */

1 year

[reactos] 01/01: [IMM32] s/CopyMemory/RtlCopyMemory/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb642f727fa883645d4e6… commit fb642f727fa883645d4e61ade79d62949ea75ac5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 27 16:21:34 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Nov 27 16:21:34 2023 +0900 [IMM32] s/CopyMemory/RtlCopyMemory/ CORE-19268 --- dll/win32/imm32/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index cd7cfd56bd2..09eef47e7b5 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -135,7 +135,7 @@ HBITMAP Imm32LoadBitmapFromBytes(const BYTE *pb) DeleteObject(hbm); return NULL; } - CopyMemory(pvBits, pb, bm.bmWidthBytes * bm.bmHeight); + RtlCopyMemory(pvBits, pb, bm.bmWidthBytes * bm.bmHeight); return hbm; } @@ -196,10 +196,10 @@ BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax) *(LPDWORD)pb = cbBytes; pb += sizeof(DWORD); - CopyMemory(pb, &bmci.bmciHeader, sizeof(BITMAPCOREHEADER)); + RtlCopyMemory(pb, &bmci.bmciHeader, sizeof(BITMAPCOREHEADER)); pb += sizeof(BITMAPCOREHEADER); - CopyMemory(pb, &bmci.bmciColors, cColors * sizeof(RGBTRIPLE)); + RtlCopyMemory(pb, &bmci.bmciColors, cColors * sizeof(RGBTRIPLE)); pb += cColors * sizeof(RGBTRIPLE); ret = GetDIBits(hDC, hbm, 0, bm.bmHeight, pb, (LPBITMAPINFO)&bmci, DIB_RGB_COLORS);

1 year

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023