Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[dreimer] 63967: [TASKMGR] German translation update. / Fix the "&" locations to follow the Windows XP GER way.
by dreimer＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: dreimer Date: Wed Aug 27 21:13:33 2014 New Revision: 63967 URL: http://svn.reactos.org/svn/reactos?rev=63967&view=rev Log: [TASKMGR] German translation update. / Fix the "&" locations to follow the Windows XP GER way. Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc 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] Wed Aug 27 21:13:33 2014 @@ -8,14 +8,14 @@ BEGIN MENUITEM "&Neuer Task (AusfÃ¼hren...)", ID_FILE_NEW MENUITEM SEPARATOR - MENUITEM "&Beenden", ID_FILE_EXIT + MENUITEM "&Beenden", ID_FILE_EXIT END POPUP "&Optionen" BEGIN MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP, CHECKED MENUITEM "&Nach Programmstart minimieren", ID_OPTIONS_MINIMIZEONUSE, CHECKED MENUITEM "&Ausblenden, wenn minimiert", ID_OPTIONS_HIDEWHENMINIMIZED, CHECKED - MENUITEM "&16-bit Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED + MENUITEM "&16-Bit-Tasks anzeigen", ID_OPTIONS_SHOW16BITTASKS, CHECKED END POPUP "&Ansicht" BEGIN @@ -39,7 +39,7 @@ END MENUITEM "K&ernel-Zeiten anzeigen", ID_VIEW_SHOWKERNELTIMES END - POPUP "F&enster" + POPUP "&Fenster" BEGIN MENUITEM "&Untereinander", ID_WINDOWS_TILEHORIZONTALLY MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY @@ -48,21 +48,21 @@ MENUITEM "Ãbe&rlappend", ID_WINDOWS_CASCADE MENUITEM "&In Vordergrund", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" - BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + POPUP "&Herunterfahren" + BEGIN + MENUITEM "&Standby", ID_SHUTDOWN_STANDBY + MENUITEM "&Ruhezustand", ID_SHUTDOWN_HIBERNATE + MENUITEM "&Ausschalten", ID_SHUTDOWN_POWEROFF + MENUITEM "&Neu starten", ID_SHUTDOWN_REBOOT + MENUITEM "%s ab&melden", ID_SHUTDOWN_LOGOFF + MENUITEM "&Benutzer wechseln\tWindows-Taste+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "&Computer sperren\tWindows-Taste+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Trennen", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "C&omputer abdocken", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&?" BEGIN - MENUITEM "&Hilfethemen", ID_HELP_TOPICS + MENUITEM "&Hilfethemen\tF1", ID_HELP_TOPICS MENUITEM SEPARATOR MENUITEM "Inf&o", ID_HELP_ABOUT END @@ -85,7 +85,7 @@ MENUITEM "&Neuer Task (AusfÃ¼hren...)", ID_FILE_NEW MENUITEM SEPARATOR MENUITEM "&GroÃe Symbole", ID_VIEW_LARGE - MENUITEM "K&leine Symbole", ID_VIEW_SMALL + MENUITEM "&Kleine Symbole", ID_VIEW_SMALL MENUITEM "&Details", ID_VIEW_DETAILS, CHECKED END END @@ -101,7 +101,7 @@ MENUITEM "&Nebeneinander", ID_WINDOWS_TILEVERTICALLY MENUITEM "&Minimieren", ID_WINDOWS_MINIMIZE MENUITEM "Ma&ximieren", ID_WINDOWS_MAXIMIZE - MENUITEM "Ãbe&rlappend", ID_WINDOWS_CASCADE + MENUITEM "Ã&berlappend", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "&Task beenden", ID_APPLICATION_PAGE_ENDTASK MENUITEM "&Zu Prozess wechseln", ID_APPLICATION_PAGE_GOTOPROCESS @@ -113,9 +113,9 @@ POPUP "DUMMY" BEGIN MENUITEM "&Wiederherstellen", ID_RESTORE - MENUITEM "&SchlieÃen", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "&Immer im Vordergrund", ID_OPTIONS_ALWAYSONTOP + MENUITEM "S&chlieÃen", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "Immer im &Vordergrund", ID_OPTIONS_ALWAYSONTOP END END @@ -127,7 +127,7 @@ MENUITEM "Pr&ozessstruktur beenden", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debuggen", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Pr&ioritÃ¤t festlegen" + POPUP "P&rioritÃ¤t festlegen" BEGIN MENUITEM "&Echtzeit", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&Hoch", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -399,9 +399,9 @@ IDS_TAB_PAGEFAULT "Seitenfehler" IDS_TAB_PFDELTA "Maximale Seitenfehler" IDS_TAB_VMSIZE "Virtuelle ArbeitsspeichergrÃ¶Ãe" - IDS_TAB_PAGEDPOOL "Paged Pool" - IDS_TAB_NPPOOL "NP Pool" - IDS_TAB_BASEPRI "Basispri" + IDS_TAB_PAGEDPOOL "Ausgelagerter Pool" + IDS_TAB_NPPOOL "Nichtausgelagerter Pool" + IDS_TAB_BASEPRI "BasisprioritÃ¤t" IDS_TAB_HANDLES "Handleanzahl" IDS_TAB_THREADS "Threadanzahl" IDS_TAB_USERPBJECTS "Benutzer-Objekte"

1 0

[spetreolle] 63966: strsafe.h++;
by spetreolle＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: spetreolle Date: Wed Aug 27 21:01:47 2014 New Revision: 63966 URL: http://svn.reactos.org/svn/reactos?rev=63966&view=rev Log: strsafe.h++; Modified: trunk/reactos/base/services/eventlog/eventlog.h Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Wed Aug 27 21:01:47 2014 @@ -18,6 +18,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/obfuncs.h> #include <eventlogrpc_s.h> +#include <strsafe.h> typedef struct _IO_ERROR_LPC {

1 0

[spetreolle] 63965: [EVENTLOG] Fix crash in LogfCreate when LogName is NULL. strsafe.h++;
by spetreolle＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: spetreolle Date: Wed Aug 27 20:59:27 2014 New Revision: 63965 URL: http://svn.reactos.org/svn/reactos?rev=63965&view=rev Log: [EVENTLOG] Fix crash in LogfCreate when LogName is NULL. strsafe.h++; Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Aug 27 20:59:27 2014 @@ -355,7 +355,8 @@ goto fail; } - lstrcpyW(pLogFile->LogName, LogName); + if(LogName) + StringCchCopy(pLogFile->LogName,lstrlenW(LogName) + 1, LogName); pLogFile->FileName = (WCHAR *) HeapAlloc(MyHeap, @@ -368,7 +369,7 @@ goto fail; } - lstrcpyW(pLogFile->FileName, FileName->Buffer); + StringCchCopy(pLogFile->FileName, lstrlenW(FileName->Buffer) + 1, FileName->Buffer); pLogFile->OffsetInfo = (PEVENT_OFFSET_INFO) HeapAlloc(MyHeap,

1 0

[spetreolle] 63964: Fix PCH=0 build.
by spetreolle＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: spetreolle Date: Wed Aug 27 20:32:13 2014 New Revision: 63964 URL: http://svn.reactos.org/svn/reactos?rev=63964&view=rev Log: Fix PCH=0 build. Modified: trunk/rostests/rosautotest/misc.cpp Modified: trunk/rostests/rosautotest/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/misc.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/misc.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/misc.cpp [iso-8859-1] Wed Aug 27 20:32:13 2014 @@ -6,7 +6,7 @@ * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) */ -//static +#include "precomp.h" HANDLE hLog = NULL; VOID

1 0

[spetreolle] 63963: [ROSAUTOTEST] Report the start and end of the tests in the Application event log. This gives data for the advapi32:eventlog tests.
by spetreolle＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: spetreolle Date: Wed Aug 27 20:19:43 2014 New Revision: 63963 URL: http://svn.reactos.org/svn/reactos?rev=63963&view=rev Log: [ROSAUTOTEST] Report the start and end of the tests in the Application event log. This gives data for the advapi32:eventlog tests. Added: trunk/rostests/rosautotest/misc.cpp (contents, props changed) - copied, changed from r63913, trunk/reactos/base/applications/rapps/misc.c trunk/rostests/rosautotest/rosautotest.rc (with props) trunk/rostests/rosautotest/rosautotestmsg.mc (with props) Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -15,14 +15,16 @@ CWebService.cpp CWineTest.cpp main.cpp + misc.cpp shutdown.cpp tools.cpp precomp.h) -add_executable(rosautotest ${SOURCE}) +add_executable(rosautotest ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/rosautotestmsg.rc) set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h SOURCE) - +add_message_headers(ANSI rosautotestmsg.mc) +add_dependencies(rosautotest rosautotestmsg) add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all) Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -61,6 +61,18 @@ ss << "\n\nSystem uptime " << setprecision(2) << fixed ; ss << ((float)GetTickCount()/1000) << " seconds\n"; StringOut(ss.str()); + + /* Report tests startup */ + InitLogs(); + ReportEventW(hLog, + EVENTLOG_INFORMATION_TYPE, + 0, + MSG_TESTS_STARTED, + NULL, + 0, + 0, + NULL, + NULL); /* Run the tests */ WineTest.Run(); @@ -94,6 +106,18 @@ if(ReturnValue == 1) DbgPrint("SYSREG_ROSAUTOTEST_FAILURE\n"); + /* Report successful end of tests */ + ReportEventW(hLog, + EVENTLOG_SUCCESS, + 0, + MSG_TESTS_SUCCESSFUL, + NULL, + 0, + 0, + NULL, + NULL); + FreeLogs(); + /* Shut down the system if requested, also in case of an exception above */ if(Configuration.DoShutdown() && !ShutdownSystem()) ReturnValue = 1; Copied: trunk/rostests/rosautotest/misc.cpp (from r63913, trunk/reactos/base/applications/rapps/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/misc.cpp?p2=t… ============================================================================== --- trunk/reactos/base/applications/rapps/misc.c [iso-8859-1] (original) +++ trunk/rostests/rosautotest/misc.cpp [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -1,305 +1,22 @@ /* - * PROJECT: ReactOS Applications Manager + * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/rapps/misc.c * PURPOSE: Misc functions * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) */ -#include "rapps.h" - -/* SESSION Operation */ -#define EXTRACT_FILLFILELIST 0x00000001 -#define EXTRACT_EXTRACTFILES 0x00000002 - -static HANDLE hLog = NULL; - -typedef struct -{ - int erfOper; - int erfType; - BOOL fError; -} ERF, *PERF; - -struct FILELIST -{ - LPSTR FileName; - struct FILELIST *next; - BOOL DoExtract; -}; - -typedef struct -{ - INT FileSize; - ERF Error; - struct FILELIST *FileList; - INT FileCount; - INT Operation; - CHAR Destination[MAX_PATH]; - CHAR CurrentFile[MAX_PATH]; - CHAR Reserved[MAX_PATH]; - struct FILELIST *FilterList; -} SESSION; - -HRESULT (WINAPI *pfnExtract)(SESSION *dest, LPCSTR szCabName); - - -INT -GetSystemColorDepth(VOID) -{ - DEVMODE pDevMode; - INT ColorDepth; - - pDevMode.dmSize = sizeof(DEVMODE); - pDevMode.dmDriverExtra = 0; - - if (!EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &pDevMode)) - { - /* TODO: Error message */ - return ILC_COLOR; - } - - switch (pDevMode.dmBitsPerPel) - { - case 32: ColorDepth = ILC_COLOR32; break; - case 24: ColorDepth = ILC_COLOR24; break; - case 16: ColorDepth = ILC_COLOR16; break; - case 8: ColorDepth = ILC_COLOR8; break; - case 4: ColorDepth = ILC_COLOR4; break; - default: ColorDepth = ILC_COLOR; break; - } - - return ColorDepth; -} - -int -GetWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -int -GetWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - -int -GetClientWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -int -GetClientWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - -VOID -CopyTextToClipboard(LPCWSTR lpszText) -{ - HRESULT hr; - - if (OpenClipboard(NULL)) - { - HGLOBAL ClipBuffer; - WCHAR *Buffer; - DWORD cchBuffer; - - EmptyClipboard(); - cchBuffer = wcslen(lpszText) + 1; - ClipBuffer = GlobalAlloc(GMEM_DDESHARE, cchBuffer * sizeof(WCHAR)); - Buffer = GlobalLock(ClipBuffer); - hr = StringCchCopyW(Buffer, cchBuffer, lpszText); - GlobalUnlock(ClipBuffer); - - if (SUCCEEDED(hr)) - SetClipboardData(CF_UNICODETEXT, ClipBuffer); - - CloseClipboard(); - } -} - -VOID -SetWelcomeText(VOID) -{ - WCHAR szText[MAX_STR_LEN*3]; - - LoadStringW(hInst, IDS_WELCOME_TITLE, szText, sizeof(szText) / sizeof(WCHAR)); - NewRichEditText(szText, CFE_BOLD); - - LoadStringW(hInst, IDS_WELCOME_TEXT, szText, sizeof(szText) / sizeof(WCHAR)); - InsertRichEditText(szText, 0); - - LoadStringW(hInst, IDS_WELCOME_URL, szText, sizeof(szText) / sizeof(WCHAR)); - InsertRichEditText(szText, CFM_LINK); -} - -VOID -ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) -{ - HMENU hMenu = NULL; - HMENU hPopupMenu; - MENUITEMINFO mii; - POINT pt; - - if (MenuID) - { - hMenu = LoadMenuW(hInst, MAKEINTRESOURCEW(MenuID)); - hPopupMenu = GetSubMenu(hMenu, 0); - } - else - hPopupMenu = GetMenu(hwnd); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - GetMenuItemInfo(hPopupMenu, DefaultItem, FALSE, &mii); - if (!(mii.fState & MFS_GRAYED)) - SetMenuDefaultItem(hPopupMenu, DefaultItem, FALSE); - - GetCursorPos(&pt); - - SetForegroundWindow(hwnd); - TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hMainWnd, NULL); - - if (hMenu) - DestroyMenu(hMenu); -} - -BOOL -StartProcess(LPWSTR lpPath, BOOL Wait) -{ - PROCESS_INFORMATION pi; - STARTUPINFOW si; - DWORD dwRet; - MSG msg; - - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); - si.dwFlags = STARTF_USESHOWWINDOW; - si.wShowWindow = SW_SHOW; - - if (!CreateProcessW(NULL, lpPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - { - return FALSE; - } - - CloseHandle(pi.hThread); - if (Wait) EnableWindow(hMainWnd, FALSE); - - while (Wait) - { - dwRet = MsgWaitForMultipleObjects(1, &pi.hProcess, FALSE, INFINITE, QS_ALLEVENTS); - if (dwRet == WAIT_OBJECT_0 + 1) - { - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - else - { - if (dwRet == WAIT_OBJECT_0 || dwRet == WAIT_FAILED) - break; - } - } - - CloseHandle(pi.hProcess); - - if (Wait) - { - EnableWindow(hMainWnd, TRUE); - SetForegroundWindow(hMainWnd); - SetFocus(hMainWnd); - } - - return TRUE; -} - -BOOL -GetStorageDirectory(PWCHAR lpDirectory, DWORD cch) -{ - if (cch < MAX_PATH) - return FALSE; - - if (!SHGetSpecialFolderPathW(NULL, lpDirectory, CSIDL_LOCAL_APPDATA, TRUE)) - return FALSE; - - if (FAILED(StringCchCatW(lpDirectory, cch, L"\\rapps"))) - return FALSE; - - if (!CreateDirectoryW(lpDirectory, NULL) && - GetLastError() != ERROR_ALREADY_EXISTS) - { - return FALSE; - } - - return TRUE; -} - -BOOL -ExtractFilesFromCab(LPWSTR lpCabName, LPWSTR lpOutputPath) -{ - HINSTANCE hCabinetDll; - CHAR szCabName[MAX_PATH]; - SESSION Dest; - HRESULT Result; - - hCabinetDll = LoadLibraryW(L"cabinet.dll"); - if (hCabinetDll) - { - pfnExtract = (void *) GetProcAddress(hCabinetDll, "Extract"); - if (pfnExtract) - { - ZeroMemory(&Dest, sizeof(SESSION)); - - WideCharToMultiByte(CP_ACP, 0, lpOutputPath, -1, Dest.Destination, MAX_PATH, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, lpCabName, -1, szCabName, MAX_PATH, NULL, NULL); - Dest.Operation = EXTRACT_FILLFILELIST; - - Result = pfnExtract(&Dest, szCabName); - if (Result == S_OK) - { - Dest.Operation = EXTRACT_EXTRACTFILES; - Result = pfnExtract(&Dest, szCabName); - if (Result == S_OK) - { - FreeLibrary(hCabinetDll); - return TRUE; - } - } - } - FreeLibrary(hCabinetDll); - } - - return FALSE; -} +//static +HANDLE hLog = NULL; VOID InitLogs(VOID) { - WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\ReactOS Application Manager"; + WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\RosAutotest"; WCHAR szPath[MAX_PATH]; DWORD dwCategoryNum = 1; DWORD dwDisp, dwData; HKEY hKey; - - if (!SettingsInfo.bLogEnabled) return; if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuf, 0, NULL, @@ -361,7 +78,7 @@ RegCloseKey(hKey); - hLog = RegisterEventSourceW(NULL, L"ReactOS Application Manager"); + hLog = RegisterEventSourceW(NULL, L"RosAutotest"); } @@ -375,8 +92,6 @@ BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPWSTR lpMsg) { - if (!SettingsInfo.bLogEnabled) return TRUE; - if (!ReportEventW(hLog, wType, 0, Propchange: trunk/rostests/rosautotest/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/rosautotest/misc.cpp ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed Aug 27 20:19:43 2014 @@ -0,0 +1,20 @@ +/branches/GSoC_2011/GSoC_Network/base/applications/rapps/misc.c:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/base/applications/rapps/misc.c:51550 +/branches/GSoC_2011/TcpIpDriver/base/applications/rapps/misc.c:51551-53074,53076-53119 +/branches/GSoC_Network/base/applications/rapps/misc.c:51545-51546 +/branches/cmake-bringup/base/applications/rapps/misc.c:50484,50693,50719,51544-52564 +/branches/condrv_restructure/base/applications/rapps/misc.c:63104-63885 +/branches/header-work/base/applications/rapps/misc.c:45691-47721 +/branches/kd++/base/applications/rapps/misc.c:58883-58973 +/branches/ntvdm/base/applications/rapps/misc.c:59241-63176 +/branches/reactos-yarotows/base/applications/rapps/misc.c:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/base/applications/rapps/misc.c:49994-49995 +/branches/ros-amd64-bringup/base/applications/rapps/misc.c:36852 +/branches/ros-amd64-bringup/reactos/base/applications/rapps/misc.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013/base/applications/rapps/misc.c:59059 +/branches/ros-csrss/base/applications/rapps/misc.c:57561-58762 +/branches/shell32_new-bringup/base/applications/rapps/misc.c:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/base/applications/rapps/misc.c:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/base/applications/rapps/misc.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk/base/applications/rapps/misc.c:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup/base/applications/rapps/misc.c:54809-54998 Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -20,6 +20,7 @@ #include <reason.h> #include <shlobj.h> #include <wininet.h> +#include <winreg.h> #include <ndk/rtlfuncs.h> #include <reactos/buildno.h> @@ -39,6 +40,8 @@ #include "CWebService.h" #include "CWineTest.h" +#include <rosautotestmsg.h> + /* Useful macros */ #define EXCEPTION(Message) throw CSimpleException(Message) #define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) @@ -46,6 +49,11 @@ /* main.c */ extern CConfiguration Configuration; + +/* misc.c */ +VOID FreeLogs(VOID); +VOID InitLogs(VOID); +extern HANDLE hLog; /* shutdown.c */ bool ShutdownSystem(); Added: trunk/rostests/rosautotest/rosautotest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.r… ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rc (added) +++ trunk/rostests/rosautotest/rosautotest.rc [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -0,0 +1 @@ +#include <rosautotestmsg.rc> Propchange: trunk/rostests/rosautotest/rosautotest.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/rosautotest/rosautotest.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/rosautotest/rosautotestmsg.mc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotestms… ============================================================================== --- trunk/rostests/rosautotest/rosautotestmsg.mc (added) +++ trunk/rostests/rosautotest/rosautotestmsg.mc [iso-8859-1] Wed Aug 27 20:19:43 2014 @@ -0,0 +1,27 @@ +MessageIdTypedef=ULONG + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS +Informational=0x1:STATUS_SEVERITY_INFORMATIONAL +Warning=0x2:STATUS_SEVERITY_WARNING +Error=0x3:STATUS_SEVERITY_ERROR) + +FacilityNames=(System=0x0:FACILITY_SYSTEM Application=0xFFF) + +LanguageNames=(English=0x409:MSG00409) + +MessageId=1 +Severity=Informational +Facility=Application +SymbolicName=MSG_TESTS_STARTED +Language=English +ReactOS Automatic Testing Utility is started. +. + +MessageId=2 +Severity=Success +Facility=Application +SymbolicName=MSG_TESTS_SUCCESSFUL +Language=English +ReactOS Automatic Testing Utility is successful. +. + Propchange: trunk/rostests/rosautotest/rosautotestmsg.mc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/rosautotest/rosautotestmsg.mc ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[pschweitzer] 63962: [PSDK] Add two missing constants
by pschweitzer＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: pschweitzer Date: Wed Aug 27 19:29:41 2014 New Revision: 63962 URL: http://svn.reactos.org/svn/reactos?rev=63962&view=rev Log: [PSDK] Add two missing constants Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Aug 27 19:29:41 2014 @@ -371,6 +371,8 @@ #define MOVEFILE_COPY_ALLOWED 2 #define MOVEFILE_DELAY_UNTIL_REBOOT 4 #define MOVEFILE_WRITE_THROUGH 8 +#define MOVEFILE_CREATE_HARDLINK 16 +#define MOVEFILE_FAIL_IF_NOT_TRACKABLE 32 #define MAXIMUM_WAIT_OBJECTS 64 #define MAXIMUM_SUSPEND_COUNT 0x7F #define WAIT_OBJECT_0 0

1 0

[hbelusca] 63961: [TASKMGR] - Simplify EnablePrivilege(). - Add "Lock computer" option to the shutdown menu. - Display the last error description if something failed when selecting one of the shutd...
by hbelusca＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: hbelusca Date: Wed Aug 27 12:46:22 2014 New Revision: 63961 URL: http://svn.reactos.org/svn/reactos?rev=63961&view=rev Log: [TASKMGR] - Simplify EnablePrivilege(). - Add "Lock computer" option to the shutdown menu. - Display the last error description if something failed when selecting one of the shutdown options. Inspired by the patch of Robert Naumann (see CORE-8048). CORE-8048 #resolve #comment I adapted some of your ideas to what I already committed in revision 63955, thanks! Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt 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 trunk/reactos/base/applications/taskmgr/shutdown.c trunk/reactos/base/applications/taskmgr/shutdown.h trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -8,17 +8,17 @@ debug.c endproc.c graph.c + graphctl.c optnmenu.c perfdata.c perfpage.c priority.c + proclist.c procpage.c - proclist.c run.c + shutdown.c + taskmgr.c trayicon.c - taskmgr.c - graphctl.c - shutdown.c precomp.h) add_executable(taskmgr ${SOURCE} taskmgr.rc) 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ÐÐ¾Ð¼Ð¾&Ñ" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&NÃ¡povÄda" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&HjÃ¦lp" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&?" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "A&yuda" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aide" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&×¢××¨×" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&SÃºgÃ³" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Aiuto" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ãã«ã(&H)" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "ëìë§(&H)" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Help" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Hjelp" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -55,14 +55,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Pomo&c" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Aj&uda" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&?" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&PomocnÃk" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -52,14 +52,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "Ndihme" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&HjÃ¤lp" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -50,14 +50,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&YardÄ±m" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -48,14 +48,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -54,14 +54,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "å¸®å©(&H)" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -56,14 +56,15 @@ END POPUP "Sh&ut Down" BEGIN - MENUITEM "Stand &By", ID_POWER_SAVING - MENUITEM "&Hibernate", ID_HIBERNATION - MENUITEM "T&urn Off", ID_SHUTDOWN - MENUITEM "&Restart", ID_RESTART - MENUITEM "&Log Off %s", ID_LOGOFF_USER - MENUITEM "&Switch user\tWinKey+L", ID_SWITCH_USER, GRAYED - MENUITEM "&Disconnect", ID_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_EJECT_COMPUTER, GRAYED + MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY + MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE + MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF + MENUITEM "&Restart", ID_SHUTDOWN_REBOOT + MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF + MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "èªªæ(&H)" BEGIN 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] Wed Aug 27 12:46:22 2014 @@ -180,14 +180,15 @@ #define ID_PROCESS_PAGE_SETPRIORITY_LOW 32814 #define ID_PROCESS_PAGE_DEBUGCHANNELS 32815 -#define ID_POWER_SAVING 32816 -#define ID_HIBERNATION 32817 -#define ID_SHUTDOWN 32818 -#define ID_RESTART 32819 -#define ID_LOGOFF_USER 32820 -#define ID_SWITCH_USER 32821 -#define ID_DISCONNECT 32822 -#define ID_EJECT_COMPUTER 32823 +#define ID_SHUTDOWN_STANDBY 32816 +#define ID_SHUTDOWN_HIBERNATE 32817 +#define ID_SHUTDOWN_POWEROFF 32818 +#define ID_SHUTDOWN_REBOOT 32819 +#define ID_SHUTDOWN_LOGOFF 32820 +#define ID_SHUTDOWN_SWITCHUSER 32821 +#define ID_SHUTDOWN_LOCKCOMPUTER 32822 +#define ID_SHUTDOWN_DISCONNECT 32823 +#define ID_SHUTDOWN_EJECT_COMPUTER 32824 #define IDC_STATIC -1 Modified: trunk/reactos/base/applications/taskmgr/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/shutdown.c [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * 2014 Robert Naumann <gonzomdx(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 @@ -24,6 +25,7 @@ #include "precomp.h" #include <ndk/exfuncs.h> #include <ndk/pofuncs.h> +#include <ndk/rtlfuncs.h> // Uncomment when NtInitiatePowerAction() is implemented // #define NT_INITIATE_POWERACTION_IMPLEMENTED @@ -33,63 +35,78 @@ { BOOL Success; HANDLE hToken; + TOKEN_PRIVILEGES tp; Success = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); - if (Success) - { - TOKEN_PRIVILEGES tp; + if (!Success) return Success; - tp.PrivilegeCount = 1; - tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); + Success = LookupPrivilegeValueW(NULL, + lpszPrivilegeName, + &tp.Privileges[0].Luid); + if (!Success) goto Quit; - Success = LookupPrivilegeValueW(NULL, - lpszPrivilegeName, - &tp.Privileges[0].Luid); - if (Success) - { - Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); - } + tp.PrivilegeCount = 1; + tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0); - CloseHandle(hToken); - } + Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); +Quit: + CloseHandle(hToken); return Success; } VOID -ShutDown_PowerSaving(VOID) // StandBy +ShutDown_StandBy(VOID) { - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + NTSTATUS Status; + + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } #ifdef NT_INITIATE_POWERACTION_IMPLEMENTED - NtInitiatePowerAction(PowerActionSleep, - PowerSystemSleeping1, - 0, FALSE); + Status = NtInitiatePowerAction(PowerActionSleep, + PowerSystemSleeping1, + 0, FALSE); #else - NtSetSystemPowerState(PowerActionSleep, - PowerSystemSleeping1, - 0); + Status = NtSetSystemPowerState(PowerActionSleep, + PowerSystemSleeping1, + 0); #endif + + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); } VOID -ShutDown_Hibernation(VOID) +ShutDown_Hibernate(VOID) { - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + NTSTATUS Status; + + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } #ifdef NT_INITIATE_POWERACTION_IMPLEMENTED - NtInitiatePowerAction(PowerActionHibernate, - PowerSystemHibernate, - 0, FALSE); + Status = NtInitiatePowerAction(PowerActionHibernate, + PowerSystemHibernate, + 0, FALSE); #else - NtSetSystemPowerState(PowerActionHibernate, - PowerSystemHibernate, - 0); + Status = NtSetSystemPowerState(PowerActionHibernate, + PowerSystemHibernate, + 0); #endif + + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); } @@ -100,43 +117,60 @@ /* Trick: on Windows, pressing the CTRL key forces shutdown via NT API */ BOOL ForceShutdown = !!(GetKeyState(VK_CONTROL) & 0x8000); - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } + if (ForceShutdown) { - NtShutdownSystem(ShutdownPowerOff); + NTSTATUS Status = NtShutdownSystem(ShutdownPowerOff); + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); } else { // The choice of EWX_SHUTDOWN or EWX_POWEROFF may be done with NtPowerInformation - ExitWindowsEx(EWX_POWEROFF, // EWX_SHUTDOWN - SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_POWEROFF /* EWX_SHUTDOWN */, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); } VOID -ShutDown_Restart(VOID) // Reboot +ShutDown_Reboot(VOID) { /* Trick: on Windows, pressing the CTRL key forces reboot via NT API */ BOOL ForceReboot = !!(GetKeyState(VK_CONTROL) & 0x8000); - EnablePrivilege(SE_SHUTDOWN_NAME, TRUE); + if (!EnablePrivilege(SE_SHUTDOWN_NAME, TRUE)) + { + ShowWin32Error(GetLastError()); + return; + } + if (ForceReboot) { - NtShutdownSystem(ShutdownReboot); + NTSTATUS Status = NtShutdownSystem(ShutdownReboot); + if (!NT_SUCCESS(Status)) + ShowWin32Error(RtlNtStatusToDosError(Status)); } else { - ExitWindowsEx(EWX_REBOOT, - SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); } + EnablePrivilege(SE_SHUTDOWN_NAME, FALSE); } VOID ShutDown_LogOffUser(VOID) { - ExitWindowsEx(EWX_LOGOFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER); + if (!ExitWindowsEx(EWX_LOGOFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER)) + ShowWin32Error(GetLastError()); } VOID @@ -145,11 +179,18 @@ } VOID +ShutDown_LockComputer(VOID) +{ + if (!LockWorkStation()) + ShowWin32Error(GetLastError()); +} + +VOID ShutDown_Disconnect(VOID) { } VOID -ShutDown_Eject_Computer(VOID) +ShutDown_EjectComputer(VOID) { } Modified: trunk/reactos/base/applications/taskmgr/shutdown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/shutdown.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/shutdown.h [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -5,6 +5,7 @@ * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2011 Mário Kacmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * 2014 Robert Naumann <gonzomdx(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 @@ -24,16 +25,16 @@ #pragma once VOID -ShutDown_PowerSaving(VOID); // StandBy +ShutDown_StandBy(VOID); VOID -ShutDown_Hibernation(VOID); +ShutDown_Hibernate(VOID); VOID ShutDown_PowerOff(VOID); VOID -ShutDown_Restart(VOID); // Reboot +ShutDown_Reboot(VOID); VOID ShutDown_LogOffUser(VOID); @@ -42,7 +43,10 @@ ShutDown_SwitchUser(VOID); VOID +ShutDown_LockComputer(VOID); + +VOID ShutDown_Disconnect(VOID); VOID -ShutDown_Eject_Computer(VOID); +ShutDown_EjectComputer(VOID); Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -319,29 +319,32 @@ break; /* ShutDown items */ - case ID_POWER_SAVING: - ShutDown_PowerSaving(); - break; - case ID_HIBERNATION: - ShutDown_Hibernation(); - break; - case ID_SHUTDOWN: + case ID_SHUTDOWN_STANDBY: + ShutDown_StandBy(); + break; + case ID_SHUTDOWN_HIBERNATE: + ShutDown_Hibernate(); + break; + case ID_SHUTDOWN_POWEROFF: ShutDown_PowerOff(); break; - case ID_RESTART: - ShutDown_Restart(); - break; - case ID_LOGOFF_USER: + case ID_SHUTDOWN_REBOOT: + ShutDown_Reboot(); + break; + case ID_SHUTDOWN_LOGOFF: ShutDown_LogOffUser(); break; - case ID_SWITCH_USER: + case ID_SHUTDOWN_SWITCHUSER: ShutDown_SwitchUser(); break; - case ID_DISCONNECT: + case ID_SHUTDOWN_LOCKCOMPUTER: + ShutDown_LockComputer(); + break; + case ID_SHUTDOWN_DISCONNECT: ShutDown_Disconnect(); break; - case ID_EJECT_COMPUTER: - ShutDown_Eject_Computer(); + case ID_SHUTDOWN_EJECT_COMPUTER: + ShutDown_EjectComputer(); break; case ID_HELP_ABOUT: @@ -1073,6 +1076,22 @@ } } +VOID ShowWin32Error(DWORD dwError) +{ + LPWSTR lpMessageBuffer; + + if (FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR)&lpMessageBuffer, + 0, NULL) != 0) + { + MessageBoxW(hMainWnd, lpMessageBuffer, NULL, MB_OK | MB_ICONERROR); + if (lpMessageBuffer) LocalFree(lpMessageBuffer); + } +} + LPWSTR GetLastErrorText(LPWSTR lpszBuf, DWORD dwSize) { DWORD dwRet; Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] Wed Aug 27 12:46:22 2014 @@ -117,6 +117,7 @@ void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); void TaskManager_OnTabWndSelChange(void); +VOID ShowWin32Error(DWORD dwError); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread);

1 0

[hbelusca] 63960: [MPLAY32]: Improve ShowLastWin32Error().
by hbelusca＠svn.reactos.org 27 Aug '14

27 Aug '14

Author: hbelusca Date: Wed Aug 27 12:38:45 2014 New Revision: 63960 URL: http://svn.reactos.org/svn/reactos?rev=63960&view=rev Log: [MPLAY32]: Improve ShowLastWin32Error(). Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Wed Aug 27 12:38:45 2014 @@ -88,13 +88,19 @@ static VOID ShowLastWin32Error(HWND hwnd) { - DWORD dwError; LPTSTR lpMessageBuffer; - - dwError = GetLastError(); - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwError, 0, (LPWSTR)&lpMessageBuffer, 0, NULL); - MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); - LocalFree(lpMessageBuffer); + DWORD dwError = GetLastError(); + + if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMessageBuffer, + 0, NULL) != 0) + { + MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + if (lpMessageBuffer) LocalFree(lpMessageBuffer); + } } static VOID

1 0

[tfaber] 63959: [PSEH_TEST] - Add test case that uses a significant amount of stack in the except handler CORE-8469 #resolve
by tfaber＠svn.reactos.org 26 Aug '14

26 Aug '14

Author: tfaber Date: Tue Aug 26 21:49:06 2014 New Revision: 63959 URL: http://svn.reactos.org/svn/reactos?rev=63959&view=rev Log: [PSEH_TEST] - Add test case that uses a significant amount of stack in the except handler CORE-8469 #resolve Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Tue Aug 26 21:49:06 2014 @@ -2723,6 +2723,33 @@ return (count == 1); } +void +use_lots_of_stack(void) +{ + int i; + volatile int arr[512]; + for (i = 0; i < 512; i++) + arr[i] = 123; + (void)arr; +} + +DEFINE_TEST(test_PSEH3_bug2) +{ + unsigned long status = 0; + _SEH2_TRY + { + *(volatile int*)0x12345678 = 0x12345678; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + use_lots_of_stack(); + status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return (status == STATUS_ACCESS_VIOLATION); +} + #define USE_TEST_NAME_(NAME_) # NAME_ #define USE_TEST_NAME(NAME_) USE_TEST_NAME_(NAME_) #define USE_TEST(NAME_) { USE_TEST_NAME(NAME_), NAME_ } @@ -2857,6 +2884,7 @@ USE_TEST(test_finally_goto), USE_TEST(test_nested_exception), USE_TEST(test_PSEH3_bug), + USE_TEST(test_PSEH3_bug2), }; size_t i;

1 0

[jgardou] 63958: [PSEH3] - Do not try to dereference potentially invalid pointers. The FrameRegister->ExceptionPointers pointer is only valid in the context of the filter function. Indeed, the PSEH...
by jgardou＠svn.reactos.org 26 Aug '14

26 Aug '14

Author: jgardou Date: Tue Aug 26 21:35:21 2014 New Revision: 63958 URL: http://svn.reactos.org/svn/reactos?rev=63958&view=rev Log: [PSEH3] - Do not try to dereference potentially invalid pointers. The FrameRegister->ExceptionPointers pointer is only valid in the context of the filter function. Indeed, the PSEH3 exception handler allocates it on the stack, and when control gets back to the __excep { } coder, ebp and esp were already restored to their original values, so whatever can happen to those pointers. Investigation and debugging mastered by Thomas Faber, whose efforts were shamelessly stolen by me to improve my commit statistics. CORE-8469 #comment patch committed, you may want to commit your testcase though :-p Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h trunk/reactos/lib/pseh/i386/pseh3.c trunk/reactos/lib/pseh/i386/pseh3_asmdef.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Tue Aug 26 21:35:21 2014 @@ -63,6 +63,9 @@ /* Except handler stores pointer to exception pointers here */ PSEH3$_EXCEPTION_POINTERS volatile ExceptionPointers; + + /* Except handle stores the exception code here */ + unsigned long ExceptionCode; /* Registers that we need to save */ unsigned long Esp; @@ -252,14 +255,14 @@ /* Since we cannot use nested functions, we declare these globally as macros */ #define _abnormal_termination() (_SEH3$_TrylevelFrame.ExceptionPointers != 0) -#define _exception_code() (_SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode) +#define _exception_code() (_SEH3$_TrylevelFrame.ExceptionCode) #define _exception_info() (_SEH3$_TrylevelFrame.ExceptionPointers) #else /* __cplusplus || __clang__ */ #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ - unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } + unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionCode; } /* On GCC the filter function is a nested function with __fastcall calling convention. The eax register contains a base address the function uses @@ -284,7 +287,7 @@ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wshadow\"") \ inline __attribute__((always_inline, gnu_inline)) \ - unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionPointers->ExceptionRecord->ExceptionCode; } \ + unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionCode; } \ inline __attribute__((always_inline, gnu_inline)) \ void * _exception_info() { return _SEH3$_TrylevelFrame.ExceptionPointers; } \ _Pragma("GCC diagnostic pop") \ Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Tue Aug 26 21:35:21 2014 @@ -197,8 +197,8 @@ { asm volatile ( /* Load the registers */ - "movl 20(%%ecx), %%esp\n\t" - "movl 24(%%ecx), %%ebp\n\t" + "movl 24(%%ecx), %%esp\n\t" + "movl 28(%%ecx), %%ebp\n\t" /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ "addl $4, %%esp\n\t" @@ -215,8 +215,8 @@ { asm volatile ( /* Load the registers */ - "movl 20(%%ecx), %%esp\n\t" - "movl 24(%%ecx), %%ebp\n\t" + "movl 24(%%ecx), %%esp\n\t" + "movl 28(%%ecx), %%ebp\n\t" /* Stack pointer is 4 off from the call to __SEH3$_RegisterFrame */ "addl $4, %%esp\n\t" @@ -274,8 +274,9 @@ /* Check if we have an exception handler */ if (CurrentFrame->ScopeTable->Target != NULL) { - /* Set exception pointers for this frame */ + /* Set exception pointers and code for this frame */ CurrentFrame->ExceptionPointers = &ExceptionPointers; + CurrentFrame->ExceptionCode = ExceptionRecord->ExceptionCode; /* Get the filter result */ FilterResult = _SEH3$_GetFilterResult(CurrentFrame); @@ -316,8 +317,9 @@ /* Check if this is an unwind frame */ if (CurrentFrame->ScopeTable->Target == NULL) { - /* Set exception pointers for this frame */ + /* Set exception pointers and code for this frame */ CurrentFrame->ExceptionPointers = &ExceptionPointers; + CurrentFrame->ExceptionCode = ExceptionRecord->ExceptionCode; /* Call the finally function */ _SEH3$_CallFinally(CurrentFrame); Modified: trunk/reactos/lib/pseh/i386/pseh3_asmdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_asmdef… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_asmdef.h [iso-8859-1] Tue Aug 26 21:35:21 2014 @@ -5,12 +5,13 @@ #define SEH3_REGISTRATION_FRAME_EndOfChain 8 #define SEH3_REGISTRATION_FRAME_ScopeTable 12 #define SEH3_REGISTRATION_FRAME_ExceptionPointers 16 -#define SEH3_REGISTRATION_FRAME_Esp 20 -#define SEH3_REGISTRATION_FRAME_Ebp 24 -#define SEH3_REGISTRATION_FRAME_AllocaFrame 28 -#define SEH3_REGISTRATION_FRAME_Ebx 32 -#define SEH3_REGISTRATION_FRAME_Esi 36 -#define SEH3_REGISTRATION_FRAME_Edi 40 +#define SEH3_REGISTRATION_FRAME_ExceptionCode 20 +#define SEH3_REGISTRATION_FRAME_Esp 24 +#define SEH3_REGISTRATION_FRAME_Ebp 28 +#define SEH3_REGISTRATION_FRAME_AllocaFrame 32 +#define SEH3_REGISTRATION_FRAME_Ebx 36 +#define SEH3_REGISTRATION_FRAME_Esi 40 +#define SEH3_REGISTRATION_FRAME_Edi 44 #define SEH3_SCOPE_TABLE_Target 0 #define SEH3_SCOPE_TABLE_Filter 4

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

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 August 2014