Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 65626: [NTOSKRNL] Fix x64 build
by tkreuzer＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: tkreuzer Date: Sat Dec 13 11:01:57 2014 New Revision: 65626 URL: http://svn.reactos.org/svn/reactos?rev=65626&view=rev Log: [NTOSKRNL] Fix x64 build Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Dec 13 11:01:57 2014 @@ -204,7 +204,7 @@ add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret -ENDFUNC InternalDispatchException +ENDFUNC /* CPU EXCEPTION HANDLERS ****************************************************/ @@ -222,7 +222,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiDivideErrorFault +ENDFUNC PUBLIC KiDebugTrapOrFault @@ -245,7 +245,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiDebugTrapOrFault +ENDFUNC PUBLIC KiNmiInterrupt @@ -258,7 +258,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiNmiInterrupt +ENDFUNC PUBLIC KiBreakpointTrap @@ -279,7 +279,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiBreakpointTrap +ENDFUNC PUBLIC KiOverflowTrap @@ -295,7 +295,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiOverflowTrap +ENDFUNC PUBLIC KiBoundFault @@ -319,7 +319,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiBoundFault +ENDFUNC PUBLIC KiInvalidOpcodeFault @@ -350,7 +350,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiInvalidOpcodeFault +ENDFUNC PUBLIC KiNpxNotAvailableFault @@ -372,7 +372,7 @@ KiNpxNotAvailableFaultExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiNpxNotAvailableFault +ENDFUNC PUBLIC KiDoubleFaultAbort @@ -388,7 +388,7 @@ /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT jmp $ -ENDFUNC KiDoubleFaultAbort +ENDFUNC PUBLIC KiNpxSegmentOverrunAbort @@ -400,7 +400,7 @@ Fatal EXCEPTION_NPX_OVERRUN jmp $ -ENDFUNC KiNpxSegmentOverrunAbort +ENDFUNC PUBLIC KiInvalidTssFault @@ -411,7 +411,7 @@ /* Bugcheck */ Fatal EXCEPTION_INVALID_TSS jmp $ -ENDFUNC KiInvalidTssFault +ENDFUNC PUBLIC KiSegmentNotPresentFault @@ -422,7 +422,7 @@ /* Bugcheck */ Fatal EXCEPTION_SEGMENT_NOT_PRESENT jmp $ -ENDFUNC KiSegmentNotPresentFault +ENDFUNC PUBLIC KiStackFault @@ -433,7 +433,7 @@ /* Bugcheck */ Fatal EXCEPTION_STACK_FAULT jmp $ -ENDFUNC KiStackFault +ENDFUNC PUBLIC KiGeneralProtectionFault @@ -472,7 +472,7 @@ /* Return */ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiGeneralProtectionFault +ENDFUNC PUBLIC KiPageFault @@ -560,7 +560,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiFloatingErrorFault +ENDFUNC PUBLIC KiAlignmentFault @@ -571,7 +571,7 @@ /* Bugcheck */ Fatal EXCEPTION_ALIGNMENT_CHECK jmp $ -ENDFUNC KiAlignmentFault +ENDFUNC PUBLIC KiMcheckAbort @@ -582,7 +582,7 @@ /* Bugcheck */ Fatal HEX(12) jmp $ -ENDFUNC KiMcheckAbort +ENDFUNC PUBLIC KiXmmException @@ -604,7 +604,7 @@ KiXmmExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiXmmException +ENDFUNC /* SOFTWARE INTERRUPT SERVICES ***********************************************/ @@ -622,7 +622,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiRaiseAssertion +ENDFUNC PUBLIC KiDebugServiceTrap @@ -640,7 +640,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiDebugServiceTrap +ENDFUNC PUBLIC KiApcInterrupt @@ -746,7 +746,7 @@ #endif /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiUnexpectedInterrupt +ENDFUNC PUBLIC KiInterruptDispatch FUNC KiInterruptDispatch

1 0

[pschweitzer] 65625: [TASKMGR] Don't leak process handle CORE-3716
by pschweitzer＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: pschweitzer Date: Sat Dec 13 08:18:09 2014 New Revision: 65625 URL: http://svn.reactos.org/svn/reactos?rev=65625&view=rev Log: [TASKMGR] Don't leak process handle CORE-3716 Modified: trunk/reactos/base/applications/taskmgr/endproc.c Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Sat Dec 13 08:18:09 2014 @@ -46,6 +46,7 @@ LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256); MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST); + CloseHandle(hProcess); return; } @@ -53,7 +54,10 @@ LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST) != IDYES) + { + if (hProcess) CloseHandle(hProcess); return; + } /* no such process or not enough privileges to open its token */ if (!hProcess) @@ -82,7 +86,7 @@ /* return early if the process handle does not exist */ if (!hProcess) - return FALSE; + return FALSE; /* the important system processes that we don't want to let the user kill come marked as critical, this simplifies the check greatly. @@ -97,8 +101,8 @@ NULL); if (NT_SUCCESS(status) && BreakOnTermination) - return TRUE; - + return TRUE; + return FALSE; } @@ -122,13 +126,17 @@ LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256); MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST); + CloseHandle(hProcess); return; } LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) + { + if (hProcess) CloseHandle(hProcess); return; + } if (!hProcess) {

1 0

[zguo] 65624: [TASKMGR] Prevent task manager from killing critical processes. Patch by Ismael Ferreras Morezuelas. CORE-3716
by zguo＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: zguo Date: Sat Dec 13 06:35:56 2014 New Revision: 65624 URL: http://svn.reactos.org/svn/reactos?rev=65624&view=rev Log: [TASKMGR] Prevent task manager from killing critical processes. Patch by Ismael Ferreras Morezuelas. CORE-3716 Modified: trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/endproc.h trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc trunk/reactos/base/applications/taskmgr/resource.h Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -3,8 +3,9 @@ * * endproc.c * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * 2005 Klemens Friedl <frik85(a)reactos.at> + * 2014 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,8 @@ */ #include "precomp.h" +#include <psdk/stierr.h> +#include <psdk/winternl.h> void ProcessPage_OnEndProcess(void) { @@ -35,29 +38,68 @@ if (dwProcessId == 0) return; + hProcess = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION, FALSE, dwProcessId); + + /* forbid killing system processes even if we have privileges -- sigh, windows kludge! */ + if (hProcess && IsCriticalProcess(hProcess)) + { + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST); + return; + } + + /* if this is a standard process just ask for confirmation before doing it */ LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); - if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) + if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST) != IDYES) return; - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); - + /* no such process or not enough privileges to open its token */ if (!hProcess) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); - MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP|MB_TOPMOST); return; } + /* try to kill it, and notify the user if didn't work */ if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); - MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONSTOP|MB_TOPMOST); } CloseHandle(hProcess); +} + +BOOL IsCriticalProcess(HANDLE hProcess) +{ + NTSTATUS status; + ULONG BreakOnTermination; + + /* return early if the process handle does not exist */ + if (!hProcess) + return FALSE; + + /* the important system processes that we don't want to let the user + kill come marked as critical, this simplifies the check greatly. + + a critical process brings the system down when is terminated: + <http://www.geoffchappell.com/studies/windows/win32/ntdll/api/rtl/peb/setpro…> */ + + status = NtQueryInformationProcess(hProcess, + ProcessBreakOnTermination, + &BreakOnTermination, + sizeof(ULONG), + NULL); + + if (NT_SUCCESS(status) && BreakOnTermination) + return TRUE; + + return FALSE; } void ProcessPage_OnEndProcessTree(void) @@ -72,12 +114,21 @@ if (dwProcessId == 0) return; + hProcess = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION, FALSE, dwProcessId); + + /* forbid killing system processes even if we have privileges -- sigh, windows kludge! */ + if (hProcess && IsCriticalProcess(hProcess)) + { + LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); + LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256); + MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST); + return; + } + LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256); LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256); if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES) return; - - hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessId); if (!hProcess) { Modified: trunk/reactos/base/applications/taskmgr/endproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.h [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -23,4 +23,5 @@ #pragma once void ProcessPage_OnEndProcess(void); +BOOL IsCriticalProcess(HANDLE hProcess); void ProcessPage_OnEndProcessTree(void); Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ð° Ð·Ð°Ð´Ð°ÑÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»" IDS_MSG_WARNINGTERMINATING "ÐÐÐÐÐÐÐÐ: ÐÑÐµÐºÑÐ°ÑÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð½ÐµÐ¶ÐµÐ»Ð°Ð½Ð¸\nÐ¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸Ñ, Ð²ÐºÐ»ÑÑÐ¸ÑÐµÐ»Ð½Ð¾ Ð´Ð¾ Ð·Ð°Ð³ÑÐ±Ð° Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ Ð¸ Ð½ÐµÑÑÑÐ¾ÑÐ¹Ð¸Ð²Ð¾ÑÑ Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°.\nÐÐµÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾ Ð½ÑÐ¼Ð° Ð´Ð° Ð¸Ð¼Ð° Ð²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ Ð´Ð° Ð·Ð°Ð¿Ð¸ÑÐµ ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾ Ð¸\nÐ´Ð°Ð½Ð½Ð¸ÑÐµ ÑÐ¸, Ð¿ÑÐµÐ´Ð¸ Ð´Ð° Ð¿ÑÐ¸ÐºÐ»ÑÑÐ¸. Ð¡Ð¸Ð³ÑÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, ÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð°\nÐ¿ÑÐµÐºÑÐ°ÑÐ¸ÑÐµ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾?" IDS_MSG_UNABLETERMINATEPRO "ÐÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐµÐºÑÐ°ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÑÐ²ÐµÐ½ÑÑÐ²Ð¾" IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ: ÐÑÐ¾Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° Ð¿ÑÑÐ²ÐµÐ½ÑÑÐ²Ð¾ÑÐ¾ Ð½Ð° ÑÐ¾Ð²Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð°\nÐ¿ÑÐ¸ÑÐ¸Ð½Ð¸ Ð½ÐµÐ¶ÐµÐ»Ð°Ð½Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑÐ²Ð¸Ñ, Ð²ÐºÐ»ÑÑÐ¸ÑÐµÐ»Ð½Ð¾ Ð½ÐµÑÑÑÐ¾Ð¹ÑÐ¸Ð²Ð¾ÑÑ Ð½Ð° ÑÐ¸ÑÑÐµÐ¼Ð°ÑÐ°. Ð¡Ð¸Ð³ÑÑÐµÐ½ Ð»Ð¸ ÑÑÐµ, \nÑÐµ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° ÑÐ¼ÐµÐ½Ð¸ÑÐµ ÑÑÐ°ÑÑÐ¸Ð½ÑÑÐ²Ð¾ÑÐ¾?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ°ÐµÑÐ¾ÑÑ Ð½Ð° Ð¦ÐÐ£: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "UpozornÄnÃ sprÃ¡vce Ãºloh" IDS_MSG_WARNINGTERMINATING "UpozornÄnÃ: ukonÄenÃ procesu mÅ¯Å¾e zpÅ¯sobit nevratnÃ© Å¡kody,\nnapÅ.: ztrÃ¡tu dat nebo nestability systÃ©mu. \nProcesu nebude poskytnuta Å¡ance k uloÅ¾enÃ jeho stavu nebo\ndat pÅedtÃm, neÅ¾ bude ukonÄen. Jste si jisti\ns ukonÄenÃm procesu?" IDS_MSG_UNABLETERMINATEPRO "NenÃ moÅ¾nÃ© ukonÄit proces" + IDS_MSG_CLOSESYSTEMPROCESS "Toto je dÅ¯leÅ¾itÃ½ systÃ©movÃ½ proces. SprÃ¡vce Ãºloh tento proces neukonÄÃ." IDS_MSG_UNABLECHANGEPRIORITY "NenÃ moÅ¾nÃ© zmÄnit prioritu" IDS_MSG_WARNINGCHANGEPRIORITY "UpozornÄnÃ: ZmÄna priority procesu mÅ¯Å¾e\nzpÅ¯sobit nestabilitu systÃ©mu a jinÃ© nepÅedvÃdatelnÃ© problÃ©my. Jste si jisti\nse zmÄnou priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "VyuÅ¾itÃ CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/da-DK.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/de-DE.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Warnung vom Task-Manager" IDS_MSG_WARNINGTERMINATING "WARNUNG: Das Abbrechen eines Prozesses kann zu\nunerwÃ¼nschten Ergebnissen, einschlieÃlich Datenverlust und\nSysteminstabilitÃ¤t, fÃ¼hren. Zustand und Daten des Prozesses\nwerden nicht mehr gespeichert. Sind Sie sicher, dass Sie\nden Prozess abbrechen mÃ¶chten?" IDS_MSG_UNABLETERMINATEPRO "Kann den Prozess nicht beenden" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Kann die PrioritÃ¤t nicht Ã¤ndern" IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ãndern der PrioritÃ¤tsklasse dieses Prozesses\nkann zu unerwÃ¼nschten Ergebnissen, einschl. SysteminstabilitÃ¤t, fÃ¼hren.\nSind Sie sicher, dass Sie sie Ã¤ndern mÃ¶chten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "ÎÏÎµÏÎµ ÎµÏÎ¹Î»ÎÎ¾ÎµÎ¹ Î¼Î¹Î± ÎºÏÎ¯ÏÎ¹Î¼Î· Î´Î¹ÎµÏÎ³Î±ÏÎ¯Î± ÏÎ¿Ï ÏÏÏÏÎ®Î¼Î±ÏÎ¿Ï. Î Î´Î¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· ÎµÏÎ³Î±ÏÎ¹ÏÎ½ Î´ÎµÎ½ ÏÎµÏÎ¼Î±ÏÎ¯ÏÎµÎ¹ ÏÎ·Î½ Î´Î¹ÎµÏÎ³Î±ÏÎ¯Î± Î±ÏÏÎ®." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -430,6 +430,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/es-ES.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Advertencia del Administrador de tareas" IDS_MSG_WARNINGTERMINATING "ADVERTENCIA: Si finaliza un proceso puede obtener resultados no\ndeseados como la pÃ©rdida de datos y la inestabilidad del sistema. El\nproceso no tendrÃ¡ tiempo para guardar su estado o datos\nantes de cerrarse. Â¿EstÃ¡ seguro que desea continuar?" IDS_MSG_UNABLETERMINATEPRO "No se pudo finalizar el proceso" + IDS_MSG_CLOSESYSTEMPROCESS "Ãste es un proceso crÃtico para el sistema. El administrador de tareas no terminarÃ¡ este proceso." IDS_MSG_UNABLECHANGEPRIORITY "No se pudo cambiar la prioridad" IDS_MSG_WARNINGCHANGEPRIORITY "Advertencia: El cambio de prioridad en ciertos procesos podrÃa provocar la inestabilidad del sistema.\nÂ¿Seguro que desea cambiar la prioridad?" IDS_MSG_TRAYICONCPUUSAGE "Promedio CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Avertissement du Gestionnaire des tÃ¢ches" IDS_MSG_WARNINGTERMINATING "ATTENTION : Terminer un processus peut causer des effets indÃ©sirables\nincluant une perte de donnÃ©e ou une instabilitÃ© du systÃ¨me.\nLe processus n'aura pas la chance de sauvegarder son Ã©tat\nou les donnÃ©es avant de terminer.\nÃtes-vous sÃ»r de vouloir terminer le processus ?" IDS_MSG_UNABLETERMINATEPRO "Impossible de terminer le processus" + IDS_MSG_CLOSESYSTEMPROCESS "C'est un processus critique du systÃ¨me. Le gestionnaire de tÃ¢che ne le terminera pas." IDS_MSG_UNABLECHANGEPRIORITY "Impossible de changer la prioritÃ©" IDS_MSG_WARNINGCHANGEPRIORITY "ATTENTION : Changer la prioritÃ© du processus peut causer des\neffets indÃ©sirables comme l'instabilitÃ© du systÃ¨me.\nÃtes-vous sÃ»r de vouloir changer la prioritÃ© ?" IDS_MSG_TRAYICONCPUUSAGE "UC utilisÃ©e : %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "FeladatkezelÃµ figyelmeztetÃ©se" IDS_MSG_WARNINGTERMINATING "FIGYELEM: A folyamat befejezÃ©se kellemetlen\nvÃ¡ltozÃ¡sokat hozhat, adatvesztÃ©st Ã©s rendszer instabilitÃ¡st okozhat. A folyamat\n nem fog lehetÃµsÃ©get kapni, hogy elmentse az adatokat.\nBiztosan beakarod fejezni?" IDS_MSG_UNABLETERMINATEPRO "Nem lehetsÃ©ges a folyamat befejezÃ©se" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Nem lehetsÃ©ges a prioritÃ¡s megvÃ¡ltoztatÃ¡sa" IDS_MSG_WARNINGCHANGEPRIORITY "FIGYELEM: A prioritÃ¡s megvÃ¡ltoztatÃ¡sa\nkellemetlensÃ©geket, akÃ¡r rendszer instabilitÃ¡st is okozhat.\nBiztosan megakarod vÃ¡ltoztatni a prioritÃ¡st?" IDS_MSG_TRAYICONCPUUSAGE "CPU hasznÃ¡lat: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/id-ID.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "Pemakaian CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "Segnalazione di Task Manager" IDS_MSG_WARNINGTERMINATING "ATTENZIONE: Arrestare un processo puÃ² provocare\n effetti indesiderati compresa la perdita di dati o l'instabilitÃ del sistema. \nIl processo non potrÃ salvare il prorio stato o i dati\nprima del suo arresto.\nSei sicuro di voler procedere?" IDS_MSG_UNABLETERMINATEPRO "Impossibile arrestare il Processo" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Impossibile cambiare la PrioritÃ " IDS_MSG_WARNINGCHANGEPRIORITY "ATTENZIONE: La modifica della classe di prioritÃ puÃ² provocare\n effetti indesiderati compresa la perdita di dati o l'instabilitÃ del sistema.\nSei sicuro di voler procedere?" IDS_MSG_TRAYICONCPUUSAGE "Uso CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "ã¿ã¹ã¯ ããã¼ã¸ã£ã®è¦å" IDS_MSG_WARNINGTERMINATING "è¦å: ããã»ã¹ãçµäºããã¨ããã¼ã¿ãå¤±ãããããã·ã¹ãã ã\nä¸å®å®ã«ãªã£ãããããªã©ã®ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nããã»ã¹ãçµäºããåã«ãç¶æã¾ãã¯ãã¼ã¿ãä¿åãããã©ããã®\nç¢ºèªã¡ãã»ã¼ã¸ã¯è¡¨ç¤ºããã¾ãããããã»ã¹ãçµäºãã¾ãã?" IDS_MSG_UNABLETERMINATEPRO "ããã»ã¹ãçµäºã§ãã¾ãã" + IDS_MSG_CLOSESYSTEMPROCESS "ãã®ããã»ã¹ã¯å±æ©çãªã·ã¹ãã ããã»ã¹ã§ããã¿ã¹ã¯ããã¸ã£ã¯ãã®ããã»ã¹ãçµäºãã¦ã¯ãªããªãã" IDS_MSG_UNABLECHANGEPRIORITY "åªååº¦ãå¤æ´ã§ãã¾ãã" IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: ãã®ããã»ã¹ã®åªååº¦ã¯ã©ã¹ãå¤æ´ããã¨ãã·ã¹ãã ãä¸å®å®ã«\nãªããªã©ãäºæããªãçµæã«ãªããã¨ãããã¾ãã\nåªååº¦ã¯ã©ã¹ãå¤æ´ãã¾ãã?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ç: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "ìì ê´ë¦¬ì ê²½ê³ " IDS_MSG_WARNINGTERMINATING "ê²½ê³ : íë¡ì¸ì¤ë¥¼ ì¢ë£íë©´ ë°ì´í° ìì¤ ë° ìì¤í ë¶ìì ê³¼\nê°ì ë°ëì§íì§ ìì ê²°ê³¼ë¥¼ ê°ì ¸ì¬ ì ììµëë¤. íë¡ì¸ì¤ë¥¼\nì¢ë£íê¸° ì ì íë¡ì¸ì¤ ìíë ë°ì´í°ë¥¼ ì ì¥í ê¸°íê°\nììµëë¤.\níë¡ì¸ì¤ë¥¼ ì¢ë£íìê² ìµëê¹?" IDS_MSG_UNABLETERMINATEPRO "íë¡ì¸ì¤ë¥¼ ì ê±°í ì ìì" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "ì°ì ììë¥¼ ë°ê¿ ì ìì" IDS_MSG_WARNINGCHANGEPRIORITY "ê²½ê³ : ì´ íë¡ì¸ì¤ì ì°ì ìì í´ëì¤ë¥¼ ë³ê²½íë©´ ìì¤í ë¶ìì ì í¬í¨íì¬\nìê¸°ì¹ ìì ê²°ê³¼ë¥¼ ì´ëí ìë ììµëë¤.\nì°ì ìì í´ëì¤ë¥¼ ë³ê²½íìê² ìµëê¹?" IDS_MSG_TRAYICONCPUUSAGE "CPU ì¬ì©: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "Waarschuwing van Taakbeheer" IDS_MSG_WARNINGTERMINATING "Waarschuwing: het beÃ«indigen van een proces kan tot\nonverwachte resultaten leiden, zoals verlies van gegevens\nof een instabiel systeem, omdat de status of de gegevens\nniet meer kunnen worden opgeslagen. Weet u zeker dat\nu het proces wilt beÃ«indigen?" IDS_MSG_UNABLETERMINATEPRO "Kan het proces niet beÃ«indigen" + IDS_MSG_CLOSESYSTEMPROCESS "Dit is een cruciaal systeemproces. Taakbeheer zal dit proces niet beÃ«indigen." IDS_MSG_UNABLECHANGEPRIORITY "Kan de prioriteit niet wijzigen" IDS_MSG_WARNINGCHANGEPRIORITY "Waarschuwing: het wijzigen van de prioriteitsklasse van dit proces\nkan ongewenste resultaten hebben, zoals een instabiel systeem. Weet u\nzeker dat u de prioriteitsklasse wilt wijzigen?" IDS_MSG_TRAYICONCPUUSAGE "CPU-gebruik: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/no-NO.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "Oppgavebehandler advarsel" IDS_MSG_WARNINGTERMINATING "ADVARSEL: Avsluttes en prosess kan forutsake uÃ¸nsket\nresultat inkluderer miste av data og systemet kan bli ustabilt. \nprosessen vil ikke kunne gjenopprette sin tilstand eller \ndata slik de var fÃ¸r avslutting. Er du sikker pÃ¥ at du vil\navslutte prosessen?" IDS_MSG_UNABLETERMINATEPRO "Ikke i stand til Ã¥ avslutte prosess" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Ikke i stand til endre prioritet" IDS_MSG_WARNINGCHANGEPRIORITY "ADVARSEL: Endring av prioritet klasse av denne prosess kan\nforutsake uÃ¸nsket resultat inkluderer systemet kan bli ustabilt. Er du\nsikker pÃ¥ at du vil endre prioritet klassen?" IDS_MSG_TRAYICONCPUUSAGE "Prosessorbruk: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -440,6 +440,7 @@ IDS_MSG_TASKMGRWARNING "OstrzeÅ¼enie MenedÅ¼era zadaÅ" IDS_MSG_WARNINGTERMINATING "UWAGA: ZakoÅczenie procesu moÅ¼e przynieÅÄ niepoÅ¼Ädane skutki, w tym rÃ³wnieÅ¼ doprowadziÄ do utraty danych i niestabilnoÅci systemu.\nProces nie bÄdzie miaÅ szansy na zapisane danych.\nCzy na pewno chcesz zakoÅczyÄ?" IDS_MSG_UNABLETERMINATEPRO "Nie moÅ¼na zakoÅczyÄ tego procesu" + IDS_MSG_CLOSESYSTEMPROCESS "Jest to krytyczny proces systemowy. MenedÅ¼er zadaÅ nie zakoÅczy tego procesu." IDS_MSG_UNABLECHANGEPRIORITY "Nie moÅ¼na zmieniÄ priorytetu" IDS_MSG_WARNINGCHANGEPRIORITY "UWAGA: Zmiana priorytetu tego procesu moÅ¼e przynieÅÄ\nniepoÅ¼Ädane skutki, w tym rÃ³wnieÅ¼ niestabilnoÅÄ systemu.\nCzy na pewno chcesz zmieni priorytet?" IDS_MSG_TRAYICONCPUUSAGE "UÅ¼ycie procesora: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "Aviso do 'Gerenciador de tarefas'" IDS_MSG_WARNINGTERMINATING "AVISO: o encerramento de um processo pode causar\nefeitos indesejÃ¡veis, como perda de dados e\ninstabilidade do sistema. O processo nÃ£o terÃ¡ como\nsalvar seu estado e os dados antes de ser encerrado.\nTem certeza de que deseja encerrÃ¡-lo?" IDS_MSG_UNABLETERMINATEPRO "NÃ£o Ã© possÃvel finalizar o processo" + IDS_MSG_CLOSESYSTEMPROCESS "Este Ã© um processo crÃtico do sistema. O Gerenciador de tarefas nÃ£o irÃ¡ encerrar este processo" IDS_MSG_UNABLECHANGEPRIORITY "NÃ£o Ã© possÃvel alterar a prioridade" IDS_MSG_WARNINGCHANGEPRIORITY "AVISO: a alteraÃ§Ã£o da classe de prioridade do processo\npode causar efeitos indesejÃ¡veis, inclusive a instabilidade do sistema. Tem\ncerteza de que deseja alterar a classe de prioridade?" IDS_MSG_TRAYICONCPUUSAGE "Uso de CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -438,6 +438,7 @@ IDS_MSG_TASKMGRWARNING "Avertisment" IDS_MSG_WARNINGTERMINATING "Terminarea forÈatÄ a unui proces poate duce la pierderi\nde date sau la instabilitatea sistemului. Procesului nu i\nse va permite Ã®ndeplinirea formalitÄÈilor de Ã®nchidere.\nSigur doriÈi terminarea forÈatÄ a procesului?" IDS_MSG_UNABLETERMINATEPRO "Procesul nu poate fi oprit" + IDS_MSG_CLOSESYSTEMPROCESS "Acesta este un proces critic de sistem. Gestionarul de aplicaÈii nu va opri acest proces." IDS_MSG_UNABLECHANGEPRIORITY "Nu se poate schimba prioritatea" IDS_MSG_WARNINGCHANGEPRIORITY "Schimbarea prioritÄÈii poate duce la efecte colaterale\nprecum instabilitatea sistemului.\nSigur doriÈi schimbarea prioritÄÈii procesului?" IDS_MSG_TRAYICONCPUUSAGE "Utilizare procesor: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "ÐÑÐ¸Ð±ÐºÐ° ÐÐµÐ½ÐµÐ´Ð¶ÐµÑÐ° Ð·Ð°Ð´Ð°Ñ" IDS_MSG_WARNINGTERMINATING "ÐÐÐÐÐÐÐÐ: ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð²Ð»ÐµÑÑ Ð½ÐµÑÑÑÐ¾Ð¹ÑÐ¸Ð²ÑÑ ÑÐ°Ð±Ð¾ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ Ð¸ Ð¿Ð¾ÑÐµÑÑ Ð´Ð°Ð½Ð½ÑÑ\nÐ¡Ð¾ÑÑÐ°Ð½Ð¸ÑÐµ Ð²Ð°Ð¶Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð¿ÐµÑÐµÐ´ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸ÐµÐ¼.\nÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ°?" IDS_MSG_UNABLETERMINATEPRO "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ Ð¿ÑÐ¾ÑÐµÑÑ" + IDS_MSG_CLOSESYSTEMPROCESS "ÐÑÐ¾ ÐºÑÐ¸ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð¿ÑÐ¾ÑÐµÑÑ. ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÐµÐ³Ð¾ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÑ." IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑ" IDS_MSG_WARNINGCHANGEPRIORITY "ÐÐÐÐÐÐÐÐ: ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ° ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑÐ° Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº Ð½ÐµÐ¶ÐµÐ»Ð°ÑÐµÐ»ÑÐ½ÑÐ¼ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐ°Ð¼, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ Ðº Ð½ÐµÑÑÐ°Ð±Ð¸Ð»ÑÐ½Ð¾Ð¹ ÑÐ°Ð±Ð¾ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.\nÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÐºÐ»Ð°ÑÑ Ð¿ÑÐ¸Ð¾ÑÐ¸ÑÐµÑÐ°?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¦Ð: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Upozornenie SprÃ¡vcu Ãºloh" IDS_MSG_WARNINGTERMINATING "UPOZORNENIE: UkonÄenie procesu mÃ´Å¾e maÅ¥ neÅ¾iadÃºce\ndÃ´sledky vrÃ¡tane nestability systÃ©mu.\nStav alebo Ãºdaje o procese sa nebudÃº daÅ¥\npred ukonÄenÃm uloÅ¾iÅ¥.\nNaozaj chcete proces ukonÄiÅ¥?" IDS_MSG_UNABLETERMINATEPRO "Proces sa nedÃ¡ ukonÄiÅ¥." + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Priorita sa nedÃ¡ zmeniÅ¥." IDS_MSG_WARNINGCHANGEPRIORITY "UPOZORNENIE: Zmena triedy priority procesu mÃ´Å¾e maÅ¥\nneÅ¾iadÃºce dÃ´sledky vrÃ¡tane nestability systÃ©mu.\nNaozaj chcete zmeniÅ¥ triedu priority procesu?" IDS_MSG_TRAYICONCPUUSAGE "VyuÅ¾itie procesora: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sq-AL.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Paralajmerim i Task Manager" IDS_MSG_WARNINGTERMINATING "KUJDES: Nderprerja e nje procesi mund te japi rezultat te pa \ndeshiruar perfshirje ne humbjen e informacioneve the paqendrueshmeri te sistemit.\nProcesi nuk ju jep shansin per te ruajtur gjendjen apo\ninformacionet perpara se te nderprehet. Jeni i sigurt qe doni te\nnderpreni procesin?" IDS_MSG_UNABLETERMINATEPRO "E pamundur nderprerja e procesit" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "E pamundur ndryshimi i prioritetit" IDS_MSG_WARNINGCHANGEPRIORITY "KUJDES: Ndryshimi i klases se prioritetit te ketij procesi mund te \nsjell rrezultate te padeshirushme ne stabilitetin e sistemit. Jeni i sigurt\nper ndryshimin e klases se prioriteteve?" IDS_MSG_TRAYICONCPUUSAGE "Perdorimi i CPU: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -434,6 +434,7 @@ IDS_MSG_TASKMGRWARNING "Aktivitetshanteraren varning" IDS_MSG_WARNINGTERMINATING "VARNING: Ett avslutande av en process kan orsaka\noÃ¶nskade effekter och pÃ¥verka systemets stabilitet. Processen\nkommer inte att ges chans att spara sitt arbete innan\nden avslutas. Ãr du sÃ¤ker pÃ¥ att du vill avsluta processen?" IDS_MSG_UNABLETERMINATEPRO "Kunde inte avsluta processen" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Kunde inte Ã¤ndra prioritet" IDS_MSG_WARNINGCHANGEPRIORITY "VARNING: Ãndring av prioritetsklassen hos den hÃ¤r processen kan\norsaka oÃ¶nskade effekter och pÃ¥verka systemets stabilitet. Ãr du\nsÃ¤ker pÃ¥ att du vill Ã¤ndra prioritetsklassen?" IDS_MSG_TRAYICONCPUUSAGE "ProcessoranvÃ¤ndning: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "GÃ¶rev YÃ¶neticisi UyarÄ±sÄ±" IDS_MSG_WARNINGTERMINATING "UYARI: Bir iÅlemin sonlandÄ±rÄ±lmasÄ±, veri\nyitimi ve dizge kararsÄ±zlÄ±ÄÄ±nÄ± iÃ§eren istenmeyen sonuÃ§lara neden\nolabilir. Ä°Ålem sonlandÄ±rÄ±lmadan Ã¶nce durumunu veyÃ¢ verisini\nsaklama fÄ±rsatÄ± verilmeyecektir. Ä°Ålemi\nsonlandÄ±rmak istediÄinizden emin misiniz?" IDS_MSG_UNABLETERMINATEPRO "Ä°Ålem SonlandÄ±rmanÄ±n YapÄ±lamamasÄ±" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "ÃnceliÄin DeÄiÅtirilememesi" IDS_MSG_WARNINGCHANGEPRIORITY "UYARI: Bu iÅlemin Ã¶ncelik sÄ±nÄ±fÄ±nÄ±n deÄiÅtirilmesi, dizge\nkararsÄ±zlÄ±ÄÄ±nÄ± iÃ§eren istenmeyen sonuÃ§lara neden olabilir. Ãncelik \nsÄ±nÄ±fÄ±nÄ± deÄiÅtirmek istediÄinizden emin misiniz?" IDS_MSG_TRAYICONCPUUSAGE "CPU KullanÄ±mÄ±: %%%d" Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -432,6 +432,7 @@ IDS_MSG_TASKMGRWARNING "ÐÐ¾Ð¿ÐµÑÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑÐ° Ð·Ð°Ð²Ð´Ð°Ð½Ñ" IDS_MSG_WARNINGTERMINATING "Ð£ÐÐÐÐ! ÐÑÐ¸Ð¿Ð¸Ð½ÐµÐ½Ð½Ñ Ð¿ÑÐ¾ÑÐµÑÑ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸Ð·Ð²ÐµÑÑÐ¸ Ð´Ð¾ \nÐ½ÐµÐ±Ð°Ð¶Ð°Ð½Ð¸Ñ Ð½Ð°ÑÐ»ÑÐ´ÐºÑÐ², Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸ Ð²ÑÑÐ°ÑÑ Ð´Ð°Ð½Ð¸Ñ Ñ \nÐ½ÐµÑÑÐ°Ð±ÑÐ»ÑÐ½Ñ ÑÐ¾Ð±Ð¾ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð¸. ÐÑÐ¾ÑÐµÑ Ð½Ðµ Ð·Ð¼Ð¾Ð¶Ðµ \nÐ·Ð±ÐµÑÐµÐ³ÑÐ¸ ÑÐ²ÑÐ¹ ÑÑÐ°Ð½ Ð°Ð±Ð¾ Ð´Ð°Ð½Ñ Ð¿ÐµÑÐµÐ´ Ð¿ÑÐ¸Ð¿Ð¸Ð½ÐµÐ½Ð½ÑÐ¼. \nÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð¿ÑÐ¸Ð¿Ð¸Ð½Ð¸ÑÐ¸ Ð¿ÑÐ¾ÑÐµÑ?" IDS_MSG_UNABLETERMINATEPRO "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐ¸ Ð¿ÑÐ¾ÑÐµÑ" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑ" IDS_MSG_WARNINGCHANGEPRIORITY "Ð£ÐÐÐÐ! ÐÐ¼ÑÐ½Ð° ÐºÐ»Ð°ÑÑ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐµÑÑ Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ¸Ð·Ð²ÐµÑÑÐ¸ Ð´Ð¾ \nÐ½ÐµÐ±Ð°Ð¶Ð°Ð½Ð¸Ñ Ð½Ð°ÑÐ»ÑÐ´ÐºÑÐ², Ð²ÐºÐ»ÑÑÐ°ÑÑÐ¸ Ð½ÐµÑÑÐ°Ð±ÑÐ»ÑÐ½Ñ ÑÐ¾Ð±Ð¾ÑÑ \nÑÐ¸ÑÑÐµÐ¼Ð¸. ÐÐ¸ Ð´ÑÐ¹ÑÐ½Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð·Ð¼ÑÐ½Ð¸ÑÐ¸ Ð¿ÑÑÐ¾ÑÐ¸ÑÐµÑ ÐºÐ»Ð°ÑÑ?" IDS_MSG_TRAYICONCPUUSAGE "ÐÐ¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð½Ñ Ð¦Ð: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -438,6 +438,7 @@ IDS_MSG_TASKMGRWARNING "Task Manager Warning" IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨æåµ: %d%%" Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -440,6 +440,7 @@ IDS_MSG_TASKMGRWARNING "å·¥ä½ç®¡çå¡è¦å" IDS_MSG_WARNINGTERMINATING "è¦å: çµæç¨åºå¯è½å°æ¿è³æéºå¤±æç³»çµ±ä¸ç©©å®ã\nç¨åºå¨çµææå°ä¸è½å²åä»»ä½è³æã\nä½ æ¯å¦ç¢ºå®è¦ç¹¼çºï¼" IDS_MSG_UNABLETERMINATEPRO "ç¡æ³çµæèçç¨åº" + IDS_MSG_CLOSESYSTEMPROCESS "This is a critical system process. Task Manager will not end this process." IDS_MSG_UNABLECHANGEPRIORITY "ç¡æ³æ´æ¹åªåé åº" IDS_MSG_WARNINGCHANGEPRIORITY "è¦å: æ´æ¹æ¤ç¨åºçåªåé åºå¯è½å°è´ç³»çµ±ä¸ç©©å®ã\nä½ æ¯å¦ç¢ºå®è¦æ´æ¹åªåé åºï¼" IDS_MSG_TRAYICONCPUUSAGE "CPU ä½¿ç¨ææ³: %d%%" Modified: trunk/reactos/base/applications/taskmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/resource.h [iso-8859-1] Sat Dec 13 06:35:56 2014 @@ -249,6 +249,7 @@ #define IDS_MSG_UNABLECHANGEPRIORITY 360 #define IDS_MSG_WARNINGCHANGEPRIORITY 361 #define IDS_MSG_TRAYICONCPUUSAGE 362 +#define IDS_MSG_CLOSESYSTEMPROCESS 369 #define IDS_STATUS_MEMUSAGE 363 #define IDS_STATUS_CPUUSAGE 364

1 0

[zguo] 65623: [EVENTVWR] Display seconds for event time in event viewer. Patch by Lee Schroeder. CORE-8612
by zguo＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: zguo Date: Sat Dec 13 05:07:58 2014 New Revision: 65623 URL: http://svn.reactos.org/svn/reactos?rev=65623&view=rev Log: [EVENTVWR] Display seconds for event time in event viewer. Patch by Lee Schroeder. CORE-8612 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Dec 13 05:07:58 2014 @@ -646,7 +646,7 @@ GetEventUserName(pevlr, szUsername); GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &time, NULL, szLocalTime, MAX_PATH); GetEventType(pevlr->EventType, szEventTypeText); GetEventCategory(lpLogName, lpSourceName, pevlr, szCategory);

1 0

[jimtabor] 65622: [User32] - Patch by Vincent Povirk : Allow EndMenu() calls from WM_ENTERMENULOOP. - Patch by Akihiro Sagawa : Don't close a popup menu when clicking a sub-menu parent item twice. ...
by jimtabor＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: jimtabor Date: Sat Dec 13 01:18:35 2014 New Revision: 65622 URL: http://svn.reactos.org/svn/reactos?rev=65622&view=rev Log: [User32] - Patch by Vincent Povirk : Allow EndMenu() calls from WM_ENTERMENULOOP. - Patch by Akihiro Sagawa : Don't close a popup menu when clicking a sub-menu parent item twice. - Move code to match wines. See CORE-8299. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Dec 13 01:18:35 2014 @@ -668,10 +668,10 @@ MenuLoadBitmaps(VOID) { /* Load system buttons bitmaps */ - if (NULL == BmpSysMenu) - { + if (BmpSysMenu == NULL) + { BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE)); - } + } } /////////// Make gpsi OBMI via callback ////////////// /*********************************************************************** @@ -1261,7 +1261,7 @@ //ERR("MGMaxPH cyMax %d\n",lppop->cyMax); return lppop->cyMax; } - //ERR("MGMaxPH SyMax %d\n",GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER)); + //ERR("MGMaxPH SyMax %d\n",GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER)); return GetSystemMetrics(SM_CYSCREEN) - GetSystemMetrics(SM_CYBORDER); } @@ -2191,12 +2191,14 @@ lppop->iTop = item->Rect.bottom - nMaxHeight; ScrollWindow(lppop->Wnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); + //ERR("Scroll Down iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } else if (item->Rect.top - MENU_TOP_MARGIN < lppop->iTop) { lppop->iTop = item->Rect.top - MENU_TOP_MARGIN; ScrollWindow(lppop->Wnd, 0, nOldPos - lppop->iTop, &rc, &rc); MENU_DrawScrollArrows(lppop, hdc); + //ERR("Scroll Up iTop %d iMaxTop %d nMaxHeight %d\n",lppop->iTop,lppop->iMaxTop,nMaxHeight); } MenuSetRosMenuInfo(lppop); } @@ -3015,27 +3017,27 @@ * Helper function for menu navigation routines. */ static void FASTCALL -MenuSwitchTracking(MTRACKER* Mt, PROSMENUINFO PtMenuInfo, UINT Index, UINT wFlags) +MenuSwitchTracking(MTRACKER* pmt, PROSMENUINFO PtMenuInfo, UINT Index, UINT wFlags) { ROSMENUINFO TopMenuInfo; - TRACE("%x menu=%x 0x%04x\n", Mt, PtMenuInfo->Self, Index); - - if ( MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu) && - Mt->TopMenu != PtMenuInfo->Self && + TRACE("%x menu=%x 0x%04x\n", pmt, PtMenuInfo->Self, Index); + + if ( MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu) && + pmt->TopMenu != PtMenuInfo->Self && !((PtMenuInfo->fFlags | TopMenuInfo.fFlags) & MNF_POPUP) ) { /* both are top level menus (system and menu-bar) */ - MenuHideSubPopups(Mt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, NULL); - Mt->TopMenu = PtMenuInfo->Self; + MenuHideSubPopups(pmt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, NULL); + pmt->TopMenu = PtMenuInfo->Self; } else { - MenuHideSubPopups(Mt->OwnerWnd, PtMenuInfo, FALSE, wFlags); - } - - MenuSelectItem(Mt->OwnerWnd, PtMenuInfo, Index, TRUE, NULL); + MenuHideSubPopups(pmt->OwnerWnd, PtMenuInfo, FALSE, wFlags); + } + + MenuSelectItem(pmt->OwnerWnd, PtMenuInfo, Index, TRUE, NULL); } /*********************************************************************** @@ -3049,12 +3051,12 @@ * */ static INT FASTCALL -MenuExecFocusedItem(MTRACKER *Mt, PROSMENUINFO MenuInfo, UINT Flags) +MenuExecFocusedItem(MTRACKER *pmt, PROSMENUINFO MenuInfo, UINT Flags) { ROSMENUITEMINFO ItemInfo; UINT wID; - TRACE("%p menu=%p\n", Mt, MenuInfo); + TRACE("%p menu=%p\n", pmt, MenuInfo); if (0 == MenuInfo->cItems || NO_SELECTED_ITEM == MenuInfo->iItem) { @@ -3081,19 +3083,19 @@ { if (0 != (MenuInfo->fFlags & MNF_SYSMENU)) { - PostMessageW(Mt->OwnerWnd, WM_SYSCOMMAND, ItemInfo.wID, - MAKELPARAM((SHORT) Mt->Pt.x, (SHORT) Mt->Pt.y)); + PostMessageW(pmt->OwnerWnd, WM_SYSCOMMAND, ItemInfo.wID, + MAKELPARAM((SHORT) pmt->Pt.x, (SHORT) pmt->Pt.y)); } else { ROSMENUINFO topmenuI; - BOOL ret = MenuGetRosMenuInfo(&topmenuI, Mt->TopMenu); + BOOL ret = MenuGetRosMenuInfo(&topmenuI, pmt->TopMenu); DWORD dwStyle = MenuInfo->dwStyle | (ret ? topmenuI.dwStyle : 0); if (dwStyle & MNS_NOTIFYBYPOS) - PostMessageW(Mt->OwnerWnd, WM_MENUCOMMAND, MenuInfo->iItem, (LPARAM)MenuInfo->Self); + PostMessageW(pmt->OwnerWnd, WM_MENUCOMMAND, MenuInfo->iItem, (LPARAM)MenuInfo->Self); else - PostMessageW(Mt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); + PostMessageW(pmt->OwnerWnd, WM_COMMAND, ItemInfo.wID, 0); } } wID = ItemInfo.wID; @@ -3103,7 +3105,7 @@ } else { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, MenuInfo, TRUE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, MenuInfo, TRUE, Flags); return -2; } @@ -3116,17 +3118,17 @@ * Return TRUE if we can go on with menu tracking. */ static BOOL FASTCALL -MENU_ButtonDown(MTRACKER* Mt, HMENU PtMenu, UINT Flags) +MENU_ButtonDown(MTRACKER* pmt, HMENU hPtMenu, UINT Flags) { int Index; ROSMENUINFO MenuInfo; ROSMENUITEMINFO Item; - TRACE("%x PtMenu=%p\n", Mt, PtMenu); - - if (NULL != PtMenu) - { - if (! MenuGetRosMenuInfo(&MenuInfo, PtMenu)) + TRACE("%x PtMenu=%p\n", pmt, hPtMenu); + + if (NULL != hPtMenu) + { + if (! MenuGetRosMenuInfo(&MenuInfo, hPtMenu)) { return FALSE; } @@ -3136,10 +3138,10 @@ } else { - Index = NtUserMenuItemFromPoint(Mt->OwnerWnd, PtMenu, Mt->Pt.x, Mt->Pt.y); + Index = NtUserMenuItemFromPoint(pmt->OwnerWnd, hPtMenu, pmt->Pt.x, pmt->Pt.y); } MenuInitRosMenuItemInfo(&Item); - if (NO_SELECTED_ITEM == Index || ! MenuGetRosMenuItemInfo(PtMenu, Index, &Item)) + if (NO_SELECTED_ITEM == Index || ! MenuGetRosMenuItemInfo(hPtMenu, Index, &Item)) { MenuCleanupRosMenuItemInfo(&Item); return FALSE; @@ -3150,23 +3152,21 @@ { if (MenuInfo.iItem != Index) { - MenuSwitchTracking(Mt, &MenuInfo, Index, Flags); + MenuSwitchTracking(pmt, &MenuInfo, Index, Flags); } /* If the popup menu is not already "popped" */ - if (0 == (Item.fState & MF_MOUSESELECT)) + if (!(Item.fState & MF_MOUSESELECT)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); } + + MenuCleanupRosMenuItemInfo(&Item); + + return TRUE; } - - MenuCleanupRosMenuItemInfo(&Item); - - return TRUE; - } - - /* else the click was on the menu bar, finish the tracking */ - + /* Else the click was on the menu bar, finish the tracking */ + } return FALSE; } @@ -3179,25 +3179,25 @@ * */ static INT FASTCALL -MENU_ButtonUp(MTRACKER *Mt, HMENU PtMenu, UINT Flags) +MENU_ButtonUp(MTRACKER *pmt, HMENU hPtMenu, UINT Flags) { INT Id; ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; - TRACE("%p hmenu=%x\n", Mt, PtMenu); - - if (NULL != PtMenu) + TRACE("%p hmenu=%x\n", pmt, hPtMenu); + + if (hPtMenu) { Id = 0; - if (! MenuGetRosMenuInfo(&MenuInfo, PtMenu)) + if (! MenuGetRosMenuInfo(&MenuInfo, hPtMenu)) { return -1; } if (! IS_SYSTEM_MENU(&MenuInfo)) { - Id = NtUserMenuItemFromPoint(Mt->OwnerWnd, MenuInfo.Self, Mt->Pt.x, Mt->Pt.y); + Id = NtUserMenuItemFromPoint(pmt->OwnerWnd, MenuInfo.Self, pmt->Pt.x, pmt->Pt.y); } MenuInitRosMenuItemInfo(&ItemInfo); if (0 <= Id && MenuGetRosMenuItemInfo(MenuInfo.Self, Id, &ItemInfo) && @@ -3205,26 +3205,29 @@ { if (0 == (ItemInfo.hSubMenu)) { - INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags); + INT ExecutedMenuId = MenuExecFocusedItem( pmt, &MenuInfo, Flags); MenuCleanupRosMenuItemInfo(&ItemInfo); - return (ExecutedMenuId < 0) ? -1 : ExecutedMenuId; + if (ExecutedMenuId == -1 || ExecutedMenuId == -2) return -1; + return ExecutedMenuId; } MenuCleanupRosMenuItemInfo(&ItemInfo); - /* If we are dealing with the top-level menu */ + /* If we are dealing with the menu bar */ /* and this is a click on an already "popped" item: */ /* Stop the menu tracking and close the opened submenus */ - if (Mt->TopMenu == MenuInfo.Self && MenuInfo.TimeToHide) + if (pmt->TopMenu == MenuInfo.Self && MenuInfo.TimeToHide) { MenuCleanupRosMenuItemInfo(&ItemInfo); return 0; } } MenuCleanupRosMenuItemInfo(&ItemInfo); - MenuInfo.TimeToHide = TRUE; - MenuSetRosMenuInfo(&MenuInfo); - } - + if( GetMenu(MenuInfo.Wnd) == hPtMenu ) + { + MenuInfo.TimeToHide = TRUE; + MenuSetRosMenuInfo(&MenuInfo); + } + } return -1; } @@ -3277,7 +3280,7 @@ * Return TRUE if we can go on with menu tracking. */ static BOOL FASTCALL -MenuMouseMove(MTRACKER *Mt, HMENU PtMenu, UINT Flags) +MenuMouseMove(MTRACKER *pmt, HMENU PtMenu, UINT Flags) { INT Index; ROSMENUINFO MenuInfo; @@ -3295,7 +3298,7 @@ } else { - Index = NtUserMenuItemFromPoint(Mt->OwnerWnd, PtMenu, Mt->Pt.x, Mt->Pt.y); + Index = NtUserMenuItemFromPoint(pmt->OwnerWnd, PtMenu, pmt->Pt.x, pmt->Pt.y); } } else @@ -3305,11 +3308,11 @@ if (NO_SELECTED_ITEM == Index) { - if (Mt->CurrentMenu == MenuInfo.Self || - MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if (pmt->CurrentMenu == MenuInfo.Self || + MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, - TRUE, Mt->TopMenu); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, NO_SELECTED_ITEM, + TRUE, pmt->TopMenu); } } else if (MenuInfo.iItem != Index) @@ -3318,9 +3321,9 @@ if (MenuGetRosMenuItemInfo(MenuInfo.Self, Index, &ItemInfo) && !(ItemInfo.fType & MF_SEPARATOR)) { - MenuSwitchTracking(Mt, &MenuInfo, Index, Flags); + MenuSwitchTracking(pmt, &MenuInfo, Index, Flags); if (!(ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED))) - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); } MenuCleanupRosMenuItemInfo(&ItemInfo); } @@ -3360,12 +3363,12 @@ * NOTE: WM_NEXTMENU documented in Win32 is a bit different. */ static LRESULT FASTCALL -MenuDoNextMenu(MTRACKER* Mt, UINT Vk, UINT wFlags) +MenuDoNextMenu(MTRACKER* pmt, UINT Vk, UINT wFlags) { ROSMENUINFO TopMenuInfo; ROSMENUINFO MenuInfo; - if (! MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + if (! MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { return (LRESULT) FALSE; } @@ -3378,18 +3381,18 @@ HWND NewWnd; UINT Id = 0; - NextMenu.hmenuIn = (IS_SYSTEM_MENU(&TopMenuInfo)) ? GetSubMenu(Mt->TopMenu, 0) : Mt->TopMenu; + NextMenu.hmenuIn = (IS_SYSTEM_MENU(&TopMenuInfo)) ? GetSubMenu(pmt->TopMenu, 0) : pmt->TopMenu; NextMenu.hmenuNext = NULL; NextMenu.hwndNext = NULL; - SendMessageW(Mt->OwnerWnd, WM_NEXTMENU, Vk, (LPARAM) &NextMenu); + SendMessageW(pmt->OwnerWnd, WM_NEXTMENU, Vk, (LPARAM) &NextMenu); TRACE("%p [%p] -> %p [%p]\n", - Mt->CurrentMenu, Mt->OwnerWnd, NextMenu.hmenuNext, NextMenu.hwndNext ); + pmt->CurrentMenu, pmt->OwnerWnd, NextMenu.hmenuNext, NextMenu.hwndNext ); if (NULL == NextMenu.hmenuNext || NULL == NextMenu.hwndNext) { - DWORD Style = GetWindowLongPtrW(Mt->OwnerWnd, GWL_STYLE); - NewWnd = Mt->OwnerWnd; + DWORD Style = GetWindowLongPtrW(pmt->OwnerWnd, GWL_STYLE); + NewWnd = pmt->OwnerWnd; if (IS_SYSTEM_MENU(&TopMenuInfo)) { /* switch to the menu bar */ @@ -3449,27 +3452,27 @@ } } - if (NewMenu != Mt->TopMenu) + if (NewMenu != pmt->TopMenu) { - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, NO_SELECTED_ITEM, FALSE, 0 ); - if (Mt->CurrentMenu != Mt->TopMenu) + if (pmt->CurrentMenu != pmt->TopMenu) { - MenuHideSubPopups(Mt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); + MenuHideSubPopups(pmt->OwnerWnd, &TopMenuInfo, FALSE, wFlags); } } - if (NewWnd != Mt->OwnerWnd) + if (NewWnd != pmt->OwnerWnd) { - Mt->OwnerWnd = NewWnd; - NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd); // 1 - SetCapture(Mt->OwnerWnd); // 2 + pmt->OwnerWnd = NewWnd; + NtUserxSetGUIThreadHandle(MSQ_STATE_MENUOWNER, pmt->OwnerWnd); // 1 + SetCapture(pmt->OwnerWnd); // 2 } - Mt->TopMenu = Mt->CurrentMenu = NewMenu; /* all subpopups are hidden */ - if (MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + pmt->TopMenu = pmt->CurrentMenu = NewMenu; /* all subpopups are hidden */ + if (MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { - MenuSelectItem(Mt->OwnerWnd, &TopMenuInfo, Id, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &TopMenuInfo, Id, TRUE, 0); } return TRUE; @@ -3485,14 +3488,14 @@ * going to hide it anyway. */ static BOOL FASTCALL -MenuSuspendPopup(MTRACKER* Mt, UINT uMsg) +MenuSuspendPopup(MTRACKER* pmt, UINT uMsg) { MSG msg; - msg.hwnd = Mt->OwnerWnd; + msg.hwnd = pmt->OwnerWnd; PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); // ported incorrectly since 8317 GvG - //Mt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop with arrow keys!!!! + //pmt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop with arrow keys!!!! switch( uMsg ) { @@ -3505,14 +3508,14 @@ if( msg.message == WM_KEYDOWN && (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT)) { - Mt->TrackFlags |= TF_SUSPENDPOPUP; + pmt->TrackFlags |= TF_SUSPENDPOPUP; return TRUE; } } break; } /* failures go through this */ - Mt->TrackFlags &= ~TF_SUSPENDPOPUP; + pmt->TrackFlags &= ~TF_SUSPENDPOPUP; return FALSE; } @@ -3522,21 +3525,21 @@ * Handle a VK_ESCAPE key event in a menu. */ static BOOL FASTCALL -MenuKeyEscape(MTRACKER *Mt, UINT Flags) +MenuKeyEscape(MTRACKER *pmt, UINT Flags) { BOOL EndMenu = TRUE; ROSMENUINFO MenuInfo; HMENU MenuTmp, MenuPrev; - if (Mt->CurrentMenu != Mt->TopMenu) - { - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu) + if (pmt->CurrentMenu != pmt->TopMenu) + { + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu) && 0 != (MenuInfo.fFlags & MNF_POPUP)) { - MenuPrev = MenuTmp = Mt->TopMenu; + MenuPrev = MenuTmp = pmt->TopMenu; /* close topmost popup */ - while (MenuTmp != Mt->CurrentMenu) + while (MenuTmp != pmt->CurrentMenu) { MenuPrev = MenuTmp; MenuTmp = MENU_GetSubPopup(MenuPrev); @@ -3544,9 +3547,9 @@ if (MenuGetRosMenuInfo(&MenuInfo, MenuPrev)) { - MenuHideSubPopups(Mt->OwnerWnd, &MenuInfo, TRUE, Flags); + MenuHideSubPopups(pmt->OwnerWnd, &MenuInfo, TRUE, Flags); } - Mt->CurrentMenu = MenuPrev; + pmt->CurrentMenu = MenuPrev; EndMenu = FALSE; } } @@ -3560,7 +3563,7 @@ * Handle a VK_LEFT key event in a menu. */ static void FASTCALL -MenuKeyLeft(MTRACKER* Mt, UINT Flags) +MenuKeyLeft(MTRACKER* pmt, UINT Flags) { ROSMENUINFO MenuInfo; ROSMENUINFO TopMenuInfo; @@ -3568,20 +3571,20 @@ HMENU MenuTmp, MenuPrev; UINT PrevCol; - MenuPrev = MenuTmp = Mt->TopMenu; + MenuPrev = MenuTmp = pmt->TopMenu; /* Try to move 1 column left (if possible) */ - if ( (PrevCol = MENU_GetStartOfPrevColumn(Mt->CurrentMenu)) != NO_SELECTED_ITEM) - { - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if ( (PrevCol = MENU_GetStartOfPrevColumn(pmt->CurrentMenu)) != NO_SELECTED_ITEM) + { + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0); } return; } /* close topmost popup */ - while (MenuTmp != Mt->CurrentMenu) + while (MenuTmp != pmt->CurrentMenu) { MenuPrev = MenuTmp; MenuTmp = MENU_GetSubPopup(MenuPrev); @@ -3591,31 +3594,31 @@ { return; } - MenuHideSubPopups(Mt->OwnerWnd, &PrevMenuInfo, TRUE, Flags); - Mt->CurrentMenu = MenuPrev; - - if (! MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + MenuHideSubPopups(pmt->OwnerWnd, &PrevMenuInfo, TRUE, Flags); + pmt->CurrentMenu = MenuPrev; + + if (! MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { return; } - if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.fFlags & MNF_POPUP)) + if ((MenuPrev == pmt->TopMenu) && !(TopMenuInfo.fFlags & MNF_POPUP)) { /* move menu bar selection if no more popups are left */ - if (!MenuDoNextMenu(Mt, VK_LEFT, Flags)) + if (!MenuDoNextMenu(pmt, VK_LEFT, Flags)) { - MenuMoveSelection(Mt->OwnerWnd, &TopMenuInfo, ITEM_PREV); + MenuMoveSelection(pmt->OwnerWnd, &TopMenuInfo, ITEM_PREV); } - if (MenuPrev != MenuTmp || Mt->TrackFlags & TF_SUSPENDPOPUP) + if (MenuPrev != MenuTmp || pmt->TrackFlags & TF_SUSPENDPOPUP) { /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if (! MenuSuspendPopup(Mt, WM_KEYDOWN) - && MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu)) + if (! MenuSuspendPopup(pmt, WM_KEYDOWN) + && MenuGetRosMenuInfo(&TopMenuInfo, pmt->TopMenu)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &TopMenuInfo, + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &TopMenuInfo, TRUE, Flags); } } @@ -3627,7 +3630,7 @@ * * Handle a VK_RIGHT key event in a menu. */ -static void FASTCALL MenuKeyRight(MTRACKER *Mt, UINT Flags) +static void FASTCALL MenuKeyRight(MTRACKER *pmt, UINT Flags) { HMENU hmenutmp; ROSMENUINFO MenuInfo; @@ -3635,40 +3638,40 @@ UINT NextCol; TRACE("MenuKeyRight called, cur %p, top %p.\n", - Mt->CurrentMenu, Mt->TopMenu); - - if (! MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) return; - if ((MenuInfo.fFlags & MNF_POPUP) || (Mt->CurrentMenu != Mt->TopMenu)) + pmt->CurrentMenu, pmt->TopMenu); + + if (! MenuGetRosMenuInfo(&MenuInfo, pmt->TopMenu)) return; + if ((MenuInfo.fFlags & MNF_POPUP) || (pmt->CurrentMenu != pmt->TopMenu)) { /* If already displaying a popup, try to display sub-popup */ - hmenutmp = Mt->CurrentMenu; - if (MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu)) - { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &CurrentMenuInfo, TRUE, Flags); + hmenutmp = pmt->CurrentMenu; + if (MenuGetRosMenuInfo(&CurrentMenuInfo, pmt->CurrentMenu)) + { + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &CurrentMenuInfo, TRUE, Flags); } /* if subpopup was displayed then we are done */ - if (hmenutmp != Mt->CurrentMenu) return; + if (hmenutmp != pmt->CurrentMenu) return; } /* Check to see if there's another column */ - if ( (NextCol = MENU_GetStartOfNextColumn(Mt->CurrentMenu)) != NO_SELECTED_ITEM) + if ( (NextCol = MENU_GetStartOfNextColumn(pmt->CurrentMenu)) != NO_SELECTED_ITEM) { TRACE("Going to %d.\n", NextCol); - if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu)) + if (MenuGetRosMenuInfo(&MenuInfo, pmt->CurrentMenu)) { - MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0); + MenuSelectItem(pmt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0); } return; } if (!(MenuInfo.fFlags & MNF_POPUP)) /* menu bar tracking */ { - if (Mt->CurrentMenu != Mt->TopMenu) + if (pmt->CurrentMenu != pmt->TopMenu) { - MenuHideSubPopups(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); - hmenutmp = Mt->CurrentMenu = Mt->TopMenu; + MenuHideSubPopups(pmt->OwnerWnd, &MenuInfo, FALSE, Flags); + hmenutmp = pmt->CurrentMenu = pmt->TopMenu; } else { @@ -3676,15 +3679,15 @@ } /* try to move to the next item */ - if ( !MenuDoNextMenu(Mt, VK_RIGHT, Flags)) - MenuMoveSelection(Mt->OwnerWnd, &MenuInfo, ITEM_NEXT); - - if ( hmenutmp || Mt->TrackFlags & TF_SUSPENDPOPUP ) + if ( !MenuDoNextMenu(pmt, VK_RIGHT, Flags)) + MenuMoveSelection(pmt->OwnerWnd, &MenuInfo, ITEM_NEXT); + + if ( hmenutmp || pmt->TrackFlags & TF_SUSPENDPOPUP ) { - if (! MenuSuspendPopup(Mt, WM_KEYDOWN) - && MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu)) + if (! MenuSuspendPopup(pmt, WM_KEYDOWN) + && MenuGetRosMenuInfo(&MenuInfo, pmt->TopMenu)) { - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, + pmt->CurrentMenu = MenuShowSubPopup(pmt->OwnerWnd, &MenuInfo, TRUE, Flags); } } @@ -4051,13 +4054,15 @@ TRACE("hwnd=%p hmenu=%p\n", hWnd, hMenu); + if (!MenuGetRosMenuInfo(&MenuInfo, hMenu)) return FALSE; + HideCaret(0); /* This makes the menus of applications built with Delphi work. * It also enables menus to be displayed in more than one window, * but there are some bugs left that need to be fixed in this case. */ - if (!bPopup && (MenuGetRosMenuInfo(&MenuInfo, hMenu))) + if (!bPopup) { MenuInfo.Wnd = hWnd; MenuSetRosMenuInfo(&MenuInfo); @@ -4393,6 +4398,12 @@ /* Other menu items having MFS_DEFAULT are not converted to normal items */ pmii_out->fState = pmii_in->fState & MENUITEMINFO_STATE_MASK; + + if (pmii_out->fMask & MIIM_SUBMENU) + { + if ((pmii_out->hSubMenu != NULL) && !IsMenu(pmii_out->hSubMenu)) + return FALSE; + } return TRUE; }

1 0

[zguo] 65621: [DESK.CPL] Modify font enumeration code to deal with failure to read the registry key. Also change the registry key being queried to match the one used on Windows. Patch by Ricardo Ha...
by zguo＠svn.reactos.org 12 Dec '14

12 Dec '14

Author: zguo Date: Fri Dec 12 22:07:29 2014 New Revision: 65621 URL: http://svn.reactos.org/svn/reactos?rev=65621&view=rev Log: [DESK.CPL] Modify font enumeration code to deal with failure to read the registry key. Also change the registry key being queried to match the one used on Windows. Patch by Ricardo Hanke. CORE-8203 Modified: trunk/reactos/dll/cpl/desk/general.c Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Fri Dec 12 22:07:29 2014 @@ -26,8 +26,21 @@ { if (SetupFindFirstLine(hInf, _T("Font Sizes"), NULL, &Context)) { - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontDPI"), + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts"), 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + dwSize = MAX_PATH; + dwType = REG_DWORD; + + if (!RegQueryValueEx(hKey, _T("LogPixels"), NULL, + &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + { + dwValue = 0; + } + + RegCloseKey(hKey); + } + for (;;) { TCHAR Buffer[LINE_LEN]; @@ -41,23 +54,17 @@ if (i != CB_ERR) SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); - dwSize = MAX_PATH; - dwType = REG_DWORD; - - if (RegQueryValueEx(hKey, _T("LogPixels"), NULL, - &dwType, (LPBYTE)&dwValue, &dwSize) == ERROR_SUCCESS) + if ((int)dwValue == ci) { - if ((int)dwValue == ci) - { - SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); - SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); - } + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); } + else + SendMessage(hFontSize, CB_SETCURSEL, 0, 0); } if (!SetupFindNextLine(&Context, &Context)) { - RegCloseKey(hKey); break; } }

1 0

[zguo] 65620: [SHIMGV] Fix display window calculation. Patch by Ricardo Hanke. CORE-7656
by zguo＠svn.reactos.org 12 Dec '14

12 Dec '14

Author: zguo Date: Fri Dec 12 21:15:17 2014 New Revision: 65620 URL: http://svn.reactos.org/svn/reactos?rev=65620&view=rev Log: [SHIMGV] Fix display window calculation. Patch by Ricardo Hanke. CORE-7656 Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Fri Dec 12 21:15:17 2014 @@ -646,8 +646,8 @@ { RECT rc; SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); - SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&rc); - MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-rc.bottom, TRUE); + GetWindowRect(hToolBar, &rc); + MoveWindow(hDispWnd, 1, 1, LOWORD(lParam) - 1, HIWORD(lParam) - (rc.bottom - rc.top) - 1, TRUE); return 0L; } case WM_DESTROY:

1 0

[jimtabor] 65619: [Win32k] - Fix double click on application icons. See CORE-3269.
by jimtabor＠svn.reactos.org 12 Dec '14

12 Dec '14

Author: jimtabor Date: Fri Dec 12 20:28:20 2014 New Revision: 65619 URL: http://svn.reactos.org/svn/reactos?rev=65619&view=rev Log: [Win32k] - Fix double click on application icons. See CORE-3269. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Fri Dec 12 20:28:20 2014 @@ -1488,7 +1488,7 @@ if (hittest != HTCLIENT) { message += WM_NCMOUSEMOVE - WM_MOUSEMOVE; - msg->wParam = hittest; + msg->wParam = hittest; // Caution! This might break wParam check in DblClk. } else { @@ -1522,7 +1522,8 @@ { if ((msg->message == clk_msg.message) && (msg->hwnd == clk_msg.hwnd) && - (msg->wParam == clk_msg.wParam) && + // Only worry about XButton wParam. + (msg->message != WM_XBUTTONDOWN || GET_XBUTTON_WPARAM(msg->wParam) == GET_XBUTTON_WPARAM(clk_msg.wParam)) && ((msg->time - clk_msg.time) < (ULONG)gspv.iDblClickTime) && (abs(msg->pt.x - clk_msg.pt.x) < UserGetSystemMetrics(SM_CXDOUBLECLK)/2) && (abs(msg->pt.y - clk_msg.pt.y) < UserGetSystemMetrics(SM_CYDOUBLECLK)/2)) Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Fri Dec 12 20:28:20 2014 @@ -3830,6 +3830,7 @@ /* Else, end menu tracking */ fRemove = MENU_ButtonDown(&mt, hmenu, wFlags); fEndMenu = !fRemove; + if (msg.message == WM_LBUTTONDBLCLK) fEndMenu = TRUE; // Must exit or loop forever! break; case WM_RBUTTONUP:

1 0

[dquintana] 65618: [EXPLORER] * Followup to t65603. Fixes the start menu themeing regression (when running explorer in windows 2003). CORE-8898 #resolve
by dquintana＠svn.reactos.org 12 Dec '14

12 Dec '14

Author: dquintana Date: Fri Dec 12 16:28:46 2014 New Revision: 65618 URL: http://svn.reactos.org/svn/reactos?rev=65618&view=rev Log: [EXPLORER] * Followup to t65603. Fixes the start menu themeing regression (when running explorer in windows 2003). CORE-8898 #resolve Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Dec 12 16:28:46 2014 @@ -69,7 +69,6 @@ HIMAGELIST m_ImageList; SIZE m_Size; HFONT m_Font; - HBITMAP m_Bitmap; public: CStartButton(CMessageMap *pObject, DWORD dwMsgMapID) @@ -84,9 +83,6 @@ if (m_Font != NULL) DeleteObject(m_Font); - - if (m_Bitmap != NULL) - DeleteObject(m_Bitmap); } HFONT GetFont() @@ -99,26 +95,26 @@ return m_Size; } - VOID UpdateSize() + VOID UpdateSize(IN HBITMAP hbmStart = NULL) { SIZE Size = { 0, 0 }; if (m_ImageList == NULL || - !SendMessage(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) + !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { Size.cx = GetSystemMetrics(SM_CXEDGE); Size.cy = GetSystemMetrics(SM_CYEDGE); - if (m_Bitmap == NULL) - { - m_Bitmap = (HBITMAP) SendMessage(BM_GETIMAGE, IMAGE_BITMAP, 0); - } - - if (m_Bitmap != NULL) + if (hbmStart == NULL) + { + hbmStart = (HBITMAP) SendMessageW(BM_GETIMAGE, IMAGE_BITMAP, 0); + } + + if (hbmStart != NULL) { BITMAP bmp; - if (GetObject(m_Bitmap, sizeof(bmp), &bmp) != 0) + if (GetObject(hbmStart, sizeof(bmp), &bmp) != 0) { Size.cx += bmp.bmWidth; Size.cy += max(bmp.bmHeight, GetSystemMetrics(SM_CYCAPTION)); @@ -160,28 +156,27 @@ IconSize.cy, LR_SHARED | LR_DEFAULTCOLOR); - if (hIconStart != NULL) - { - m_ImageList = ImageList_Create(IconSize.cx, - IconSize.cy, - ILC_COLOR32 | ILC_MASK, - 1, - 1); - if (m_ImageList != NULL) - { - int s = ImageList_ReplaceIcon(m_ImageList, -1, hIconStart); - if (s >= 0) - { - return TRUE; - } - - /* Failed to add the icon! */ - ImageList_Destroy(m_ImageList); - m_ImageList = NULL; - } - } - - return FALSE; + if (hIconStart == NULL) + return FALSE; + + m_ImageList = ImageList_Create(IconSize.cx, + IconSize.cy, + ILC_COLOR32 | ILC_MASK, + 1, 1); + if (m_ImageList == NULL) + return FALSE; + + int s = ImageList_ReplaceIcon(m_ImageList, -1, hIconStart); + if (s < 0) + { + /* Failed to add the icon! */ + ImageList_Destroy(m_ImageList); + m_ImageList = NULL; + + return FALSE; + } + + return TRUE; } HBITMAP CreateBitmap() @@ -314,41 +309,43 @@ SendMessage(WM_SETFONT, (WPARAM) m_Font, FALSE); - BUTTON_IMAGELIST bil; - - /* Try to set the start button image. this requires the Common - Controls 6.0 to be present (XP and later) */ - bil.himl = m_ImageList; - bil.margin.left = bil.margin.right = 1; - bil.margin.top = bil.margin.bottom = 1; - bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - - if (SendMessage(BCM_SETIMAGELIST, 0, (LPARAM) &bil)) - { - /* We're using the image list, remove the BS_BITMAP style and - don't center it horizontally */ - SetWindowStyle(m_hWnd, BS_BITMAP | BS_RIGHT, 0); - } - else - { + if (CreateImageList()) + { + BUTTON_IMAGELIST bil; + + /* Try to set the start button image. this requires the Common + Controls 6.0 to be present (XP and later) */ + bil.himl = m_ImageList; + bil.margin.left = bil.margin.right = 1; + bil.margin.top = bil.margin.bottom = 1; + bil.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + + if (SendMessageW(BCM_SETIMAGELIST, 0, (LPARAM) &bil)) + { + /* We're using the image list, remove the BS_BITMAP style and + don't center it horizontally */ + SetWindowStyle(m_hWnd, BS_BITMAP | BS_RIGHT, 0); + + UpdateSize(); + return; + } + /* Fall back to the deprecated method on older systems that don't support Common Controls 6.0 */ ImageList_Destroy(m_ImageList); m_ImageList = NULL; - - HBITMAP hbmOld; - - m_Bitmap = CreateBitmap(); - if (m_Bitmap != NULL) - { - hbmOld = (HBITMAP) SendMessage(BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) m_Bitmap); - - if (hbmOld != NULL) - DeleteObject(hbmOld); - } - } - - UpdateSize(); + } + + HBITMAP hbmStart = CreateBitmap(); + if (hbmStart != NULL) + { + UpdateSize(hbmStart); + + HBITMAP hbmOld = (HBITMAP) SendMessageW(BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) hbmStart); + + if (hbmOld != NULL) + DeleteObject(hbmOld); + } } }; @@ -1538,8 +1535,7 @@ CheckTrayWndPosition(); /* Align all controls on the tray window */ - AlignControls( - NULL); + AlignControls(NULL); InitShellServices(&(m_ShellServices));

1 0

[akhaldi] 65617: [USER32] We're not using any debugging routines here.
by akhaldi＠svn.reactos.org 12 Dec '14

12 Dec '14

Author: akhaldi Date: Fri Dec 12 13:23:45 2014 New Revision: 65617 URL: http://svn.reactos.org/svn/reactos?rev=65617&view=rev Log: [USER32] We're not using any debugging routines here. Modified: trunk/reactos/win32ss/user/user32/misc/rtlstr.c Modified: trunk/reactos/win32ss/user/user32/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/r… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/rtlstr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/rtlstr.c [iso-8859-1] Fri Dec 12 13:23:45 2014 @@ -10,10 +10,6 @@ /* INCLUDES ******************************************************************/ #include <user32.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ VOID

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