Ros-diffs

ros-diffs@reactos.org

81390 discussions

07/08: [NTOSKRNL] Simplify NtRaiseHardError() by merging the terminating blocks.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6cefd1242d0ab72ca3cb5… commit 6cefd1242d0ab72ca3cb5e5f0dde0a3953f4b80e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 17:59:31 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:56 2018 +0200 [NTOSKRNL] Simplify NtRaiseHardError() by merging the terminating blocks. - Return the status codes provided by the Ex(p)RaiseHardError() calls. - Fix the return values in case of failure. --- ntoskrnl/ex/harderr.c | 67 +++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 63fa05032f..e8e233d81f 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -394,7 +394,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, PVOID UserData = NULL; PHARDERROR_USER_PARAMETERS UserParams; PWSTR BufferBase; - ULONG SafeResponse; + ULONG SafeResponse = ResponseNotHandled; PAGED_CODE(); @@ -430,7 +430,12 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, &Size, MEM_COMMIT, PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + *Response = ResponseNotHandled; + return Status; + } /* Set the pointers to our data */ UserParams = UserData; @@ -551,12 +556,14 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, { NTSTATUS Status = STATUS_SUCCESS; PULONG_PTR SafeParams = NULL; - ULONG SafeResponse; + ULONG SafeResponse = ResponseNotHandled; UNICODE_STRING SafeString; ULONG i; ULONG ParamSize = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + /* Validate parameter count */ if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) { @@ -662,37 +669,17 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, _SEH2_END; /* Call the system function directly, because we probed */ - ExpRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - SafeParams, - ValidResponseOptions, - &SafeResponse); - } - else - { - /* Reuse variable */ - SafeParams = Parameters; - - /* - * Call the Executive Function. It will probe and copy pointers to - * user-mode - */ - ExRaiseHardError(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - SafeParams, - ValidResponseOptions, - &SafeResponse); - } - - /* Check if we were called in user-mode */ - if (PreviousMode != KernelMode) - { - /* That means we have a buffer to free */ + Status = ExpRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + SafeParams, + ValidResponseOptions, + &SafeResponse); + + /* Free captured buffer */ if (SafeParams) ExFreePoolWithTag(SafeParams, TAG_ERR); - /* Enter SEH Block for return */ + /* Enter SEH Block to return the response */ _SEH2_TRY { /* Return the response */ @@ -707,6 +694,20 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, } else { + /* Reuse variable */ + SafeParams = Parameters; + + /* + * Call the Executive Function. It will probe + * and copy pointers to user-mode. + */ + Status = ExRaiseHardError(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + SafeParams, + ValidResponseOptions, + &SafeResponse); + /* Return the response */ *Response = SafeResponse; } @@ -740,6 +741,8 @@ NtSetDefaultHardErrorPort(IN HANDLE PortHandle) KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_UNSUCCESSFUL; + PAGED_CODE(); + /* Check if we have the privileges */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) {

1 0

06/08: [NTOSKRNL] ExRaiseHardError(): Protect strings copy to user-mode space inside a SEH block.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea390c2b3f1f520fd1748… commit ea390c2b3f1f520fd1748b6bf3fc9f7b8f9b84ea Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 17:52:10 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:44 2018 +0200 [NTOSKRNL] ExRaiseHardError(): Protect strings copy to user-mode space inside a SEH block. --- ntoskrnl/ex/harderr.c | 56 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 185d43537e..63fa05032f 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -387,6 +387,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG ValidResponseOptions, OUT PULONG Response) { + NTSTATUS Status; SIZE_T Size; UNICODE_STRING CapturedParams[MAXIMUM_HARDERROR_PARAMETERS]; ULONG i; @@ -394,7 +395,7 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, PHARDERROR_USER_PARAMETERS UserParams; PWSTR BufferBase; ULONG SafeResponse; - NTSTATUS Status; + PAGED_CODE(); /* Check if we have parameters */ @@ -435,35 +436,46 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, UserParams = UserData; BufferBase = UserParams->Buffer; - /* Loop parameters again */ - for (i = 0; i < NumberOfParameters; i++) + /* Enter SEH block as we are writing to user-mode space */ + _SEH2_TRY { - /* Check if we're in the mask */ - if (UnicodeStringParameterMask & (1 << i)) + /* Loop parameters again */ + for (i = 0; i < NumberOfParameters; i++) { - /* Update the base */ - UserParams->Parameters[i] = (ULONG_PTR)&UserParams->Strings[i]; + /* Check if we are in the mask */ + if (UnicodeStringParameterMask & (1 << i)) + { + /* Update the base */ + UserParams->Parameters[i] = (ULONG_PTR)&UserParams->Strings[i]; - /* Copy the string buffer */ - RtlMoveMemory(BufferBase, - CapturedParams[i].Buffer, - CapturedParams[i].MaximumLength); + /* Copy the string buffer */ + RtlMoveMemory(BufferBase, + CapturedParams[i].Buffer, + CapturedParams[i].MaximumLength); - /* Set buffer */ - CapturedParams[i].Buffer = BufferBase; + /* Set buffer */ + CapturedParams[i].Buffer = BufferBase; - /* Copy the string structure */ - UserParams->Strings[i] = CapturedParams[i]; + /* Copy the string structure */ + UserParams->Strings[i] = CapturedParams[i]; - /* Update the pointer */ - BufferBase += CapturedParams[i].MaximumLength; - } - else - { - /* No need to copy any strings */ - UserParams->Parameters[i] = Parameters[i]; + /* Update the pointer */ + BufferBase += CapturedParams[i].MaximumLength; + } + else + { + /* No need to copy any strings */ + UserParams->Parameters[i] = Parameters[i]; + } } } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + DPRINT1("ExRaiseHardError - Exception when writing data to user-mode, Status 0x%08lx\n", Status); + } + _SEH2_END; } else {

1 0

05/08: [NTOSKRNL] Don't emit hard errors for the calling thread if hard errors have been disabled for this thread on user-mode side.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=842605e3ef6c3673d8846… commit 842605e3ef6c3673d8846181787c1f671a2e8c24 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 15:53:49 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:33 2018 +0200 [NTOSKRNL] Don't emit hard errors for the calling thread if hard errors have been disabled for this thread on user-mode side. --- ntoskrnl/ex/harderr.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 82d22f4926..185d43537e 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -105,13 +105,14 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG ValidResponseOptions, OUT PULONG Response) { + NTSTATUS Status; PEPROCESS Process = PsGetCurrentProcess(); PETHREAD Thread = PsGetCurrentThread(); UCHAR Buffer[PORT_MAXIMUM_MESSAGE_LENGTH]; PHARDERROR_MSG Message = (PHARDERROR_MSG)Buffer; - NTSTATUS Status; HANDLE PortHandle; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + PAGED_CODE(); /* Check if this error will shutdown the system */ @@ -182,6 +183,31 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, /* If hard errors are disabled, do nothing */ if (Thread->HardErrorsAreDisabled) PortHandle = NULL; + /* + * If this is not the system thread, check whether hard errors are + * disabled for this thread on user-mode side, and if so, do nothing. + */ + if (!Thread->SystemThread && (PortHandle != NULL)) + { + /* Check if we have a TEB */ + PTEB Teb = PsGetCurrentThread()->Tcb.Teb; + if (Teb) + { + _SEH2_TRY + { + if (Teb->HardErrorMode & RTL_SEM_FAILCRITICALERRORS) + { + PortHandle = NULL; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + NOTHING; + } + _SEH2_END; + } + } + /* Now check if we have a port */ if (PortHandle == NULL) {

1 0

04/08: [NTOSKRNL] Don't hardcode flag values for DefaultHardErrorProcessing.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a0ecb3dc858f98cbff65… commit 3a0ecb3dc858f98cbff653afd6c892f2941ac836 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 15:25:15 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:50:16 2018 +0200 [NTOSKRNL] Don't hardcode flag values for DefaultHardErrorProcessing. --- ntoskrnl/ex/harderr.c | 12 +++++++----- ntoskrnl/ps/process.c | 12 ++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 30fdce8f0a..82d22f4926 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -150,13 +150,15 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, NumberOfParameters, UnicodeStringParameterMask, Parameters, - (PreviousMode != KernelMode) ? TRUE: FALSE); + (PreviousMode != KernelMode) ? TRUE : FALSE); } } - /* Enable hard error processing if it is enabled for the process - * or if the exception status forces it */ - if ((Process->DefaultHardErrorProcessing & 1) || + /* + * Enable hard error processing if it is enabled for the process + * or if the exception status forces it. + */ + if ((Process->DefaultHardErrorProcessing & SEM_FAILCRITICALERRORS) || (ErrorStatus & HARDERROR_OVERRIDE_ERRORMODE)) { /* Check if we have an exception port */ @@ -199,7 +201,7 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, NumberOfParameters, UnicodeStringParameterMask, Parameters, - (PreviousMode != KernelMode) ? TRUE: FALSE); + (PreviousMode != KernelMode) ? TRUE : FALSE); /* If we survived, return to caller */ *Response = ResponseReturnToCaller; diff --git a/ntoskrnl/ps/process.c b/ntoskrnl/ps/process.c index 119997a753..c6962762e3 100644 --- a/ntoskrnl/ps/process.c +++ b/ntoskrnl/ps/process.c @@ -448,15 +448,14 @@ PspCreateProcess(OUT PHANDLE ProcessHandle, /* Check if we have a parent */ if (Parent) { - /* Inherit PID and Hard Error Processing */ + /* Inherit PID and hard-error processing */ Process->InheritedFromUniqueProcessId = Parent->UniqueProcessId; - Process->DefaultHardErrorProcessing = Parent-> - DefaultHardErrorProcessing; + Process->DefaultHardErrorProcessing = Parent->DefaultHardErrorProcessing; } else { - /* Use default hard error processing */ - Process->DefaultHardErrorProcessing = TRUE; + /* Use default hard-error processing */ + Process->DefaultHardErrorProcessing = SEM_FAILCRITICALERRORS; } /* Check for a section handle */ @@ -586,7 +585,8 @@ PspCreateProcess(OUT PHANDLE ProcessHandle, PROCESS_PRIORITY_NORMAL, Affinity, DirectoryTableBase, - (BOOLEAN)(Process->DefaultHardErrorProcessing & 4)); + BooleanFlagOn(Process->DefaultHardErrorProcessing, + SEM_NOALIGNMENTFAULTEXCEPT)); /* Duplicate Parent Token */ Status = PspInitializeProcessSecurity(Process, Parent);

1 0

03/08: [NTOSKRNL] Update Doxygen descriptions for NtRaiseHardError, ExRaiseHardError, ExpRaiseHardError and NtSetDefaultHardErrorPort.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fadfea05327c7532b79d… commit 1fadfea05327c7532b79db6287838b5d4ad9f287 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 15:06:45 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:39:32 2018 +0200 [NTOSKRNL] Update Doxygen descriptions for NtRaiseHardError, ExRaiseHardError, ExpRaiseHardError and NtSetDefaultHardErrorPort. --- ntoskrnl/ex/harderr.c | 55 ++++++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 36 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index a5200e3e74..30fdce8f0a 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -85,30 +85,15 @@ ExpSystemErrorHandler(IN NTSTATUS ErrorStatus, /*++ * @name ExpRaiseHardError + * @implemented * - * For now it's a stub - * - * @param ErrorStatus - * FILLME - * - * @param NumberOfParameters - * FILLME - * - * @param UnicodeStringParameterMask - * FILLME - * - * @param Parameters - * FILLME - * - * @param ValidResponseOptions - * FILLME - * - * @param Response - * FILLME - * - * @return None + * See ExRaiseHardError and NtRaiseHardError, same parameters. * - * @remarks None + * This function performs the central work for both ExRaiseHardError + * and NtRaiseHardError. ExRaiseHardError is the service for kernel-mode + * that copies the parameters to user-mode, and NtRaiseHardError is the + * service for both kernel-mode and user-mode that performs parameters + * validation and capture if necessary. * *--*/ NTSTATUS @@ -342,7 +327,7 @@ ExSystemExceptionFilter(VOID) * @name ExRaiseHardError * @implemented * - * See NtRaiseHardError + * See NtRaiseHardError and ExpRaiseHardError. * * @param ErrorStatus * Error Code @@ -362,9 +347,7 @@ ExSystemExceptionFilter(VOID) * @param Response * Pointer to HARDERROR_RESPONSE enumeration * - * @return None - * - * @remarks None + * @return Status * *--*/ NTSTATUS @@ -489,9 +472,9 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, * @name NtRaiseHardError * @implemented * - * This function sends HARDERROR_MSG LPC message to listener - * (typically CSRSS.EXE). See NtSetDefaultHardErrorPort for more information - * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… + * This function sends HARDERROR_MSG LPC message to a hard-error listener, + * typically CSRSS.EXE. See NtSetDefaultHardErrorPort for more information. + * See also: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… * * @param ErrorStatus * Error Code @@ -513,8 +496,8 @@ ExRaiseHardError(IN NTSTATUS ErrorStatus, * * @return Status * - * @remarks NtRaiseHardError is easy way to display message in GUI - * without loading Win32 API libraries + * @remarks NtRaiseHardError constitutes an easy way to display messages + * in GUI without loading any Win32 API libraries. * *--*/ NTSTATUS @@ -696,11 +679,11 @@ NtRaiseHardError(IN NTSTATUS ErrorStatus, * @name NtSetDefaultHardErrorPort * @implemented * - * NtSetDefaultHardErrorPort is typically called only once. After call, - * kernel set BOOLEAN flag named ExReadyForErrors to TRUE, and all other - * tries to change default port are broken with STATUS_UNSUCCESSFUL error code - * See: http://www.windowsitlibrary.com/Content/356/08/2.html - * http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… + * NtSetDefaultHardErrorPort is typically called only once. After the call, + * the kernel sets a BOOLEAN flag named ExReadyForErrors to TRUE, and all other + * attempts to change the default port fail with STATUS_UNSUCCESSFUL error code. + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… + * https://web.archive.org/web/20070716133753/http://www.windowsitlibrary.com/… * * @param PortHandle * Handle to named port object

1 0

02/08: [NTOSKRNL] Forbid processes without the Tcb prvilege to perform a user-mode hard-error BSOD.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0729b30bb79d6f538cf2… commit f0729b30bb79d6f538cf2b9578ff8ebe7989f8d3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 1 14:46:19 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:39:31 2018 +0200 [NTOSKRNL] Forbid processes without the Tcb prvilege to perform a user-mode hard-error BSOD. --- ntoskrnl/ex/harderr.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index 84f409a1bb..a5200e3e74 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -132,8 +132,18 @@ ExpRaiseHardError(IN NTSTATUS ErrorStatus, /* Check if this error will shutdown the system */ if (ValidResponseOptions == OptionShutdownSystem) { - /* Check for privilege */ - if (!SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode)) + /* + * Check if we have the privileges. + * + * NOTE: In addition to the Shutdown privilege we also check whether + * the caller has the Tcb privilege. The purpose is to allow only + * SYSTEM processes to "shutdown" the system on hard errors (BSOD) + * while forbidding regular processes to do so. This behaviour differs + * from Windows, where any user-mode process, as soon as it has the + * Shutdown privilege, can trigger a hard-error BSOD. + */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode) || + !SeSinglePrivilegeCheck(SeShutdownPrivilege, PreviousMode)) { /* No rights */ *Response = ResponseNotHandled;

1 0

01/08: [NTOSKRNL] In addition to the hard-error port, reference also the process that handles the hard errors so that it doesn't disappear behind our back. On shutdown both the hard-error port and process are dereferenced.
by Hermès Bélusca-Maïto 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed06b843fbc7b6944f89c… commit ed06b843fbc7b6944f89cd9e9d26108dd2a08f14 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 31 22:12:44 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 22:39:30 2018 +0200 [NTOSKRNL] In addition to the hard-error port, reference also the process that handles the hard errors so that it doesn't disappear behind our back. On shutdown both the hard-error port and process are dereferenced. --- ntoskrnl/ex/harderr.c | 8 +++++--- ntoskrnl/ex/shutdown.c | 19 +++++++++++++++++++ ntoskrnl/include/internal/ex.h | 8 ++++++++ ntoskrnl/po/poshtdwn.c | 4 ++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ex/harderr.c b/ntoskrnl/ex/harderr.c index c5073a30b8..84f409a1bb 100644 --- a/ntoskrnl/ex/harderr.c +++ b/ntoskrnl/ex/harderr.c @@ -707,7 +707,7 @@ NtSetDefaultHardErrorPort(IN HANDLE PortHandle) KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_UNSUCCESSFUL; - /* Check if we have the Privilege */ + /* Check if we have the privileges */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { DPRINT1("NtSetDefaultHardErrorPort: Caller requires " @@ -718,7 +718,7 @@ NtSetDefaultHardErrorPort(IN HANDLE PortHandle) /* Only called once during bootup, make sure we weren't called yet */ if (!ExReadyForErrors) { - /* Reference the port */ + /* Reference the hard-error port */ Status = ObReferenceObjectByHandle(PortHandle, 0, LpcPortObjectType, @@ -727,9 +727,11 @@ NtSetDefaultHardErrorPort(IN HANDLE PortHandle) NULL); if (NT_SUCCESS(Status)) { - /* Save the data */ + /* Keep also a reference to the process handling the hard errors */ ExpDefaultErrorPortProcess = PsGetCurrentProcess(); + ObReferenceObject(ExpDefaultErrorPortProcess); ExReadyForErrors = TRUE; + Status = STATUS_SUCCESS; } } diff --git a/ntoskrnl/ex/shutdown.c b/ntoskrnl/ex/shutdown.c index 6022f27563..864f92c40d 100644 --- a/ntoskrnl/ex/shutdown.c +++ b/ntoskrnl/ex/shutdown.c @@ -14,6 +14,25 @@ #define NDEBUG #include <debug.h> +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +ExShutdownSystem(VOID) +{ + /* Dereference the hard-error port and process objects */ + if (ExpDefaultErrorPort) + { + ObDereferenceObject(ExpDefaultErrorPort); + ExpDefaultErrorPort = NULL; + } + if (ExpDefaultErrorPortProcess) + { + ObDereferenceObject(ExpDefaultErrorPortProcess); + ExpDefaultErrorPortProcess = NULL; + } +} + /* FUNCTIONS *****************************************************************/ /* diff --git a/ntoskrnl/include/internal/ex.h b/ntoskrnl/include/internal/ex.h index 053b8c813c..091b90783d 100644 --- a/ntoskrnl/include/internal/ex.h +++ b/ntoskrnl/include/internal/ex.h @@ -31,6 +31,9 @@ extern KSPIN_LOCK ExpPagedLookasideListLock; extern ULONG ExCriticalWorkerThreads; extern ULONG ExDelayedWorkerThreads; +extern PVOID ExpDefaultErrorPort; +extern PEPROCESS ExpDefaultErrorPortProcess; + /* * NT/Cm Version Info variables */ @@ -60,6 +63,7 @@ extern WINKD_WORKER_STATE ExpDebuggerWork; extern PEPROCESS ExpDebuggerProcessAttach; extern PEPROCESS ExpDebuggerProcessKill; extern ULONG_PTR ExpDebuggerPageIn; + VOID NTAPI ExpDebuggerWorker(IN PVOID Context); // #endif /* _WINKD_ */ @@ -227,6 +231,10 @@ ExpInitializeExecutive( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +VOID +NTAPI +ExShutdownSystem(VOID); + BOOLEAN NTAPI ExpInitializeEventImplementation(VOID); diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 04618c9f54..719f8b8b93 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -278,6 +278,10 @@ PopGracefulShutdown(IN PVOID Context) DPRINT("Configuration Manager shutting down\n"); CmShutdownSystem(); + /* Shut down the Executive */ + DPRINT("Executive shutting down\n"); + ExShutdownSystem(); + /* Note that modified pages should be written here (MiShutdownSystem) */ /* Flush all user files before we start shutting down IO */

1 0

01/01: [WINLOGON] Implement BaseInitiateSystemShutdownEx(). (#458)
by alpha5056 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ca90b50de47ea1f2621d… commit 7ca90b50de47ea1f2621d12bf75742630b02c19e Author: alpha5056 <alpha5056(a)users.noreply.github.com> AuthorDate: Sun Apr 1 11:39:41 2018 -0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 19:39:41 2018 +0200 [WINLOGON] Implement BaseInitiateSystemShutdownEx(). (#458) --- base/system/winlogon/lang/bg-BG.rc | 11 +++ base/system/winlogon/lang/cs-CZ.rc | 11 +++ base/system/winlogon/lang/de-DE.rc | 11 +++ base/system/winlogon/lang/el-GR.rc | 11 +++ base/system/winlogon/lang/en-US.rc | 11 +++ base/system/winlogon/lang/es-ES.rc | 11 +++ base/system/winlogon/lang/fr-FR.rc | 11 +++ base/system/winlogon/lang/he-IL.rc | 11 +++ base/system/winlogon/lang/hu-HU.rc | 11 +++ base/system/winlogon/lang/id-ID.rc | 11 +++ base/system/winlogon/lang/it-IT.rc | 11 +++ base/system/winlogon/lang/ja-JP.rc | 11 +++ base/system/winlogon/lang/lt-LT.rc | 11 +++ base/system/winlogon/lang/ms-MY.rc | 11 +++ base/system/winlogon/lang/nl-NL.rc | 11 +++ base/system/winlogon/lang/no-NO.rc | 11 +++ base/system/winlogon/lang/pl-PL.rc | 11 +++ base/system/winlogon/lang/pt-BR.rc | 11 +++ base/system/winlogon/lang/ro-RO.rc | 11 +++ base/system/winlogon/lang/ru-RU.rc | 11 +++ base/system/winlogon/lang/sk-SK.rc | 11 +++ base/system/winlogon/lang/sq-AL.rc | 11 +++ base/system/winlogon/lang/sv-SE.rc | 11 +++ base/system/winlogon/lang/tr-TR.rc | 11 +++ base/system/winlogon/lang/uk-UA.rc | 11 +++ base/system/winlogon/lang/zh-CN.rc | 11 +++ base/system/winlogon/lang/zh-TW.rc | 11 +++ base/system/winlogon/resource.h | 6 ++ base/system/winlogon/rpcserver.c | 162 +++++++++++++++++++++++++++++++++++-- 29 files changed, 457 insertions(+), 8 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index 639220b7d3..310842acfc 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "Пре&запуск", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Подготовка на мрежовите свързвания..." diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 5d31156b3a..503c231227 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Příprava síťových připojení..." diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index e7778e6db7..cf698c6e40 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "Neusta&rt", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Netzwerkverbindungen vorbereiten..." diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index 9de33e0278..d4663ce8c4 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Γίνεται προετοιμασία των συνδέσεων δικτύου..." diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 35e3cc45aa..2369394828 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Preparing network connections..." diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 4151f7f677..60e4334411 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Preparando las conexiones de red..." diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index e608ae0dca..eab9d4b572 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Redémarrer", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Préparation des connections réseau..." diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index 9907b4695e..0b900ec96c 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "הפעל מחדש", 1, 59, 32, 49, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "מכין חיבורי רשת..." diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index 3d0be69bb2..14c127a362 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Újraindítás", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Hálózati kapcsolatok elõkészítése..." diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index fa5c8cc022..c8fec2c143 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Mulai Lagi", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Menyiapkan koneksi jaringan..." diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index 7175687df8..f16f126013 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Riavvio", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Preparazione connessioni di rete..." diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index 0b6d5db70f..fd586f3d22 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "再起動(&R)", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "ネットワーク接続を準備しています..." diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index b8d8035d50..dd4ea23200 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Perkrauti", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Ruošiami tinklo susijungimai..." diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index 40579b408e..b2a1ec4cc1 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "Mula semula(&R)", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Menyediakan sambungan rangkaian..." diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index 43638ce094..53967ff4ba 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Netwerkverbindingen voorbereiden..." diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 441aec8ae8..799df12b59 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Forbreder nettverk tilkoblinger..." diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 5146c24b71..a4a8f2c65c 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -27,6 +27,17 @@ BEGIN DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Trwa przygotowywanie połączeń sieciowych..." diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index e77efcdf59..58e107b261 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Preparando conexões de rede..." diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index 927ea7dc29..edad82edf6 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -29,6 +29,17 @@ BEGIN DEFPUSHBUTTON "&Repornire", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Conexiuni în rețea în curs de pregătire…" diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index 98d0797e75..efa60bec94 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Перезагрузка", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Подготавливаются сетевые подключения..." diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index e306a194c5..ced0100fd4 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -25,6 +25,17 @@ BEGIN DEFPUSHBUTTON "&Reštartovať", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Pripravujú sa sieťové pripojenia..." diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index 87bda5333e..de8b6046f2 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -24,6 +24,17 @@ BEGIN DEFPUSHBUTTON "&Rifillo", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Pergatit lidhjen e networkut..." diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 0a175cff01..92aa469aa3 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Starta om", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Förbereder nätverksanslutningar..." diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index db8aacfb2a..2019d7a9b4 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "&Yeniden Başlat", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Ağ Bağlantıları Anıklanıyor..." diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index 0cf0d35882..3022a35e0b 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -20,6 +20,17 @@ BEGIN DEFPUSHBUTTON "&Перезавантаження", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Підготовка мережних підключень..." diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index c1db1be5cb..16683df9ed 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -23,6 +23,17 @@ BEGIN DEFPUSHBUTTON "重新启动(&R)", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "正在准备网络连接..." diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index af349467f6..1b6a15dfee 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -22,6 +22,17 @@ BEGIN DEFPUSHBUTTON "重新啟動(&R)", 1, 80, 91, 68, 14 END +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 162, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP +CAPTION "System Shutdown" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_WINLOGON, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 + LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down in:", IDC_SYSSHUTDOWNMSG, 38, 7, 124, 31 + LTEXT "", IDC_SHUTDOWNTIMELEFT, 38, 38, 124, 14 + LTEXT "No shutdown comment given.", IDC_SHUTDOWNCOMMENT, 38, 52, 124, 55 +END + STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "正在準備網路連線..." diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index cea915c0cf..ac5150876c 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -1,6 +1,7 @@ #pragma once /* Dialogs */ +#define IDD_SYSSHUTDOWN 500 #define IDD_GINALOADFAILED 400 #define IDD_SHUTDOWNCOMPUTER 300 @@ -8,6 +9,11 @@ #define IDI_WINLOGON 4 /* Controls */ +#define IDC_SYSSHUTDOWNMSG 501 +#define IDC_SHUTDOWNTIMELEFT 502 +#define IDC_SHUTDOWNCOMMENT 503 +#define IDC_SYSSHUTDOWNICON 504 + #define IDC_GINALOADFAILED 401 #define IDC_GINALOADFAILEDCONTACT 402 diff --git a/base/system/winlogon/rpcserver.c b/base/system/winlogon/rpcserver.c index 837c61ca32..bbf8e54aa6 100644 --- a/base/system/winlogon/rpcserver.c +++ b/base/system/winlogon/rpcserver.c @@ -6,13 +6,34 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include "winlogon.h" +#include <ntstrsafe.h> #include <rpc.h> #include <winreg_s.h> +/* DEFINES *******************************************************************/ + +#define IDT_SYSSHUTDOWN 2000 + +/* STRUCTS *******************************************************************/ + +typedef struct _SYS_SHUTDOWN_PARAMS +{ + UNICODE_STRING usMessage; + ULONG dwTimeout; + BOOLEAN bRebootAfterShutdown; + BOOLEAN bForceAppsClosed; + DWORD dwReason; +} SYS_SHUTDOWN_PARAMS, *PSYS_SHUTDOWN_PARAMS; + +/* GLOBALS *******************************************************************/ + +HWND g_hShutdownDialog = NULL; +BOOLEAN g_bShuttingDown = FALSE; +SYS_SHUTDOWN_PARAMS g_ShutdownParams; /* FUNCTIONS *****************************************************************/ @@ -431,7 +452,12 @@ BaseAbortSystemShutdown( PREGISTRY_SERVER_NAME ServerName) { TRACE("BaseAbortSystemShutdown()\n"); - return ERROR_SUCCESS; + + //FIXME: Verify that the caller actually has the correct privileges + + if (g_bShuttingDown == FALSE) + return ERROR_NO_SHUTDOWN_IN_PROGRESS; + return PostMessage(g_hShutdownDialog, WM_CLOSE, 0, 0) ? ERROR_SUCCESS : GetLastError(); } @@ -485,6 +511,92 @@ BaseRegQueryMultipleValues( return ERROR_SUCCESS; } +INT_PTR +CALLBACK +ShutdownDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + g_hShutdownDialog = hwndDlg; + if (g_ShutdownParams.usMessage.Length) + { + SetDlgItemTextW(hwndDlg, + IDC_SHUTDOWNCOMMENT, + g_ShutdownParams.usMessage.Buffer); + } + RemoveMenu(GetSystemMenu(hwndDlg, FALSE), SC_CLOSE, MF_BYCOMMAND); + SetWindowPos(hwndDlg, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + PostMessage(hwndDlg, WM_TIMER, 0, 0); + SetTimer(hwndDlg, IDT_SYSSHUTDOWN, 1000, NULL); + break; + } + case WM_CLOSE: + { + g_hShutdownDialog = NULL; + g_bShuttingDown = FALSE; + KillTimer(hwndDlg, IDT_SYSSHUTDOWN); + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + EndDialog(hwndDlg, 0); + DestroyWindow(hwndDlg); + break; + } + case WM_TIMER: + { + WCHAR strbuf[34]; + int seconds, minutes, hours; + seconds = (int)(g_ShutdownParams.dwTimeout); + hours = seconds/3600; + seconds -= hours*3600; + minutes = seconds/60; + seconds -= minutes*60; + ZeroMemory(strbuf, sizeof(strbuf)); + //FIXME: Show time remaining according to the locale's format + RtlStringCbPrintfW(strbuf, sizeof(strbuf), L"%d:%d:%d", hours, minutes, seconds); + SetDlgItemTextW(hwndDlg, IDC_SHUTDOWNTIMELEFT, strbuf); + if (g_ShutdownParams.dwTimeout == 0) + { + PostMessage(hwndDlg, WM_CLOSE, 0, 0); + ExitWindowsEx((g_ShutdownParams.bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (g_ShutdownParams.bForceAppsClosed ? EWX_FORCE : 0), + g_ShutdownParams.dwReason); + } + g_ShutdownParams.dwTimeout--; + break; + } + default: + return FALSE; + } + return TRUE; +} + +DWORD +WINAPI +InitiateSystemShutdownThread(LPVOID lpParameter) +{ + INT_PTR status; + status = DialogBoxW(hAppInstance, MAKEINTRESOURCEW(IDD_SYSSHUTDOWN), + NULL, ShutdownDialogProc); + if (status >= 0) + { + return ERROR_SUCCESS; + } + else + { + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_bShuttingDown = FALSE; + return GetLastError(); + } +} /* Function 30 */ ULONG @@ -497,6 +609,8 @@ BaseInitiateSystemShutdownEx( BOOLEAN bRebootAfterShutdown, ULONG dwReason) { + HANDLE hThread; + TRACE("BaseInitiateSystemShutdownEx()\n"); TRACE(" Message: %wZ\n", lpMessage); TRACE(" Timeout: %lu\n", dwTimeout); @@ -504,15 +618,47 @@ BaseInitiateSystemShutdownEx( TRACE(" Reboot: %d\n", bRebootAfterShutdown); TRACE(" Reason: %lu\n", dwReason); -// return ERROR_SUCCESS; + //FIXME: Verify that the caller actually has the correct privileges - /* FIXME */ - return ExitWindowsEx((bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | - (bForceAppsClosed ? EWX_FORCE : 0), - dwReason); + if (_InterlockedCompareExchange8((volatile char*)&g_bShuttingDown, TRUE, FALSE) == TRUE) + return ERROR_SHUTDOWN_IN_PROGRESS; + if (lpMessage && lpMessage->Length && lpMessage->Buffer) + { + g_ShutdownParams.usMessage.Buffer = HeapAlloc(GetProcessHeap(), 0, lpMessage->Length+sizeof(UNICODE_NULL)); + if (g_ShutdownParams.usMessage.Buffer == NULL) + { + g_bShuttingDown = FALSE; + return GetLastError(); + } + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, g_ShutdownParams.usMessage.Buffer, lpMessage->Length+sizeof(UNICODE_NULL)); + RtlCopyUnicodeString(&(g_ShutdownParams.usMessage), (PUNICODE_STRING)lpMessage); + } + else + { + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_ShutdownParams.dwTimeout = dwTimeout; + g_ShutdownParams.bForceAppsClosed = bForceAppsClosed; + g_ShutdownParams.bRebootAfterShutdown = bRebootAfterShutdown; + g_ShutdownParams.dwReason = dwReason; + hThread = CreateThread(NULL, 0, InitiateSystemShutdownThread, NULL, 0, NULL); + if (hThread) + { + CloseHandle(hThread); + return ERROR_SUCCESS; + } + else + { + if (g_ShutdownParams.usMessage.Buffer) + { + HeapFree(GetProcessHeap(), 0, g_ShutdownParams.usMessage.Buffer); + RtlInitEmptyUnicodeString(&g_ShutdownParams.usMessage, NULL, 0); + } + g_bShuttingDown = FALSE; + return GetLastError(); + } } - /* Function 31 */ error_status_t __stdcall

1 0

01/01: [TRANSLATIONS] Update and add Turkish translations (#455)
by Ercan Ersoy 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c2e91897a9fa1902804e… commit 8c2e91897a9fa1902804eba51c0a80a0e8191b6c Author: Ercan Ersoy <ercanersoy(a)ercanersoy.net> AuthorDate: Sun Apr 1 20:27:08 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 19:27:08 2018 +0200 [TRANSLATIONS] Update and add Turkish translations (#455) - Added Turkish translations for winetests/GUI and localmon. - Modified Turkish translations for usersrv, user32, localmon, logon, 3dtext, kbswitch, winemine, spider, solitarie, clipbrd and charmap_new. --- base/applications/charmap_new/lang/tr-TR.rc | 14 +++---- base/applications/clipbrd/lang/tr-TR.rc | 12 +++--- base/applications/games/solitaire/lang/tr-TR.rc | 24 +++++------ base/applications/games/spider/lang/tr-TR.rc | 20 ++++----- base/applications/games/winmine/lang/tr-TR.rc | 14 +++---- base/applications/kbswitch/lang/tr-TR.rc | 4 +- .../applications/screensavers/3dtext/lang/tr-TR.rc | 6 +-- base/applications/screensavers/logon/lang/tr-TR.rc | 4 +- modules/rostests/winetests/GUI/lang/tr-TR.rc | 49 ++++++++++++++++++++++ modules/rostests/winetests/GUI/rsrc.rc | 1 + win32ss/printing/monitors/localmon/lang/tr-TR.rc | 9 ++++ win32ss/printing/monitors/localmon/localmon.rc | 3 ++ win32ss/user/user32/lang/tr-TR.rc | 6 +-- win32ss/user/winsrv/usersrv/lang/tr-TR.rc | 16 +++---- 14 files changed, 122 insertions(+), 60 deletions(-) diff --git a/base/applications/charmap_new/lang/tr-TR.rc b/base/applications/charmap_new/lang/tr-TR.rc index 70e4eb0594..42f069a614 100644 --- a/base/applications/charmap_new/lang/tr-TR.rc +++ b/base/applications/charmap_new/lang/tr-TR.rc @@ -1,35 +1,35 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net)*/ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 292, 224 FONT 8, "MS Shell Dlg", 0, 0 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX -CAPTION "ReactOS Damga Eşlemi" +CAPTION "ReactOS Karakter Eşlem" BEGIN LTEXT "Yazı Tipi:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - LTEXT "Çoğaltılacak Damgalar:", IDC_STATIC, 6, 188, 66, 9 + LTEXT "Çoğaltılacak Karakterler:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Seç", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Çoğalt", IDC_COPY, 242, 186, 44, 13, WS_DISABLED //CONTROL "Gelişmiş Görünüm", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | // WS_TABSTOP, 8, 208, 95, 10 - //LTEXT "Damga Öbeği:", IDC_STATIC, 8, 8, 48, 8 + //LTEXT "Karakter Öbeği:", IDC_STATIC, 8, 8, 48, 8 //COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP //LTEXT "Takımla:", IDC_STATIC, 8, 28, 50, 8 //COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP //PUSHBUTTON "Ara", IDC_BUTTON_SEARCH, 200, 44, 50, 14 //EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL //LTEXT "Ada Göre Ara:", IDC_STATIC, 8, 48, 42, 8 - //LTEXT "Evrenlik Kod:", IDC_STATIC, 200, 8, 30, 8 + //LTEXT "Evrensel Kod:", IDC_STATIC, 200, 8, 30, 8 //EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END STRINGTABLE BEGIN - IDS_ABOUT "&Üzerine..." - IDS_TITLE "Damga Eşlemi" + IDS_ABOUT "&Hakkında" + IDS_TITLE "Karakter Eşlem" END diff --git a/base/applications/clipbrd/lang/tr-TR.rc b/base/applications/clipbrd/lang/tr-TR.rc index e18fdfc3d6..3433d2f35f 100644 --- a/base/applications/clipbrd/lang/tr-TR.rc +++ b/base/applications/clipbrd/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2015, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATOR: 2015, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -9,10 +9,10 @@ END MAIN_MENU MENU BEGIN - POPUP "&Kütük" + POPUP "&Dosya" BEGIN MENUITEM "&Aç...", CMD_OPEN - MENUITEM "A&yrı Sakla...", CMD_SAVE_AS + MENUITEM "Farklı &Kaydet...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Çıkış", CMD_EXIT END @@ -28,7 +28,7 @@ BEGIN BEGIN MENUITEM "&Yardım Konuları", CMD_HELP MENUITEM SEPARATOR - MENUITEM "&Üzerine", CMD_ABOUT + MENUITEM "&Hakkında", CMD_ABOUT END END @@ -52,7 +52,7 @@ BEGIN STRING_CF_DIB "DIB Bit Eşlem" STRING_CF_LOCALE "Yerli Veri" STRING_CF_ENHMETAFILE "Geliştirilmiş Metafile" - STRING_CF_METAFILEPICT "Metafile" + STRING_CF_METAFILEPICT "Meta dosyası" STRING_CF_PALETTE "Renklik" STRING_CF_DIBV5 "DIB Bit Eşlem (Sürüm 5)" STRING_CF_SYLK "Simgelik Bağlantı Biçimi" @@ -63,5 +63,5 @@ END STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Pano görüntülenemeyen bir biçimdeki veri içeriyor." - ERROR_INVALID_FILE_FORMAT "Seçili kütük geçerli bir pano kütüğü değil." + ERROR_INVALID_FILE_FORMAT "Seçili dosya geçerli bir pano dosyası değil." END diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc index 332d2e4ab4..d4037e34e8 100644 --- a/base/applications/games/solitaire/lang/tr-TR.rc +++ b/base/applications/games/solitaire/lang/tr-TR.rc @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Solitaire - * LICENSE: Freeware, permission to use under Public Domain - * FILE: base/applications/games/solitaire/lang/tr-TR.rc - * PURPOSE: Turkish Resource File for ReactOS Solitaire - * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) + * PROJECT: ReactOS Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/tr-TR.rc + * PURPOSE: Turkish Resource File for ReactOS Solitaire + * TRANSLATORS: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -15,11 +15,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Seçenekler" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Kâğıtlar", -1, 7, 7, 90, 40 + GROUPBOX "Kağıtlar", -1, 7, 7, 90, 40 AUTORADIOBUTTON "&Tekli Çek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Üçlü Çek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 GROUPBOX "Sayılama", -1, 100, 7, 75, 53 - AUTORADIOBUTTON "&Ölçünlü", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Standart", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 AUTORADIOBUTTON "&Yok", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "&Süreyi Göster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP @@ -30,7 +30,7 @@ BEGIN END IDD_CARDBACK DIALOGEX 6, 6, 345, 185 -CAPTION "Kâğıt Arkalığı Seç" +CAPTION "Kağıt Arkalığı Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -55,7 +55,7 @@ END STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire, J Brown eliyle yapılmıştır.\n\nCardLib sürümü: 1.0" + IDS_SOL_ABOUT "Solitaire, J Brown tarafından yapılmıştır.\n\nCardLib sürümü: 1.0" IDS_SOL_QUIT "Bu oyundan çıkılsın mı?" IDS_SOL_WIN "Tebrikler, kazandınız!" IDS_SOL_DEAL "Yine dağıtılsın mı?" @@ -71,15 +71,15 @@ BEGIN BEGIN MENUITEM "&Dağıt\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "D&esteler...", IDM_GAME_DECK - MENUITEM "&Seçenekler...", IDM_GAME_OPTIONS + MENUITEM "D&esteler", IDM_GAME_DECK + MENUITEM "&Seçenekler", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Çıkış", IDM_GAME_EXIT END POPUP "&Yardım" BEGIN MENUITEM "&İçindekiler\tF1", IDM_HELP_CONTENTS - MENUITEM "&Üzerine...", IDM_HELP_ABOUT + MENUITEM "&Hakkında", IDM_HELP_ABOUT END END diff --git a/base/applications/games/spider/lang/tr-TR.rc b/base/applications/games/spider/lang/tr-TR.rc index 0575573c8f..05202e18d4 100644 --- a/base/applications/games/spider/lang/tr-TR.rc +++ b/base/applications/games/spider/lang/tr-TR.rc @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Spider Solitaire - * LICENSE: See COPYING in top level directory - * FILE: base/applications/games/spider/lang/tr-TR.rc - * PURPOSE: Turkish Resource File for ReactOS Spider Solitaire - * TRANSLATOR: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) + * PROJECT: ReactOS Spider Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/spider/lang/tr-TR.rc + * PURPOSE: Turkish Resource File for ReactOS Spider Solitaire + * TRANSLATORS: 2013, 2014, 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -11,7 +11,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT /* Dialogs */ IDD_CARDBACK DIALOGEX 6, 6, 345, 185 -CAPTION "Kâğıt Arkalığı Seç" +CAPTION "Kağıt Arkalığı Seç" FONT 8, "MS Shell Dlg" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT BEGIN @@ -47,8 +47,8 @@ END STRINGTABLE BEGIN - IDS_SPI_NAME "Örümcek Solitaire" - IDS_SPI_ABOUT "Örümcek Solitaire, Gregor Schneider eliyle yapılmıştır.\n\nCardLib sürümü: 1.0" + IDS_SPI_NAME "Spider Solitaire" + IDS_SPI_ABOUT "Spider Solitaire, Gregor Schneider tarafından yapılmıştır.\n\nCardLib sürümü: 1.0" IDS_SPI_QUIT "Bu oyundan çıkılsın mı?" IDS_SPI_WIN "Tebrikler, kazandınız!" IDS_SPI_DEAL "Yine dağıtılsın mı?" @@ -62,14 +62,14 @@ BEGIN BEGIN MENUITEM "&Dağıt\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "D&esteler...", IDM_GAME_DECK + MENUITEM "D&esteler", IDM_GAME_DECK MENUITEM SEPARATOR MENUITEM "&Çıkış", IDM_GAME_EXIT END POPUP "&Yardım" BEGIN MENUITEM "&İçindekiler\tF1", IDM_HELP_CONTENTS - MENUITEM "&Üzerine...", IDM_HELP_ABOUT + MENUITEM "&Hakkında", IDM_HELP_ABOUT END END diff --git a/base/applications/games/winmine/lang/tr-TR.rc b/base/applications/games/winmine/lang/tr-TR.rc index 5419987005..872de53a93 100644 --- a/base/applications/games/winmine/lang/tr-TR.rc +++ b/base/applications/games/winmine/lang/tr-TR.rc @@ -1,11 +1,11 @@ -/* TRANSLATORS: 2006 Fatih Aşıcı, 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2006 Fatih Aşıcı, 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_APPNAME "Mayın Tarlası" - IDS_NOBODY "Bir kişi bile" + IDS_NOBODY "Hiç kimse" IDS_ABOUT "Telif Hakkı: 2000 - Joshua Thielen" END @@ -15,19 +15,19 @@ BEGIN BEGIN MENUITEM "&Yeni Oyun\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&Soru İmiyle İmleme", IDM_MARKQ + MENUITEM "&Soru İmiyle İşaretleme", IDM_MARKQ MENUITEM SEPARATOR MENUITEM "&Acemî", IDM_BEGINNER MENUITEM "&Gelişmiş", IDM_ADVANCED MENUITEM "&Usta", IDM_EXPERT - MENUITEM "&Husûsî...", IDM_CUSTOM + MENUITEM "&Özel", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Çıkış\tSeçenek+X", IDM_EXIT END POPUP "&Yardım" BEGIN - MENUITEM "&En Kısa Süreler...", IDM_TIMES - MENUITEM "&Üzerine...", IDM_ABOUT + MENUITEM "&En Kısa Süreler", IDM_TIMES + MENUITEM "&Hakkında", IDM_ABOUT END END @@ -61,7 +61,7 @@ END DLG_CUSTOM DIALOGEX 0, 0, 100, 100 STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT -CAPTION "Husûsî" +CAPTION "Özel" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Yataç Sayısı:", -1, 5, 5, 30, 10 diff --git a/base/applications/kbswitch/lang/tr-TR.rc b/base/applications/kbswitch/lang/tr-TR.rc index 6d904221f4..beeda8fe27 100644 --- a/base/applications/kbswitch/lang/tr-TR.rc +++ b/base/applications/kbswitch/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -6,7 +6,7 @@ IDR_POPUP MENU BEGIN POPUP "popup" BEGIN - MENUITEM "&Yeğlemeler...", ID_PREFERENCES + MENUITEM "&Tercihler", ID_PREFERENCES MENUITEM SEPARATOR MENUITEM "&Çıkış", ID_EXIT END diff --git a/base/applications/screensavers/3dtext/lang/tr-TR.rc b/base/applications/screensavers/3dtext/lang/tr-TR.rc index a4e18b92c4..41ae908c0a 100644 --- a/base/applications/screensavers/3dtext/lang/tr-TR.rc +++ b/base/applications/screensavers/3dtext/lang/tr-TR.rc @@ -1,10 +1,10 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "3D Metin Görüntülük Koruyucusu Ayarları" +CAPTION "3D Metin Ekran Koruyucusu Ayarları" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Tamam", IDOK, 216, 7, 50, 14 @@ -15,5 +15,5 @@ END STRINGTABLE BEGIN - IDS_DESCRIPTION "3D Metin Görüntülük Koruyucusu" + IDS_DESCRIPTION "3D Metin Ekran Koruyucusu" END diff --git a/base/applications/screensavers/logon/lang/tr-TR.rc b/base/applications/screensavers/logon/lang/tr-TR.rc index 62f80b7bdb..ba1a880b2e 100644 --- a/base/applications/screensavers/logon/lang/tr-TR.rc +++ b/base/applications/screensavers/logon/lang/tr-TR.rc @@ -1,9 +1,9 @@ -/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_DESCRIPTION "Oturum Açma Görüntülük Koruyucusu" + IDS_DESCRIPTION "Oturum Açma Ekran Koruyucusu" IDS_TEXT "Ayarlanması gereken seçenek yok." END diff --git a/modules/rostests/winetests/GUI/lang/tr-TR.rc b/modules/rostests/winetests/GUI/lang/tr-TR.rc new file mode 100644 index 0000000000..b9c4eb6ee9 --- /dev/null +++ b/modules/rostests/winetests/GUI/lang/tr-TR.rc @@ -0,0 +1,49 @@ +/* TRANSLATORS: 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDD_WINETESTGUI DIALOGEX 0, 0, 293, 262 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +CAPTION "Winetest GUI" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Tamam",IDOK,236,241,50,14,WS_GROUP + CONTROL "",IDC_LIST,"SysListView32",LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,69,279,103 + EDITTEXT IDC_OUTPUT,7,175,279,62,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY + COMBOBOX IDC_TESTSELECTION,27,12,205,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Sınama:",IDC_STATIC,6,14,18,8 + PUSHBUTTON "Araştır...",IDC_BROWSE,236,11,50,14 + PUSHBUTTON "Çalıştır",IDC_RUN,236,30,50,14 + CONTROL "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,28,30,204,14 + LTEXT "Çalıştırmalar:",IDC_STATIC,8,53,20,8 + LTEXT "?",IDC_NUMRUNS,33,53,8,8 + LTEXT "Hatalar:",IDC_STATIC,55,53,23,8 + LTEXT "?",IDC_NUMERRORS,85,53,8,8 + LTEXT "Başarısızlıklar:",IDC_STATIC,107,53,28,8 + LTEXT "?",IDC_NUMFAILURES,141,53,8,8 + PUSHBUTTON "Seçenekler",IDC_OPTIONS,181,49,50,14 + PUSHBUTTON "Dur",IDC_STOP,236,49,50,14 + + LTEXT "durum çubuğu",IDC_STATUS,7,244,210,8 +END + +IDD_TESTBROWSER DIALOGEX 0, 0, 259, 250 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Sınama hiyeraşisi" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "Seç", IDOK, 202, 7, 50, 14 + PUSHBUTTON "Kapat", IDCANCEL, 202, 34, 50, 14 + CONTROL "", IDC_TREEVIEW, "SysTreeView32", WS_BORDER | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT, 7, 7, 189, 236 +END + +IDD_OPTIONS DIALOGEX 0, 0, 180, 100 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Seçenekler" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "Tamam", IDOK, 70, 80, 50, 14 + PUSHBUTTON "İptal", IDCANCEL, 125, 80, 50, 14 + CONTROL "Konsol penceresini gizle",IDC_HIDECONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,80,10 + CONTROL "Başlangıçta çalıştır",IDC_RUNONSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,80,10 +END diff --git a/modules/rostests/winetests/GUI/rsrc.rc b/modules/rostests/winetests/GUI/rsrc.rc index 25ddc122f5..17e10c270e 100644 --- a/modules/rostests/winetests/GUI/rsrc.rc +++ b/modules/rostests/winetests/GUI/rsrc.rc @@ -24,3 +24,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL //#include "lang/uk-UA.rc" //#include "lang/ru-RU.rc" //#include "lang/el-GR.rc" +#include "lang/tr-TR.rc" diff --git a/win32ss/printing/monitors/localmon/lang/tr-TR.rc b/win32ss/printing/monitors/localmon/lang/tr-TR.rc new file mode 100644 index 0000000000..c1ef04c05a --- /dev/null +++ b/win32ss/printing/monitors/localmon/lang/tr-TR.rc @@ -0,0 +1,9 @@ +/* TRANSLATORS: 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_LOCAL_PORT "Yerel Port" + IDS_LOCAL_MONITOR "Yerel Monitor" +END diff --git a/win32ss/printing/monitors/localmon/localmon.rc b/win32ss/printing/monitors/localmon/localmon.rc index 1784c2fb90..5d6e65f727 100644 --- a/win32ss/printing/monitors/localmon/localmon.rc +++ b/win32ss/printing/monitors/localmon/localmon.rc @@ -36,3 +36,6 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif diff --git a/win32ss/user/user32/lang/tr-TR.rc b/win32ss/user/user32/lang/tr-TR.rc index ff38d048f4..557f78169e 100644 --- a/win32ss/user/user32/lang/tr-TR.rc +++ b/win32ss/user/user32/lang/tr-TR.rc @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -37,7 +37,7 @@ BEGIN MENUITEM "&Taşı", SC_MOVE MENUITEM "&Yeniden Boyutlandır", SC_SIZE MENUITEM "&Simge Durumuna Küçült", SC_MINIMIZE - MENUITEM "&Görüntülüğü Kaplat", SC_MAXIMIZE + MENUITEM "&Ekranı Kaplat", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "&Kapat\tSeçenek+F4", SC_CLOSE END @@ -48,7 +48,7 @@ BEGIN MENUITEM "&Taşı", SC_MOVE MENUITEM "&Yeniden Boyutlandır", SC_SIZE MENUITEM "&Simge Durumuna Küçült", SC_MINIMIZE - MENUITEM "&Görüntülüğü Kaplat", SC_MAXIMIZE + MENUITEM "&Ekranı Kaplat", SC_MAXIMIZE MENUITEM SEPARATOR MENUITEM "&Kapat\tDenetim+F4", SC_CLOSE MENUITEM SEPARATOR diff --git a/win32ss/user/winsrv/usersrv/lang/tr-TR.rc b/win32ss/user/winsrv/usersrv/lang/tr-TR.rc index 3bf542e713..4645381471 100644 --- a/win32ss/user/winsrv/usersrv/lang/tr-TR.rc +++ b/win32ss/user/winsrv/usersrv/lang/tr-TR.rc @@ -1,26 +1,26 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com), 2016 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net), 2018 Ercan Ersoy (ercanersoy) (ercanersoy [at] ercanersoy [dot] net) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "İzlenceyi Sonlandır - " +CAPTION "Programı Sonlandır - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "İzlence sonlandırılıyor... Lütfen bekleyiniz.", IDC_STATIC, 7, 7, 186, 11 + LTEXT "Program sonlandırılıyor... Lütfen bekleyiniz.", IDC_STATIC, 7, 7, 186, 11 CONTROL "İlerleme", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 - LTEXT "İzlenceyi hemen kapatmayı seçerseniz, tüm saklanmamış veriyi yitireceksiniz. İzlenceden şimdi çıkmak için Şimdi Sonlandır'a tıklayınız.", IDC_STATIC, 7, 40, 186, 26 + LTEXT "Programı hemen kapatmayı seçerseniz, tüm saklanmamış veriyi yitireceksiniz. Programdan şimdi çıkmak için Şimdi Sonlandır'a tıklayınız.", IDC_STATIC, 7, 40, 186, 26 DEFPUSHBUTTON "&Şimdi Sonlandır", IDC_END_NOW, 150, 71, 43, 17 END IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "İzlenceyi Sonlandır - " +CAPTION "Programı Sonlandır - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "İptal", IDCANCEL, 142, 98, 43, 17 PUSHBUTTON "&Şimdi Sonlandır", IDC_END_NOW, 78, 98, 43, 17 - LTEXT "Bu izlence yanıt vermiyor.", IDC_STATIC, 7, 7, 178, 8 - LTEXT "ReactOS'a dönmek ve izlencenin durumunu denetlemek için İptal'e tıklayınız.", IDC_STATIC, 7, 26, 178, 16 - LTEXT "İzlenceyi hemen kapatmayı seçerseniz, tüm saklanmamış veriyi yitireceksiniz. İzlenceden şimdi çıkmak için Şimdi Sonlandır'a tıklayınız.", IDC_STATIC, 7, 53, 178, 26 + LTEXT "Bu program yanıt vermiyor.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "ReactOS'a dönmek ve programın durumunu denetlemek için İptal'e tıklayınız.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Programı hemen kapatmayı seçerseniz, tüm saklanmamış veriyi yitireceksiniz. Programdan şimdi çıkmak için Şimdi Sonlandır'a tıklayınız.", IDC_STATIC, 7, 53, 178, 26 END

1 0

01/01: [TRANSLATION][USERSRV] Add Hungarian Translation (#442)
by Kláben Szabolcs Bence (Tudi20) 01 Apr '18

01 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1e061499f87fcd3a438b… commit a1e061499f87fcd3a438b50b4c5129b124521571 Author: Kláben Szabolcs Bence (Tudi20) <ktudi20(a)protonmail.com> AuthorDate: Sun Apr 1 19:13:35 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 1 19:13:35 2018 +0200 [TRANSLATION][USERSRV] Add Hungarian Translation (#442) --- win32ss/user/winsrv/usersrv/lang/hu-HU.rc | 26 ++++++++++++++++++++++++++ win32ss/user/winsrv/usersrv/usersrv.rc | 3 +++ 2 files changed, 29 insertions(+) diff --git a/win32ss/user/winsrv/usersrv/lang/hu-HU.rc b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc new file mode 100644 index 0000000000..8b55512225 --- /dev/null +++ b/win32ss/user/winsrv/usersrv/lang/hu-HU.rc @@ -0,0 +1,26 @@ +/* Hungarian Translation by Kláben Szabolcs Bence - ktudi20(a)protonmail.com */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +IDD_END_NOW DIALOGEX 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Program Bezárása - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Program Bezárása... Kérlek várj", IDC_STATIC, 7, 7, 186, 11 + CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 + LTEXT "Ha azt választod, hogy azzonal bezársz egy programot, minden nem mentett adatot vesztesz. A program mostani bezárásához, kattints a Bezásás Most-ra.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&End Now", IDC_END_NOW, 150, 71, 43, 17 +END + +IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Program Bezárása - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Mégse", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "&Bezárás Most", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "Ez a program nem válaszol.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Hogy visszatérj ReactOS-ba és ellenőrizd a státuszát a programnak, kattins a Mégsére.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Ha azt választod, hogy azzonal bezársz egy programot, minden nem mentett adatot vesztesz. A program mostani bezárásához, kattints a Bezásás Most-ra.", IDC_STATIC, 7, 53, 178, 26 +END diff --git a/win32ss/user/winsrv/usersrv/usersrv.rc b/win32ss/user/winsrv/usersrv/usersrv.rc index 5e9aeaf362..cafd592837 100644 --- a/win32ss/user/winsrv/usersrv/usersrv.rc +++ b/win32ss/user/winsrv/usersrv/usersrv.rc @@ -30,6 +30,9 @@ #ifdef LANGUAGE_HE_IL #include "lang/he-IL.rc" #endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif #ifdef LANGUAGE_ID_ID #include "lang/id-ID.rc" #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs