Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [MSGINA] Update Russian (ru-RU) translation
by Stanislav Motylkov 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0250607f234ca0f7f3f0… commit a0250607f234ca0f7f3f06531e81d9d4c5a96bcb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 31 20:10:23 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:10:23 2023 +0300 [MSGINA] Update Russian (ru-RU) translation --- dll/win32/msgina/lang/ru-RU.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 7db4abd7ad6..f4685e012e6 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -232,14 +232,14 @@ BEGIN IDS_PASSWORDMUSTCHANGE "Вы должны сменить пароль при следующем входе." IDS_PASSWORDEXPIRED "Срок действия вашего пароля истек, необходимо его изменить." IDS_ACCOUNTEXPIRED "Срок действия вашего аккаунта истек. Пожалуйста, обратитесь к системному администратору." - IDS_ACCOUNTLOCKED "Unable to log you on beacuse your account has been locked out. Please see your system administrator." - IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." - IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." - IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_ACCOUNTLOCKED "Вход в систему невозможен, так как ваша учётная запись заблокирована. Обратитесь к администратору сети." + IDS_INVALIDLOGONHOURS "Ограничения вашей учётной записи запрещают вход в систему в данное время. Повторите попытку позже." + IDS_INVALIDWORKSTATION "Ограничения вашей учётной записи запрещают вход в систему с данного компьютера. Используйте другой компьютер." + IDS_ACCOUNTRESTRICTION "Вход в систему невозможен из-за ограничений для учётной записи." + IDS_EMERGENCYLOGOFFTITLE "Выход из ReactOS" + IDS_EMERGENCYLOGOFF "Нажмите OK, чтобы завершить сеанс с потерей всех несохранённых данных. Используйте этот вариант только при крайней необходимости." + IDS_EMERGENCYRESTARTTITLE "Аварийная перезагрузка" + IDS_EMERGENCYRESTART "Нажмите OK, чтобы перезагрузить компьютер с потерей всех несохранённых данных. Используйте этот вариант только при крайней необходимости." END /* Shutdown Dialog Strings */

1 0

[reactos] 01/02: [SHELL32] Update Russian (ru-RU) translation
by Stanislav Motylkov 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72b59e2459264f6e3745e… commit 72b59e2459264f6e3745e04e692026bed1bce1c9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 31 20:10:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:10:02 2023 +0300 [SHELL32] Update Russian (ru-RU) translation --- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 0d7ae9e0af9..2e4f44ed294 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -815,8 +815,8 @@ BEGIN IDS_MOVEERROR "Не удаётся переместить '%s': %s" IDS_COPYERROR "Не удаётся скопировать '%s': %s" - IDS_CREATEFILE_DENIED "Could not create file %1" - IDS_CREATEFILE_CAPTION "Error creating file" + IDS_CREATEFILE_DENIED "Невозможно создать файл '%1'" + IDS_CREATEFILE_CAPTION "Невозможно создать файл" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" IDS_DELETEITEM_CAPTION "Подтверждение удаления файла"

1 0

[reactos] 01/01: [NTOS:KD] Fix release builds.
by Hermès Bélusca-Maïto 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2294b4c84b025b2e6f0a… commit b2294b4c84b025b2e6f0a6dc6cb3210aae1944a6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 31 17:09:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 17:10:34 2023 +0200 [NTOS:KD] Fix release builds. --- ntoskrnl/kd/kdio.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 1a9c4c5fbb4..cfaa0d46875 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -593,8 +593,9 @@ KdIoPrintf( KdIoPrintString(Buffer, Length); } - +#ifdef KDBG extern const CSTRING KdbPromptStr; +#endif VOID NTAPI @@ -645,9 +646,11 @@ KdReceivePacket( _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT Context) { +#ifdef KDBG PDBGKD_DEBUG_IO DebugIo; STRING ResponseString; CHAR MessageBuffer[512]; +#endif if (PacketType != PACKET_TYPE_KD_DEBUG_IO) { @@ -655,6 +658,7 @@ KdReceivePacket( return KdPacketTimedOut; } +#ifdef KDBG DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; /* Validate API call */ @@ -703,6 +707,7 @@ KdReceivePacket( /* Only now we can copy back the data into MessageData->Buffer */ RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); +#endif return KdPacketReceived; }

1 0

[reactos] 01/01: [NTOS:KD:KDBG] Integration into KD framework (Part 2/3)
by Hermès Bélusca-Maïto 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d0ffb7d7dbc37d2263a6… commit 0d0ffb7d7dbc37d2263a6109693d8bbf2036a91a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 21 18:42:29 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 16:09:49 2023 +0200 [NTOS:KD:KDBG] Integration into KD framework (Part 2/3) Add redirections for KdSave/KdRestore and KdD0Transition/KdD3Transition. Both KDBG and KD(TERM) need those since they will become external transport DLLs later. --- ntoskrnl/include/ntoskrnl.h | 4 ++++ ntoskrnl/kd/kdmain.c | 39 +++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdbg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 4d70fd91627..c228e625587 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -91,6 +91,10 @@ #include <kddll.h> #ifdef KDBG /* Define new names for these exports also present in KDBG */ + #define KdD0Transition KdbgD0Transition + #define KdD3Transition KdbgD3Transition + #define KdSave KdbgSave + #define KdRestore KdbgRestore #define KdSendPacket KdbgSendPacket #define KdReceivePacket KdbgReceivePacket /* And reload the definitions with these new names */ diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 8120ab52e5d..c5b3e828e2e 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -14,6 +14,11 @@ #define NDEBUG #include <debug.h> +#undef KdD0Transition +#undef KdD3Transition +#undef KdSave +#undef KdRestore + /* PUBLIC FUNCTIONS *********************************************************/ static VOID @@ -446,4 +451,38 @@ KdDebuggerInitialize1( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdSave( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdRestore( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/ntoskrnl/kdbg/kdbg.c b/ntoskrnl/kdbg/kdbg.c index ac78f72b7e3..b61d19f8aba 100644 --- a/ntoskrnl/kdbg/kdbg.c +++ b/ntoskrnl/kdbg/kdbg.c @@ -22,6 +22,48 @@ static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; /* FUNCTIONS *****************************************************************/ +NTSTATUS +NTAPI +KdD0Transition(VOID) +#undef KdD0Transition +#define pKdD0Transition KdD0Transition +{ + /* Call KdTerm */ + return pKdD0Transition(); +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +#undef KdD3Transition +#define pKdD3Transition KdD3Transition +{ + /* Call KdTerm */ + return pKdD3Transition(); +} + +NTSTATUS +NTAPI +KdSave( + _In_ BOOLEAN SleepTransition) +#undef KdSave +#define pKdSave KdSave +{ + /* Call KdTerm */ + return pKdSave(SleepTransition); +} + +NTSTATUS +NTAPI +KdRestore( + _In_ BOOLEAN SleepTransition) +#undef KdRestore +#define pKdRestore KdRestore +{ + /* Call KdTerm */ + return pKdRestore(SleepTransition); +} + VOID NTAPI KdSendPacket(

1 0

[reactos] 01/01: [NTOS:KD:KDBG] Integration into KD framework (Part 1/3)
by Hermès Bélusca-Maïto 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2046a17ef475ac8d80bfd… commit 2046a17ef475ac8d80bfdcffc09d35712e14ec4a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 21 18:42:29 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 16:07:51 2023 +0200 [NTOS:KD:KDBG] Integration into KD framework (Part 1/3) Split KdSendPacket and KdReceivePacket into those that manipulate the KDBG state proper (reside in kdbg/kdbg.c), and those that deal only with debug input/output that will reside in a KDTERM "KD Terminal Driver" DLL. Based on some previous preparatory work by Hervé Poussineau in PR #4600. (Equivalents of commits 5162bf106 and partly e9bcf7275.) --- ntoskrnl/include/internal/kd.h | 7 -- ntoskrnl/include/ntoskrnl.h | 12 +-- ntoskrnl/kd/kdio.c | 151 +++++++----------------------------- ntoskrnl/kdbg/kdb.h | 28 ++++--- ntoskrnl/kdbg/kdb_print.c | 22 ++++-- ntoskrnl/kdbg/kdbg.c | 170 +++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 1 + 7 files changed, 242 insertions(+), 149 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index a180acf5478..caeb605cb12 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -30,13 +30,6 @@ KdPortPutByteEx( /* KD GLOBALS ****************************************************************/ -typedef enum _KD_CONTINUE_TYPE -{ - kdContinue = 0, - kdDoNotHandleException, - kdHandleException -} KD_CONTINUE_TYPE; - /* KD Internal Debug Services */ typedef enum _KDP_DEBUG_SERVICE { diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 6f2f5379bec..4d70fd91627 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -88,13 +88,15 @@ #define NOEXTAPI #include <windbgkd.h> #include <wdbgexts.h> +#include <kddll.h> #ifdef KDBG -#define KdDebuggerInitialize0 KdpDebuggerInitialize0 -#define KdDebuggerInitialize1 KdpDebuggerInitialize1 -#define KdSendPacket KdpSendPacket -#define KdReceivePacket KdpReceivePacket + /* Define new names for these exports also present in KDBG */ + #define KdSendPacket KdbgSendPacket + #define KdReceivePacket KdbgReceivePacket + /* And reload the definitions with these new names */ + #undef _KDDLL_ + #include <kddll.h> #endif -#include <kddll.h> #ifdef __ROS_ROSSYM__ #include <reactos/rossym.h> #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 82a1ade1ed7..1a9c4c5fbb4 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -20,6 +20,9 @@ #define NDEBUG #include <debug.h> +#undef KdSendPacket +#undef KdReceivePacket + /* GLOBALS *******************************************************************/ #define KdpBufferSize (1024 * 512) @@ -54,12 +57,6 @@ PKDP_INIT_ROUTINE InitRoutines[KdMax] = #endif }; -static ULONG KdbgNextApiNumber = DbgKdContinueApi; -static CONTEXT KdbgContext; -static EXCEPTION_RECORD64 KdbgExceptionRecord; -static BOOLEAN KdbgFirstChanceException; -static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; - /* LOCKING FUNCTIONS *********************************************************/ KIRQL @@ -607,93 +604,36 @@ KdSendPacket( _In_opt_ PSTRING MessageData, _Inout_ PKD_CONTEXT Context) { - if (PacketType == PACKET_TYPE_KD_DEBUG_IO) - { - ULONG ApiNumber = ((PDBGKD_DEBUG_IO)MessageHeader->Buffer)->ApiNumber; - - /* Validate API call */ - if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) - return; - if ((ApiNumber != DbgKdPrintStringApi) && - (ApiNumber != DbgKdGetStringApi)) - { - return; - } - if (!MessageData) - return; + PDBGKD_DEBUG_IO DebugIo; - /* NOTE: MessageData->Length should be equal to - * DebugIo.u.PrintString.LengthOfString, or to - * DebugIo.u.GetString.LengthOfPromptString */ + if (PacketType != PACKET_TYPE_KD_DEBUG_IO) + { + KdIoPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return; + } - if (!KdpDebugMode.Value) - return; + DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; - /* Print the string proper */ - KdIoPrintString(MessageData->Buffer, MessageData->Length); + /* Validate API call */ + if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) return; - } - else if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) + if ((DebugIo->ApiNumber != DbgKdPrintStringApi) && + (DebugIo->ApiNumber != DbgKdGetStringApi)) { - PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer; - if (WaitStateChange->NewState == DbgKdLoadSymbolsStateChange) - { -#ifdef KDBG - PLDR_DATA_TABLE_ENTRY LdrEntry; - /* Load symbols. Currently implemented only for KDBG! */ - if (KdbpSymFindModule((PVOID)(ULONG_PTR)WaitStateChange->u.LoadSymbols.BaseOfDll, -1, &LdrEntry)) - { - KdbSymProcessSymbols(LdrEntry, !WaitStateChange->u.LoadSymbols.UnloadSymbols); - } -#endif - return; - } - else if (WaitStateChange->NewState == DbgKdExceptionStateChange) - { - KdbgNextApiNumber = DbgKdGetContextApi; - KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord; - KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance; - return; - } + return; } - else if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) - { - PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; - if (ManipulateState->ApiNumber == DbgKdGetContextApi) - { - KD_CONTINUE_TYPE Result; + if (!MessageData) + return; -#ifdef KDBG - /* Check if this is an assertion failure */ - if (KdbgExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) - { - /* Bump EIP to the instruction following the int 2C */ - KeSetContextPc(&KdbgContext, KeGetContextPc(&KdbgContext) + 2); - } + /* NOTE: MessageData->Length should be equal to + * DebugIo.u.PrintString.LengthOfString, or to + * DebugIo.u.GetString.LengthOfPromptString */ - Result = KdbEnterDebuggerException(&KdbgExceptionRecord, - KdbgContext.SegCs & 1, - &KdbgContext, - KdbgFirstChanceException); -#else - /* We'll manually dump the stack for the user... */ - KeRosDumpStackFrames(NULL, 0); - Result = kdHandleException; -#endif - if (Result != kdHandleException) - KdbgContinueStatus = STATUS_SUCCESS; - else - KdbgContinueStatus = STATUS_UNSUCCESSFUL; - KdbgNextApiNumber = DbgKdSetContextApi; - return; - } - else if (ManipulateState->ApiNumber == DbgKdSetContextApi) - { - KdbgNextApiNumber = DbgKdContinueApi; - return; - } - } - UNIMPLEMENTED; + if (!KdpDebugMode.Value) + return; + + /* Print the string proper */ + KdIoPrintString(MessageData->Buffer, MessageData->Length); } KDSTATUS @@ -705,48 +645,16 @@ KdReceivePacket( _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT Context) { -#ifdef KDBG - STRING ResponseString; PDBGKD_DEBUG_IO DebugIo; + STRING ResponseString; CHAR MessageBuffer[512]; -#endif - - if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) - { - PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; - RtlZeroMemory(MessageHeader->Buffer, MessageHeader->MaximumLength); - if (KdbgNextApiNumber == DbgKdGetContextApi) - { - ManipulateState->ApiNumber = DbgKdGetContextApi; - MessageData->Length = 0; - MessageData->Buffer = (PCHAR)&KdbgContext; - return KdPacketReceived; - } - else if (KdbgNextApiNumber == DbgKdSetContextApi) - { - ManipulateState->ApiNumber = DbgKdSetContextApi; - MessageData->Length = sizeof(KdbgContext); - MessageData->Buffer = (PCHAR)&KdbgContext; - return KdPacketReceived; - } - else if (KdbgNextApiNumber != DbgKdContinueApi) - { - UNIMPLEMENTED; - } - ManipulateState->ApiNumber = DbgKdContinueApi; - ManipulateState->u.Continue.ContinueStatus = KdbgContinueStatus; - - /* Prepare for next time */ - KdbgNextApiNumber = DbgKdContinueApi; - KdbgContinueStatus = STATUS_SUCCESS; - - return KdPacketReceived; - } if (PacketType != PACKET_TYPE_KD_DEBUG_IO) + { + KdIoPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); return KdPacketTimedOut; + } -#ifdef KDBG DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; /* Validate API call */ @@ -795,7 +703,6 @@ KdReceivePacket( /* Only now we can copy back the data into MessageData->Buffer */ RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); -#endif return KdPacketReceived; } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 2170be54f9f..df2945a7d9c 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -51,6 +51,25 @@ typedef enum _KDB_ENTER_CONDITION KdbEnterFromUmode } KDB_ENTER_CONDITION; +typedef enum _KD_CONTINUE_TYPE +{ + kdContinue = 0, + kdDoNotHandleException, + kdHandleException +} KD_CONTINUE_TYPE; + + +/* GLOBALS *******************************************************************/ + +extern PCHAR KdbInitFileBuffer; + +extern PEPROCESS KdbCurrentProcess; +extern PETHREAD KdbCurrentThread; +extern LONG KdbLastBreakPointNr; +extern ULONG KdbNumSingleSteps; +extern BOOLEAN KdbSingleStepOver; +extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; + /* FUNCTIONS *****************************************************************/ @@ -74,8 +93,6 @@ KdbpStackSwitchAndCall( /* from kdb_cli.c */ -extern PCHAR KdbInitFileBuffer; - NTSTATUS NTAPI KdbInitialize( @@ -175,13 +192,6 @@ KdbSymInit( /* from kdb.c */ -extern PEPROCESS KdbCurrentProcess; -extern PETHREAD KdbCurrentThread; -extern LONG KdbLastBreakPointNr; -extern ULONG KdbNumSingleSteps; -extern BOOLEAN KdbSingleStepOver; -extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; - LONG KdbpGetNextBreakPointNr( IN ULONG Start OPTIONAL); diff --git a/ntoskrnl/kdbg/kdb_print.c b/ntoskrnl/kdbg/kdb_print.c index 257b37e1225..85b3ac20a6c 100644 --- a/ntoskrnl/kdbg/kdb_print.c +++ b/ntoskrnl/kdbg/kdb_print.c @@ -13,6 +13,14 @@ /* FUNCTIONS *****************************************************************/ +static KD_CONTEXT KdbgKdContext; + +#undef KdSendPacket +#define pKdSendPacket KdSendPacket + +#undef KdReceivePacket +#define pKdReceivePacket KdReceivePacket + static VOID KdbPrintStringWorker( _In_ const CSTRING* Output, @@ -48,7 +56,8 @@ KdbPrintStringWorker( Data->Buffer = (PCHAR)Output->Buffer; /* Send the packet */ - KdSendPacket(PACKET_TYPE_KD_DEBUG_IO, Header, Data, &KdpContext); + /* IO packet: call KdTerm */ + pKdSendPacket(PACKET_TYPE_KD_DEBUG_IO, Header, Data, &KdbgKdContext); } VOID @@ -88,11 +97,12 @@ KdbPromptStringWorker( do { /* Get our reply */ - Status = KdReceivePacket(PACKET_TYPE_KD_DEBUG_IO, - &Header, - &Data, - &Length, - &KdpContext); + /* IO packet: call KdTerm */ + Status = pKdReceivePacket(PACKET_TYPE_KD_DEBUG_IO, + &Header, + &Data, + &Length, + &KdbgKdContext); /* Return TRUE if we need to resend */ if (Status == KdPacketNeedsResend) diff --git a/ntoskrnl/kdbg/kdbg.c b/ntoskrnl/kdbg/kdbg.c new file mode 100644 index 00000000000..ac78f72b7e3 --- /dev/null +++ b/ntoskrnl/kdbg/kdbg.c @@ -0,0 +1,170 @@ +/* + * PROJECT: ReactOS KDBG Kernel Debugger + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel Debugger Initialization + * COPYRIGHT: Copyright 2020-2021 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> + * Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "kdb.h" + +/* GLOBALS *******************************************************************/ + +static ULONG KdbgNextApiNumber = DbgKdContinueApi; +static CONTEXT KdbgContext; +static EXCEPTION_RECORD64 KdbgExceptionRecord; +static BOOLEAN KdbgFirstChanceException; +static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdSendPacket( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_opt_ PSTRING MessageData, + _Inout_ PKD_CONTEXT Context) +#undef KdSendPacket +#define pKdSendPacket KdSendPacket +{ + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* Call KdTerm */ + pKdSendPacket(PacketType, MessageHeader, MessageData, Context); + return; + } + + /* Debugger-only packets */ + if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) + { + PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer; + if (WaitStateChange->NewState == DbgKdLoadSymbolsStateChange) + { + /* Load or unload symbols */ + PLDR_DATA_TABLE_ENTRY LdrEntry; + if (KdbpSymFindModule((PVOID)(ULONG_PTR)WaitStateChange->u.LoadSymbols.BaseOfDll, -1, &LdrEntry)) + { + KdbSymProcessSymbols(LdrEntry, !WaitStateChange->u.LoadSymbols.UnloadSymbols); + } + return; + } + else if (WaitStateChange->NewState == DbgKdExceptionStateChange) + { + KdbgNextApiNumber = DbgKdGetContextApi; + KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord; + KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance; + return; + } + } + else if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) + { + PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; + if (ManipulateState->ApiNumber == DbgKdGetContextApi) + { + KD_CONTINUE_TYPE Result; + + /* Check if this is an assertion failure */ + if (KdbgExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) + { + /* Bump EIP to the instruction following the int 2C */ + KeSetContextPc(&KdbgContext, KeGetContextPc(&KdbgContext) + 2); + } + + Result = KdbEnterDebuggerException(&KdbgExceptionRecord, + KdbgContext.SegCs & 1, + &KdbgContext, + KdbgFirstChanceException); +#if 0 + /* Manually dump the stack for the user */ + KeRosDumpStackFrames(NULL, 0); + Result = kdHandleException; +#endif + if (Result != kdHandleException) + KdbgContinueStatus = STATUS_SUCCESS; + else + KdbgContinueStatus = STATUS_UNSUCCESSFUL; + KdbgNextApiNumber = DbgKdSetContextApi; + return; + } + else if (ManipulateState->ApiNumber == DbgKdSetContextApi) + { + KdbgNextApiNumber = DbgKdContinueApi; + return; + } + } + + KdbPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return; +} + +KDSTATUS +NTAPI +KdReceivePacket( + _In_ ULONG PacketType, + _Out_ PSTRING MessageHeader, + _Out_ PSTRING MessageData, + _Out_ PULONG DataLength, + _Inout_ PKD_CONTEXT Context) +#undef KdReceivePacket +#define pKdReceivePacket KdReceivePacket +{ + if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + { + // FIXME TODO: Implement break-in for the debugger + // and return KdPacketReceived when handled properly. + return KdPacketTimedOut; + } + + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* Call KdTerm */ + return pKdReceivePacket(PacketType, + MessageHeader, + MessageData, + DataLength, + Context); + } + + /* Debugger-only packets */ + if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) + { + PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; + RtlZeroMemory(MessageHeader->Buffer, MessageHeader->MaximumLength); + if (KdbgNextApiNumber == DbgKdGetContextApi) + { + ManipulateState->ApiNumber = DbgKdGetContextApi; + MessageData->Length = 0; + MessageData->Buffer = (PCHAR)&KdbgContext; + return KdPacketReceived; + } + else if (KdbgNextApiNumber == DbgKdSetContextApi) + { + ManipulateState->ApiNumber = DbgKdSetContextApi; + MessageData->Length = sizeof(KdbgContext); + MessageData->Buffer = (PCHAR)&KdbgContext; + return KdPacketReceived; + } + else if (KdbgNextApiNumber != DbgKdContinueApi) + { + KdbPrintf("%s:%d is UNIMPLEMENTED\n", __FUNCTION__, __LINE__); + } + ManipulateState->ApiNumber = DbgKdContinueApi; + ManipulateState->u.Continue.ContinueStatus = KdbgContinueStatus; + + /* Prepare for next time */ + KdbgNextApiNumber = DbgKdContinueApi; + KdbgContinueStatus = STATUS_SUCCESS; + + return KdPacketReceived; + } + + KdbPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return KdPacketTimedOut; +} + +/* EOF */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index dddb6cae4ab..a85cb19e39a 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -404,6 +404,7 @@ if(NOT _WINKD_) if(KDBG) list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cmdhist.c

1 0

[reactos] 01/01: [REGEDIT] Update Japanese (ja-JP) tranlation Part 2
by Katayama Hirofumi MZ 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823b51558df325064ea15… commit 823b51558df325064ea15484961c2691c3e28596 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 21:01:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 21:01:56 2023 +0900 [REGEDIT] Update Japanese (ja-JP) tranlation Part 2 CORE-18706 --- base/applications/regedit/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index a3212756384..ecb5d413a28 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -295,7 +295,7 @@ BEGIN LTEXT "デバイス特有のデータ:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "使い方", IDC_STATIC, 10, 219, 125, 39 + GROUPBOX "使用用途", IDC_STATIC, 10, 219, 125, 39 LTEXT "未定", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED LTEXT "共有", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "デバイス専用", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED

1 0

[reactos] 01/01: [REGEDIT] Update Japanese (ja-JP) translation
by Katayama Hirofumi MZ 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=389377ce2a4e5e4487868… commit 389377ce2a4e5e4487868ea1744ea296d89649e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:45:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:45:25 2023 +0900 [REGEDIT] Update Japanese (ja-JP) translation CORE-18706 --- base/applications/regedit/lang/ja-JP.rc | 194 ++++++++++++++++---------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index 68f820f9ccb..a3212756384 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -15,53 +15,53 @@ END /* Command-line strings */ STRINGTABLE BEGIN - STRING_USAGE "Usage:\n\ - regedit [options] [filename] [reg_key]\n\n\ -Options:\n\ - [no option] Launch the graphical version of this program.\n\ - /L:system.dat The location of the system.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /R:user.dat The location of the user.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /C Import the contents of a registry file.\n\ - /D Delete a specified registry key.\n\ - /E Export the contents of a specified registry key to a file.\n\ - If no key is specified, the entire registry is exported.\n\ - /S Silent mode. No messages will be displayed.\n\ - /V Launch the GUI in advanced mode. Ignored.\n\ - /? Display this information and exit.\n\ - [filename] The location of the file containing registry information to\n\ - be imported. When used with [/E], this option specifies the\n\ - file location where registry information will be exported.\n\ - [reg_key] The registry key to be modified.\n\ + STRING_USAGE "使い方:\n\ + regedit [オプション] [ファイル名] [reg_key]\n\n\ +オプション:\n\ + [オプションなし] このプログラムのグラフィカルなバージョンを起動します。\n\ + /L:system.dat 変更する system.dat ファイルの場所です。\n\ + 他のスイッチと互換です。無視されます。\n\ + /R:user.dat 変更する user.dat ファイルの場所です。\n\ + 他のスイッチと互換です。無視されます。\n\ + /C レジストリファイルの内容をインポートします。\n\ + /D 指定したレジストリキーを削除します。\n\ + /E 指定したレジストリキーの内容をファイルにエクスポートします。\n\ + キーが未指定のときはレジストリ全体がエクスポートされます。\n\ + /S サイレントモード。メッセージが表示されません。\n\ + /V 上級者向けモードでGUIを起動します。無視されます。\n\ + /? この情報を表示して終了します。\n\ + [ファイル名] インポートされるレジストリ情報を含むファイルの場所です。\n\ + [/E] と一緒に使うと、このオプションは、エクスポートされる\n\ + ファイルの場所です\n\ + [reg_key] 変更されるレジストリーキーです。\n\ \n\ -Usage examples:\n\ +使用例:\n\ regedit ""import.reg""\n\ regedit /E ""export.reg"" ""HKEY_CURRENT_USER\\Console""\n\ regedit /D ""HKEY_LOCAL_MACHINE\\Error\\Path""\n" - STRING_INVALID_SWITCH "regedit: Invalid or unrecognized switch [%1]\n" - STRING_HELP "Type ""regedit /?"" for help.\n" - STRING_NO_FILENAME "regedit: No filename was specified.\n" - STRING_NO_REG_KEY "regedit: No registry key was specified for removal.\n" - STRING_FILE_NOT_FOUND "regedit: The file '%1' was not found.\n" - STRING_CANNOT_OPEN_FILE "regedit: Unable to open the file '%1'.\n" - STRING_UNHANDLED_ACTION "regedit: Unhandled action.\n" - STRING_OUT_OF_MEMORY "regedit: Out of memory! (%1!S!, line %2!u!)\n" - STRING_INVALID_HEX "regedit: Invalid hexadecimal value.\n" - STRING_CSV_HEX_ERROR "regedit: Unable to convert hexadecimal data. An invalid value was encountered at '%1'.\n" - STRING_ESCAPE_SEQUENCE "regedit: Unrecognized escape sequence [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT "regedit: Unsupported registry data type [0x%1!x!]\n" - STRING_UNEXPECTED_EOL "regedit: Unexpected end of line in '%1'.\n" - STRING_UNRECOGNIZED_LINE "regedit: The line '%1' was not recognized.\n" - STRING_SETVALUE_FAILED "regedit: Unable to add the registry value '%1' to '%2'.\n" - STRING_OPEN_KEY_FAILED "regedit: Unable to open the registry key '%1'.\n" - STRING_UNSUPPORTED_TYPE "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" - STRING_EXPORT_AS_BINARY "regedit: The registry value '%1' will be exported as binary data.\n" - STRING_INVALID_SYSTEM_KEY "regedit: Invalid system key [%1]\n" - STRING_REG_KEY_NOT_FOUND "regedit: Unable to export '%1'. The specified registry key was not found.\n" - STRING_DELETE_FAILED "regedit: Unable to delete the registry key '%1'.\n" - STRING_UNKNOWN_TYPE "Unknown Type" - STRING_INVALID_LINE_SYNTAX, "regedit: The line contains invalid syntax.\n" + STRING_INVALID_SWITCH "regedit: 無効または認識されないスイッチ [%1]\n" + STRING_HELP "ヘルプを表示するには ""regedit /?"" と入力ください。\n" + STRING_NO_FILENAME "regedit: ファイル名が未指定です。\n" + STRING_NO_REG_KEY "regedit: 除去するレジストリーキーが未指定です。\n" + STRING_FILE_NOT_FOUND "regedit: ファイル '%1' は見つかりませんでした。\n" + STRING_CANNOT_OPEN_FILE "regedit: ファイル '%1' が開けません。.\n" + STRING_UNHANDLED_ACTION "regedit: ハンドルされないアクションです。\n" + STRING_OUT_OF_MEMORY "regedit: メモリー不足です! (%1!S!, 行 %2!u!)\n" + STRING_INVALID_HEX "regedit: 不正な16進数の値です。\n" + STRING_CSV_HEX_ERROR "regedit: 16進数のデータを変換できません。不正な値が '%1' で見つかりました。\n" + STRING_ESCAPE_SEQUENCE "regedit: 認識されないエスケープシーケンスです [\\%1!c!]\n" + STRING_UNKNOWN_DATA_FORMAT "regedit: 未サポートのレジストリデータの種類です [0x%1!x!]\n" + STRING_UNEXPECTED_EOL "regedit: 予期しない行の終わりです。'%1'\n" + STRING_UNRECOGNIZED_LINE "regedit: 行 '%1' は認識されません。\n" + STRING_SETVALUE_FAILED "regedit: レジストリ値 '%1' を '%2' に追加できませんでした。\n" + STRING_OPEN_KEY_FAILED "regedit: レジストリキー '%1' を開けませんでした。\n" + STRING_UNSUPPORTED_TYPE "regedit: 未サポートのレジストリデータの種類 [0x%1!x!] が '%2' で見つかりました。\n" + STRING_EXPORT_AS_BINARY "regedit: レジストリ値 '%1' がバイナリデータでエクスポートされます。\n" + STRING_INVALID_SYSTEM_KEY "regedit: 不正なシステムキーです [%1]\n" + STRING_REG_KEY_NOT_FOUND "regedit: '%1' をエクスポートできません。指定されたレジストリキーが見つかりません。\n" + STRING_DELETE_FAILED "regedit: レジストリキー '%1' を削除できません。\n" + STRING_UNKNOWN_TYPE "未知の種類" + STRING_INVALID_LINE_SYNTAX, "regedit: 無効な文法の行があります。\n" END /* Menus */ @@ -277,39 +277,39 @@ END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resources" +CAPTION "リソース" FONT 9, "MS UI Gothic" BEGIN LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "割り込み:", IDC_STATIC, 10, 48, 35, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 - LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8 + LTEXT "メモリ:", IDC_STATIC, 10, 91, 32, 8 CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 - LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8 + LTEXT "ポート:", IDC_STATIC, 10, 134, 38, 8 CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 - LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8 + LTEXT "デバイス特有のデータ:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "Usage", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED - LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED - LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED - LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED - RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8 + GROUPBOX "使い方", IDC_STATIC, 10, 219, 125, 39 + LTEXT "未定", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "共有", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "デバイス専用", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "ドライバ専用", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "ｲﾝﾀｰﾌｪｲｽの種類:", IDC_STATIC, 144, 220, 58, 8 LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 - RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8 + RTEXT "バス番号:", IDC_STATIC, 151, 230, 51, 8 LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 - RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8 + RTEXT "バージョン:", IDC_STATIC, 151, 240, 51, 8 LTEXT "", IDC_VERSION, 205, 240, 66, 8 - RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + RTEXT "リビジョン:", IDC_STATIC, 151, 250, 51, 8 LTEXT "", IDC_REVISION, 205, 250, 66, 8 DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14 - PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED + PUSHBUTTON "データ(&D)...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED END /* String Tables */ @@ -415,13 +415,13 @@ BEGIN IDS_FLT_REGFILE "登録ファイル" IDS_FLT_REGFILES "登録ファイル (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES "レジストリハイブファイル (*.*)" IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 登録ファイル (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "すべてのファイル (*.*)" IDS_FLT_ALLFILES_FLT "*.*" - IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES "テキストファイル (*.txt)" IDS_FLT_TXTFILES_FLT "*.txt" END @@ -466,40 +466,40 @@ END STRINGTABLE BEGIN - IDS_BUSNUMBER "Bus Number" - IDS_INTERFACE "Interface" - IDS_DMA_CHANNEL "Channel" - IDS_DMA_PORT "Port" - IDS_INTERRUPT_VECTOR "Vector" - IDS_INTERRUPT_LEVEL "Level" - IDS_INTERRUPT_AFFINITY "Affinity" - IDS_INTERRUPT_TYPE "Type" - IDS_MEMORY_ADDRESS "Physical Address" - IDS_MEMORY_LENGTH "Length" - IDS_MEMORY_ACCESS "Access" - IDS_PORT_ADDRESS "Physical Address" - IDS_PORT_LENGTH "Length" - IDS_PORT_ACCESS "Access" - IDS_SPECIFIC_RESERVED1 "Reserved 1" - IDS_SPECIFIC_RESERVED2 "Reserved 2" - IDS_SPECIFIC_DATASIZE "Data Size" + IDS_BUSNUMBER "バス番号" + IDS_INTERFACE "インターフェイス" + IDS_DMA_CHANNEL "チャンネル" + IDS_DMA_PORT "ポート" + IDS_INTERRUPT_VECTOR "ベクター" + IDS_INTERRUPT_LEVEL "レベル" + IDS_INTERRUPT_AFFINITY "アフィニティ" + IDS_INTERRUPT_TYPE "種類" + IDS_MEMORY_ADDRESS "物理アドレス" + IDS_MEMORY_LENGTH "長さ" + IDS_MEMORY_ACCESS "アクセス" + IDS_PORT_ADDRESS "物理アドレス" + IDS_PORT_LENGTH "長さ" + IDS_PORT_ACCESS "アクセス" + IDS_SPECIFIC_RESERVED1 "予約済み 1" + IDS_SPECIFIC_RESERVED2 "予約済み 2" + IDS_SPECIFIC_DATASIZE "データサイズ" END STRINGTABLE BEGIN - IDS_PORT_PORT_IO "Port" - IDS_PORT_MEMORY_IO "Memory" + IDS_PORT_PORT_IO "ポート" + IDS_PORT_MEMORY_IO "メモリ" IDS_INTERRUPT_EDGE_SENSITIVE "Edge Sensitive" IDS_INTERRUPT_LEVEL_SENSITIVE "Level Sensitive" - IDS_MEMORY_READ_ONLY "Read Only" - IDS_MEMORY_WRITE_ONLY "Write Only" - IDS_MEMORY_READ_WRITE "Read / Write" + IDS_MEMORY_READ_ONLY "読み込みのみ" + IDS_MEMORY_WRITE_ONLY "書き込みのみ" + IDS_MEMORY_READ_WRITE "読み書き可能" END STRINGTABLE BEGIN - IDS_BUS_UNDEFINED "Undefined" - IDS_BUS_INTERNAL "Internal" + IDS_BUS_UNDEFINED "未定義" + IDS_BUS_INTERNAL "内部" IDS_BUS_ISA "ISA" IDS_BUS_EISA "EISA" IDS_BUS_MICROCHANNEL "MicroChannel" @@ -511,25 +511,25 @@ BEGIN IDS_BUS_CBUS "C-Bus" IDS_BUS_MPIBUS "MPI-Bus" IDS_BUS_MPSABUS "MPSA-Bus" - IDS_BUS_PROCESSORINTERNAL "Processor Internal" - IDS_BUS_INTERNALPOWERBUS "Internal Power Bus" + IDS_BUS_PROCESSORINTERNAL "内部プロセッサ" + IDS_BUS_INTERNALPOWERBUS "内部 Power Bus" IDS_BUS_PNPISABUS "PnP-ISA Bus" IDS_BUS_PNPBUS "PnP Bus" - IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" + IDS_BUS_UNKNOWNTYPE "未知のインターフェイスの種類" END STRINGTABLE BEGIN - IDS_FIELD_KEY_NAME "Key Name:" - IDS_FIELD_CLASS_NAME "Class Name:" - IDS_NO_CLASS_NAME "<NO CLASS>" - IDS_NULL_TIMESTAMP "<NULL>" - IDS_FIELD_NAME " Name:" - IDS_FIELD_TYPE " Type:" - IDS_FIELD_DATA " Data:" - IDS_FIELD_LASTWRITE "Last Write Time:" - IDS_UNKNOWN "<UNKNOWN>" - IDS_VALUE_INDEX "Value %d" + IDS_FIELD_KEY_NAME "キー名:" + IDS_FIELD_CLASS_NAME "クラス名:" + IDS_NO_CLASS_NAME "<クラスなし>" + IDS_NULL_TIMESTAMP "<なし>" + IDS_FIELD_NAME " 名前:" + IDS_FIELD_TYPE " 種類:" + IDS_FIELD_DATA " データ:" + IDS_FIELD_LASTWRITE "最終書き込み時刻:" + IDS_UNKNOWN "<未知>" + IDS_VALUE_INDEX "値 %d" END /*****************************************************************/

1 0

[reactos] 01/01: [SHELL32] Update Japanese (ja-JP) tranlation
by Katayama Hirofumi MZ 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=294ec1e6f4fc7f03738bf… commit 294ec1e6f4fc7f03738bf632ac9a78f52869199d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:21:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:21:45 2023 +0900 [SHELL32] Update Japanese (ja-JP) tranlation CORE-18706 --- dll/win32/shell32/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 507c0abc428..4f2281ed0cc 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -805,8 +805,8 @@ BEGIN IDS_MOVEERROR "移動できません '%s': %s" IDS_COPYERROR "コピーできません '%s': %s" - IDS_CREATEFILE_DENIED "Could not create file %1" - IDS_CREATEFILE_CAPTION "Error creating file" + IDS_CREATEFILE_DENIED "ファイル %1 を作成できません" + IDS_CREATEFILE_CAPTION "ファイルの作成エラー" IDS_CREATEFOLDER_DENIED "フォルダ '%1' を作成できません" IDS_CREATEFOLDER_CAPTION "フォルダを作成できません" IDS_DELETEITEM_CAPTION "ファイル削除の確認"

1 0

[reactos] 01/01: [MSGINA] Update Japanese (ja-JP) translation
by Katayama Hirofumi MZ 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f23bb1ab76747d5c040c4… commit f23bb1ab76747d5c040c4de9fef9b52ec584889e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:16:28 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:16:45 2023 +0900 [MSGINA] Update Japanese (ja-JP) translation CORE-18706 --- dll/win32/msgina/lang/ja-JP.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 9373b73e0c5..4224dc976f9 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -239,10 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "あなたのアカウントはこの時間のログオンを妨げる時間制限があります。あとでやり直して下さい。" IDS_INVALIDWORKSTATION "あなたのアカウントはこのコンピュータで使えないように設定されています。他のコンピュータをお使い下さい。" IDS_ACCOUNTRESTRICTION "アカウント制限のため、あなたはログオンできません。" - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "ReactOS のログオフ" + IDS_EMERGENCYLOGOFF "すぐにログオフするにはOKをクリックしてください。保存していないデータは失われます。最終手段としてのみお使いください。" + IDS_EMERGENCYRESTARTTITLE "緊急再起動" + IDS_EMERGENCYRESTART "すぐに再起動するにはOKをクリックしてください。保存していないデータは失われます。最終手段としてのみお使いください。" END /* Shutdown Dialog Strings */

1 0

[reactos] 01/01: [WINLOGON][MSGINA] Add emergency restart and log off features (#5629)
by Carl J. Bialorucki 31 Aug '23

31 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2263547985f05efa6fff4… commit 2263547985f05efa6fff46da5c0d8d38f8c48918 Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Thu Aug 31 03:51:54 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 31 11:51:54 2023 +0200 [WINLOGON][MSGINA] Add emergency restart and log off features (#5629) CORE-18958 Introduce an emergency log-off and restart feature, available when holding down the control key and selecting "Log Off" or "Shut down" in the MSGINA Ctrl-Alt-Del security dialog, similar to Windows Server 2003 and newer Windows versions. --- base/system/winlogon/sas.c | 6 +++++- dll/win32/msgina/gui.c | 40 ++++++++++++++++++++++++++++++++++++++-- dll/win32/msgina/lang/bg-BG.rc | 4 ++++ dll/win32/msgina/lang/cs-CZ.rc | 4 ++++ dll/win32/msgina/lang/de-DE.rc | 4 ++++ dll/win32/msgina/lang/en-US.rc | 4 ++++ dll/win32/msgina/lang/es-ES.rc | 4 ++++ dll/win32/msgina/lang/fr-FR.rc | 4 ++++ dll/win32/msgina/lang/he-IL.rc | 4 ++++ dll/win32/msgina/lang/hu-HU.rc | 4 ++++ dll/win32/msgina/lang/id-ID.rc | 4 ++++ dll/win32/msgina/lang/it-IT.rc | 4 ++++ dll/win32/msgina/lang/ja-JP.rc | 4 ++++ dll/win32/msgina/lang/no-NO.rc | 4 ++++ dll/win32/msgina/lang/pl-PL.rc | 4 ++++ dll/win32/msgina/lang/pt-PT.rc | 4 ++++ dll/win32/msgina/lang/ro-RO.rc | 4 ++++ dll/win32/msgina/lang/ru-RU.rc | 4 ++++ dll/win32/msgina/lang/sk-SK.rc | 4 ++++ dll/win32/msgina/lang/sq-AL.rc | 4 ++++ dll/win32/msgina/lang/tr-TR.rc | 4 ++++ dll/win32/msgina/lang/uk-UA.rc | 4 ++++ dll/win32/msgina/lang/zh-CN.rc | 4 ++++ dll/win32/msgina/lang/zh-HK.rc | 4 ++++ dll/win32/msgina/lang/zh-TW.rc | 4 ++++ dll/win32/msgina/resource.h | 6 ++++++ 26 files changed, 141 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/sas.c b/base/system/winlogon/sas.c index b94663b1c55..c9675ba314d 100644 --- a/base/system/winlogon/sas.c +++ b/base/system/winlogon/sas.c @@ -1060,13 +1060,17 @@ DoGenericAction( break; case WLX_SAS_ACTION_LOGOFF: /* 0x04 */ case WLX_SAS_ACTION_SHUTDOWN: /* 0x05 */ + case WLX_SAS_ACTION_FORCE_LOGOFF: /* 0x09 */ case WLX_SAS_ACTION_SHUTDOWN_POWER_OFF: /* 0x0a */ case WLX_SAS_ACTION_SHUTDOWN_REBOOT: /* 0x0b */ if (Session->LogonState != STATE_LOGGED_OFF) { + UINT LogOffFlags = EWX_LOGOFF; + if (wlxAction == WLX_SAS_ACTION_FORCE_LOGOFF) + LogOffFlags |= EWX_FORCE; if (!Session->Gina.Functions.WlxIsLogoffOk(Session->Gina.Context)) break; - if (!NT_SUCCESS(HandleLogoff(Session, EWX_LOGOFF))) + if (!NT_SUCCESS(HandleLogoff(Session, LogOffFlags))) { RemoveStatusMessage(Session); break; diff --git a/dll/win32/msgina/gui.c b/dll/win32/msgina/gui.c index d46126d3c25..e48c7175864 100644 --- a/dll/win32/msgina/gui.c +++ b/dll/win32/msgina/gui.c @@ -11,6 +11,8 @@ #include <wingdi.h> #include <winnls.h> #include <winreg.h> +#include <ndk/exfuncs.h> +#include <ndk/setypes.h> typedef struct _DISPLAYSTATUSMSG { @@ -31,6 +33,8 @@ typedef struct _LEGALNOTICEDATA // Timer ID for the animated dialog bar. #define IDT_BAR 1 +#define ISKEYDOWN(x) (GetKeyState(x) & 0x8000) + typedef struct _DLG_DATA { PGINA_CONTEXT pgContext; @@ -985,12 +989,44 @@ SecurityDialogProc( EndDialog(hwndDlg, WLX_SAS_ACTION_LOCK_WKSTA); return TRUE; case IDC_SECURITY_LOGOFF: - if (OnLogOff(hwndDlg, pgContext) == IDYES) + if (ISKEYDOWN(VK_CONTROL)) + { + if (ResourceMessageBox(pgContext, + hwndDlg, + MB_OKCANCEL | MB_ICONSTOP, + IDS_EMERGENCYLOGOFFTITLE, + IDS_EMERGENCYLOGOFF) == IDOK) + { + EndDialog(hwndDlg, WLX_SAS_ACTION_FORCE_LOGOFF); + } + } + else if (OnLogOff(hwndDlg, pgContext) == IDYES) + { EndDialog(hwndDlg, WLX_SAS_ACTION_LOGOFF); + } return TRUE; case IDC_SECURITY_SHUTDOWN: - if (OnShutDown(hwndDlg, pgContext) == IDOK) + /* Emergency restart feature */ + if (ISKEYDOWN(VK_CONTROL)) + { + if (ResourceMessageBox(pgContext, + hwndDlg, + MB_OKCANCEL | MB_ICONSTOP, + IDS_EMERGENCYRESTARTTITLE, + IDS_EMERGENCYRESTART) == IDOK) + { + BOOLEAN Old; + + ERR("Emergency restarting NT...\n"); + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, TRUE, FALSE, &Old); + NtShutdownSystem(ShutdownReboot); + RtlAdjustPrivilege(SE_SHUTDOWN_PRIVILEGE, Old, FALSE, &Old); + } + } + else if (OnShutDown(hwndDlg, pgContext) == IDOK) + { EndDialog(hwndDlg, pgContext->nShutdownAction); + } return TRUE; case IDC_SECURITY_CHANGEPWD: if (OnChangePassword(hwndDlg, pgContext)) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 19ec5563b02..8e5a0237010 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Вашия акаунт е временно ограничен в момента. Моля опитайте по-късно." IDS_INVALIDWORKSTATION "Акаунта ви е ограничен на този компютър. Моля използвайте друг компютър." IDS_ACCOUNTRESTRICTION "Не можете да влезете поради ограничение на акаунта." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 315efc11b06..3d95fe5f051 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index 9f8fe3c47f6..88eb44ed1bb 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Ihr Konto sieht es nicht vor, dass Sie sich zu dieser Zeit anmelden. Bitte versuchen Sie es später noch einmal." IDS_INVALIDWORKSTATION "Ihr Konto sieht es nicht vor, dass Sie sich an diesem Computer anmelden. Bitte melden Sie sich an einem anderen Computer an." IDS_ACCOUNTRESTRICTION "Wegen einer Kontenbeschränkung dürfen Sie sich nicht anmelden." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index f5525052df0..68da6e2a0ff 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index 43e75b7739b..8577228c538 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "En este momento, tu cuenta tiene restricciones horarias para acceder. Inténtelo de nuevo más tarde." IDS_INVALIDWORKSTATION "Su cuenta está configurada para no permitirte usar este equipo. Inténtelo en otro equipo." IDS_ACCOUNTRESTRICTION "Es imposible acceder porque tu cuenta tiene restricciones." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 6618e61677f..02280e05a36 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Votre compte a des restrictions temporelles qui vous empêchent de vous connecter à cette heure-ci. Veuillez réessayer ultérieurement." IDS_INVALIDWORKSTATION "Votre compte a été configuré pour que vous n'utilisiez pas cet ordinateur. Veuillez réessayer depuis un autre ordinateur." IDS_ACCOUNTRESTRICTION "Impossible de vous connecter en raison d'une restriction sur votre compte." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index b625be9fcce..2f36d057d49 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/hu-HU.rc b/dll/win32/msgina/lang/hu-HU.rc index 4eaa3e0f614..4d7024a20d8 100644 --- a/dll/win32/msgina/lang/hu-HU.rc +++ b/dll/win32/msgina/lang/hu-HU.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "A fiókján olyan időkorlátozás van, amely miatt jelenleg nem tud belépni. Kérjük próbálja újra később." IDS_INVALIDWORKSTATION "A fiókja úgy van beállítva hogy nem használhatja ezt a számítógépet. Kérjük próbálkozzon egy másik számítógéppel." IDS_ACCOUNTRESTRICTION "Fiókkorlátozás miatt nem sikerült a bejelentkezés." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 9cdbb0eecf0..fff394be844 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Akun anda memiliki pembatasan waktu sehingga mencegah untuk masuk saat ini. Mohon coba lagi nanti." IDS_INVALIDWORKSTATION "Akun anda disetel untuk mencegah masuk di komputer ini. Mohon coba gunakan komputer lain." IDS_ACCOUNTRESTRICTION "Tidak bisa masuk karena pembatasan akun." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 205b59ef30c..dc7a5621c83 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 65f8a78d4ea..9373b73e0c5 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "あなたのアカウントはこの時間のログオンを妨げる時間制限があります。あとでやり直して下さい。" IDS_INVALIDWORKSTATION "あなたのアカウントはこのコンピュータで使えないように設定されています。他のコンピュータをお使い下さい。" IDS_ACCOUNTRESTRICTION "アカウント制限のため、あなたはログオンできません。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index e78d6db9e91..e8f9d147338 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -234,6 +234,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 2b0e05a6849..9b61dd8189b 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -245,6 +245,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Twoje konto ma ograniczenia czasowe, które uniemożliwiają zalogowanie się w tej chwili. Spróbuj ponownie później." IDS_INVALIDWORKSTATION "Twoje konto zostało skonfigurowane w sposób nie zezwalający na używanie tego komputera. Spróbuj na innym komputerze." IDS_ACCOUNTRESTRICTION "Nie możesz się zalogować z powodu ograniczeń konta." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/pt-PT.rc b/dll/win32/msgina/lang/pt-PT.rc index 52d369e2600..db570360cca 100644 --- a/dll/win32/msgina/lang/pt-PT.rc +++ b/dll/win32/msgina/lang/pt-PT.rc @@ -235,6 +235,10 @@ BEGIN IDS_INVALIDLOGONHOURS "A sua conta tem restrições de horário que impedem o início de sessão no momento. Por favor, tente novamente mais tarde." IDS_INVALIDWORKSTATION "A sua conta está configurada para impedir que use este computador. Por favor, tente outro computador." IDS_ACCOUNTRESTRICTION "Não é possível iniciar sessão devido a uma restrição de conta." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 277ff7d38cd..cfbc268afd6 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Contul dumneavoastră are restricții de timp care vă împiedică să vă conectați în acest moment. Încercați mai târziu." IDS_INVALIDWORKSTATION "Contul dumneavoastră este configurat pentru a vă preveni în a folosi acest calculator. Încercați la alt calculator." IDS_ACCOUNTRESTRICTION "Eșec în conectarea dumneavoastră din cauza unei restricții a contului." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 17140ab8746..7db4abd7ad6 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -236,6 +236,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index 68ff7b1f6f4..ba9ad960970 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -239,6 +239,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index acad6315c7b..9d5cb36dfcb 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -238,6 +238,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index 4ecb4df264a..88e3ca86df7 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -236,6 +236,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Hesabınızda şu anda oturum açmanızı engelleyen zaman kısıtlamaları var. Lütfen daha sonra tekrar deneyiniz." IDS_INVALIDWORKSTATION "Hesabınız, bu bilgisayarı kullanmanızı engelleyecek şekilde yapılandırıldı. Lütfen başka bir bilgisayar deneyiniz." IDS_ACCOUNTRESTRICTION "Hesap kısıtlaması nedeniyle oturum açılamıyor." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 068edc742c1..d7306e19178 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Ваш профіль має обмеження часу, через що ви не можете зайти зараз. Будь-ласка, спробуйте пізніше." IDS_INVALIDWORKSTATION "Ваш профіль налаштовано так, що ви не можете користуватись цим комп'ютером. Спробуйте інший комп'ютер." IDS_ACCOUNTRESTRICTION "Не вдалось ввійти через обмеження профілю." + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 6c94954edfb..023eeb479e7 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -243,6 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "您的账户具有的时间限制阻止您现在登录。请稍后再试。" IDS_INVALIDWORKSTATION "您的账户设置阻止了您在这台计算机登录。请在另一台计算机尝试登录。" IDS_ACCOUNTRESTRICTION "您的账户由于账户限制而不能登录。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-HK.rc b/dll/win32/msgina/lang/zh-HK.rc index a5efae24eb7..19c95103c7e 100644 --- a/dll/win32/msgina/lang/zh-HK.rc +++ b/dll/win32/msgina/lang/zh-HK.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "由於您的帳户有時間限制，因此目前無法讓您登入。請稍候再試一次。" IDS_INVALIDWORKSTATION "您的帳户已設定為不能使用這個電腦登入。請使用其他電腦登入。" IDS_ACCOUNTRESTRICTION "由於您的帳户的限制，因此無法讓您登入。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index d89e8d9d7bc..a5f762c3054 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -242,6 +242,10 @@ BEGIN IDS_INVALIDLOGONHOURS "由於您的帳戶有時間限制，因此目前無法讓您登入。請稍候再試一次。" IDS_INVALIDWORKSTATION "您的帳戶已設定為不能使用這個電腦登入。請使用其他電腦登入。" IDS_ACCOUNTRESTRICTION "由於您的帳戶的限制，因此無法讓您登入。" + IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" + IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYRESTARTTITLE "Emergency restart" + IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." END /* Shutdown Dialog Strings */ diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 5020c6dfb7d..18fac198638 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -122,3 +122,9 @@ #define IDS_SHUTDOWN_RESTART_DESC 50007 #define IDS_SHUTDOWN_SLEEP_DESC 50008 #define IDS_SHUTDOWN_HIBERNATE_DESC 50009 + +/* Emergency log off and restart */ +#define IDS_EMERGENCYLOGOFFTITLE 50010 +#define IDS_EMERGENCYLOGOFF 50011 +#define IDS_EMERGENCYRESTARTTITLE 50012 +#define IDS_EMERGENCYRESTART 50013

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