Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 71622: [ROSTESTS:USER32] Add an interactive test demonstrating how the PaintDesktop API should behave visually, and how we are not correctly doing well in this regard in ReactOS...
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 14:34:58 2016 New Revision: 71622 URL: http://svn.reactos.org/svn/reactos?rev=71622&view=rev Log: [ROSTESTS:USER32] Add an interactive test demonstrating how the PaintDesktop API should behave visually, and how we are not correctly doing well in this regard in ReactOS... Added: trunk/rostests/win32/user32/paintdesktop/ trunk/rostests/win32/user32/paintdesktop/CMakeLists.txt (with props) trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c (with props) Modified: trunk/rostests/win32/user32/CMakeLists.txt Modified: trunk/rostests/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/CMakeLists.t… ============================================================================== --- trunk/rostests/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/win32/user32/CMakeLists.txt [iso-8859-1] Sun Jun 12 14:34:58 2016 @@ -1 +1,2 @@ +add_subdirectory(paintdesktop) add_subdirectory(sysicon) Added: trunk/rostests/win32/user32/paintdesktop/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/paintdesktop… ============================================================================== --- trunk/rostests/win32/user32/paintdesktop/CMakeLists.txt (added) +++ trunk/rostests/win32/user32/paintdesktop/CMakeLists.txt [iso-8859-1] Sun Jun 12 14:34:58 2016 @@ -0,0 +1,5 @@ + +add_executable(paintdesktop PaintDesktop.c) +set_module_type(paintdesktop win32gui UNICODE) +add_importlibs(paintdesktop user32 msvcrt kernel32) +add_cd_file(TARGET paintdesktop DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/win32/user32/paintdesktop/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/paintdesktop… ============================================================================== --- trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c (added) +++ trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c [iso-8859-1] Sun Jun 12 14:34:58 2016 @@ -0,0 +1,102 @@ +/* + * PaintDesktop.c + * + * Demonstrates how the user32!PaintDesktop() API visually works. + * This API paints the desktop inside the given HDC with its origin + * always fixed to the origin of the monitor on which the window is + * present. + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +static HINSTANCE hInst; +static PWSTR szTitle = L"PaintDesktop"; +static PWSTR szWindowClass = L"PAINTDESKTOP"; + +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); + +int APIENTRY wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPWSTR lpCmdLine, + int nCmdShow) +{ + MSG msg; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + + MyRegisterClass(hInstance); + + if (!InitInstance (hInstance, nCmdShow)) + return FALSE; + + while (GetMessage(&msg, NULL, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + return (int) msg.wParam; +} + +ATOM MyRegisterClass(HINSTANCE hInstance) +{ + WNDCLASS wc; + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIconW(NULL, IDI_WINLOGO); + wc.hCursor = LoadCursorW(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wc.lpszMenuName = NULL; + wc.lpszClassName = szWindowClass; + + return RegisterClass(&wc); +} + +BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) +{ + HWND hWnd; + + hInst = hInstance; + + hWnd = CreateWindow(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInstance, NULL); + if (!hWnd) + return FALSE; + + ShowWindow(hWnd, nCmdShow); + UpdateWindow(hWnd); + + return TRUE; +} + +LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + case WM_MOVE: + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + break; + + case WM_ERASEBKGND: + PaintDesktop((HDC)wParam); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + + return 0; +} Propchange: trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71621: [NETSHELL]: Update russian translation by "leha-bot" and "amber". CORE-11392
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 13:50:33 2016 New Revision: 71621 URL: http://svn.reactos.org/svn/reactos?rev=71621&view=rev Log: [NETSHELL]: Update russian translation by "leha-bot" and "amber". CORE-11392 Modified: trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lang/ru-RU.rc [iso-8859-1] Sun Jun 12 13:50:33 2016 @@ -78,44 +78,44 @@ IDD_NETWORKSETTINGSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_NET_SETUP, IDC_STATIC, 21, 10, 20, 20 - LTEXT "Choose whether to use typical or custom settings:", IDC_STATIC, 53, 7, 240, 20 - AUTORADIOBUTTON "Typical Settings", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Custom Settings", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP - LTEXT "Creates network connetions using the Client for ReactOS Networks, File and Print Sharing for ReactOS Networks, and the TCP/IP transport protocol with automatic addressing.", IDC_STATIC, 65, 45, 240, 30 - LTEXT "Allows you to manually configure network components.", IDC_STATIC, 65, 90, 243, 20 + LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐµÐ¶Ð¸Ð¼ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐµÑÐ¸:", IDC_STATIC, 53, 7, 240, 20 + AUTORADIOBUTTON "ÐÐ±ÑÑÐ½ÑÐ¹ ÑÐµÐ¶Ð¸Ð¼ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDC_NETWORK_TYPICAL, 53, 27, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Ð Ð°ÑÑÐ¸ÑÐµÐ½Ð½ÑÐ¹ ÑÐµÐ¶Ð¸Ð¼ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDC_NETWORK_CUSTOM, 53, 72, 253, 20, WS_TABSTOP + LTEXT "Ð¡Ð¾Ð·Ð´Ð°ÐµÑ ÑÐµÑÐµÐ²ÑÐµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ Ð´Ð»Ñ ÑÐµÑÐµÐ¹ ReactOS, ÐÐ±ÑÐ¸Ðµ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð¿ÑÐ¸Ð½ÑÐµÑÑ Ð´Ð»Ñ ÑÐµÑÐµÐ¹ ReactOS Ð¸ ÑÑÐ°Ð½ÑÐ¿Ð¾ÑÑÐ½ÑÐ¹ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð» TCP/IP Ñ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¾Ð¹ Ð°Ð´ÑÐµÑÐ°ÑÐ¸ÐµÐ¹.", IDC_STATIC, 65, 45, 240, 30 + LTEXT "ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²Ð°Ð¼ Ð½Ð°ÑÑÑÐ¾Ð¸ÑÑ ÑÐµÑÐµÐ²ÑÐµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ Ð²ÑÑÑÐ½ÑÑ.", IDC_STATIC, 65, 90, 243, 20 END IDD_NETWORKCOMPONENTPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "For Device:", IDC_STATIC, 33, 2, 100, 20 - LTEXT "n/a", IDC_NETWORK_DEVICE, 75, 2, 253, 20 - LTEXT "Components checked are used by this connection:", IDC_STATIC, 33, 12, 253, 20 + LTEXT "ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ:", IDC_STATIC, 33, 2, 100, 20 + LTEXT "Ð½/Ð´", IDC_NETWORK_DEVICE, 75, 2, 253, 20 + LTEXT "ÐÑÐ¾ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ:", IDC_STATIC, 33, 12, 253, 20 CONTROL "", IDC_COMPONENT_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 33, 22, 250, 50 - PUSHBUTTON "&Install...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Uninstall", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP - PUSHBUTTON "&Properties", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP - GROUPBOX "Description", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX + PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ...", IDC_NETWORK_INSTALL, 122, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ð£&Ð´Ð°Ð»Ð¸ÑÑ", IDC_NETWORK_UNINSTALL, 177, 75, 50, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð°", IDC_NETWORK_PROPERTIES, 232, 75, 50, 14, WS_DISABLED | WS_TABSTOP + GROUPBOX "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ", IDC_STATIC, 33, 90, 250, 50, BS_GROUPBOX END IDD_NETWORKDOMAINPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Do you want this computer to be a member of a domain?\n\ -(You can obtain this information from your network administator.)", IDC_STATIC, 33, 2, 263, 50 - AUTORADIOBUTTON "No, this computer will be part of a workgroup.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Yes, this computer will be part of a domain.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP - LTEXT "Workgroup or Domain Name:", IDC_STATIC, 33, 72, 126, 14 + LTEXT "ÐÑ ÑÐ¾ÑÐ¸ÑÐµ, ÑÑÐ¾Ð±Ñ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð±ÑÐ» ÑÐ°ÑÑÑÑ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð°?\n\ +(ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ñ Ð²Ð°ÑÐµÐ³Ð¾ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.)", IDC_STATIC, 33, 2, 263, 50 + AUTORADIOBUTTON "ÐÐµÑ, ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ð°ÑÐ¾Ð´Ð¸ÑÑÑ Ð² ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ðµ.", IDC_SELECT_WORKGROUP, 33, 32, 253, 20, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ÐÐ°, ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð±ÑÐ´ÐµÑ ÑÐ°ÑÑÑÑ ÑÐµÑÐµÐ²Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð°.", IDC_SELECT_DOMAIN, 33, 47, 253, 20, WS_TABSTOP + LTEXT "ÐÐ¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ Ð¸Ð»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°:", IDC_STATIC, 33, 72, 126, 14 EDITTEXT IDC_DOMAIN_NAME, 33, 82, 126, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "NOTE: If this computer isn't going to be part of a network, you don't have sufficient rights to join a domain, or you don't know what to enter, then just choose workgroup for now. These options can be changed at a later time.", IDC_STATIC, 33, 107, 263, 50 + LTEXT "ÐÑÐ¸Ð¼ÐµÑÐ°Ð½Ð¸Ðµ: ÐÑÐ»Ð¸ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð½Ð°Ð´Ð¾ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÑÑÑ Ðº ÑÐµÑÐ¸, Ð¸Ð»Ð¸ Ñ Ð²Ð°Ñ Ð½ÐµÑ Ð¿ÑÐ°Ð² Ð´Ð»Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ðº ÑÐµÑÐµÐ²Ð¾Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ñ, Ð¸Ð»Ð¸ Ð²Ñ Ð½Ðµ Ð·Ð½Ð°ÐµÑÐµ, ÐºÐ°Ðº Ðº Ð½ÐµÐ¼Ñ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸ÑÑÑÑ, ÑÐ¾Ð³Ð´Ð° Ð²ÑÐ±ÐµÑÐ¸ÑÐµ Ð¾Ð¿ÑÐ¸Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ. ÐÑÑ Ð¾Ð¿ÑÐ¸Ñ Ð¿Ð¾ÑÐ¾Ð¼ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ.", IDC_STATIC, 33, 107, 263, 50 END STRINGTABLE @@ -165,12 +165,12 @@ STRINGTABLE BEGIN - IDS_NETWORKSETTINGSTITLE "Network Settings" - IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." - IDS_NETWORKCOMPONENTTITLE "Network Components" - IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administator. A workgroup is a group of computers sharing the same workgroup name." - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." + IDS_NETWORKSETTINGSTITLE "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐµÑÐ¸" + IDS_NETWORKSETTINGSSUBTITLE "Ð£ÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ ÑÐµÑÐµÐ²Ð¾Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ, Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾Ðµ Ð´Ð»Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸ Ñ Ð´ÑÑÐ³Ð¸Ð¼Ð¸ ÑÐµÑÑÐ¼Ð¸, ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°Ð¼Ð¸ Ð¸Ð»Ð¸ ÐÐ½ÑÐµÑÐ½ÐµÑÐ¾Ð¼." + IDS_NETWORKCOMPONENTTITLE "Ð¡ÐµÑÐµÐ²ÑÐµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ" + IDS_NETWORKCOMPONENTSUBTITLE "ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÐµÑ, ÐºÐ°ÐºÐ¸Ðµ ÑÐµÑÐµÐ²ÑÐµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑÑÑÑ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ. Ð§ÑÐ¾Ð±Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ." + IDS_NETWORKDOMAINTITLE "Ð Ð°Ð±Ð¾ÑÐ°Ñ Ð³ÑÑÐ¿Ð¿Ð° Ð¸Ð»Ð¸ ÑÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¾Ð¼ÐµÐ½" + IDS_NETWORKDOMAINSUBTITLE "Ð¡ÐµÑÐµÐ²Ð¾Ð¹ Ð´Ð¾Ð¼ÐµÐ½ - ÑÑÐ¾ Ð³ÑÑÐ¿Ð¿Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð², Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½Ð°Ñ ÑÐµÑÐµÐ²ÑÐ¼ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼. Ð Ð°Ð±Ð¾ÑÐ°Ñ Ð³ÑÑÐ¿Ð¿Ð° - ÑÑÐ¾ Ð³ÑÑÐ¿Ð¿Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ¾Ð², Ñ ÐºÐ¾ÑÐ¾ÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ." + IDS_REACTOS_SETUP "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" + IDS_WZD_DOMAIN_NAME "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ, Ñ.Ðº. Ð²Ñ\nÐ½Ðµ Ð²Ð²ÐµÐ»Ð¸ Ð¸Ð¼Ñ Ð²Ð°ÑÐµÐ¹ ÑÐ°Ð±Ð¾ÑÐµÐ¹ Ð³ÑÑÐ¿Ð¿Ñ Ð¸Ð»Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°." END

1 0

[hbelusca] 71620: [DEVMGR]: Update russian translation by "leha-bot" and "amber". CORE-11392
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 13:49:02 2016 New Revision: 71620 URL: http://svn.reactos.org/svn/reactos?rev=71620&view=rev Log: [DEVMGR]: Update russian translation by "leha-bot" and "amber". CORE-11392 Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Sun Jun 12 13:49:02 2016 @@ -76,8 +76,8 @@ IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." IDS_DEV_FAILED_ADD "This device is not working properly because %1 is not working properly." - IDS_DEV_DISABLED_SERVICE "ReactOS cannot install the drivers for this device because it cannot access the drive or network location that has the setup files on it." - IDS_DEV_TRANSLATION_FAILED "This device isn't responding to its driver." + IDS_DEV_DISABLED_SERVICE "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ° Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿ Ðº Ð¼ÐµÑÑÑ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð¾ÑÐ½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð²." + IDS_DEV_TRANSLATION_FAILED "ÐÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¾ÑÐ²ÐµÑÐ°ÐµÑ ÑÐ²Ð¾ÐµÐ¼Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ." IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." IDS_DEV_BIOS_TABLE "Your computer's system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer's system setup program to reconfigure the interrupt for this device." @@ -85,16 +85,16 @@ IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS successfully loaded the device driver for this hardware but cannot find the hardware device." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð³ÑÑÐ·Ð¸Ð» Ð´ÑÐ°Ð¹Ð²ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð½Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÐ²ÑÑÑÐµÐµ ÐµÐ¼Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ." IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." IDS_DEV_FAILED_POST_START "ReactOS Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð¸Ð» Ð´Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, ÑÐ°Ðº ÐºÐ°Ðº Ð² ÐµÐ³Ð¾ ÑÐ°Ð±Ð¾ÑÐµ Ð¾Ð±Ð½Ð°ÑÑÐ¶Ð¸Ð»Ð¸ÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ." IDS_DEV_HALTED "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ ÑÐ»ÑÐ¶Ð±Ð° Ð¾ÑÐºÐ»ÑÑÐ¸Ð»Ð¸ Ð´Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." IDS_DEV_PHANTOM "Ð Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ Ð´Ð°Ð½Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¾ Ðº ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÑ." - IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." - IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ñ, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¸Ð´ÐµÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ." + IDS_DEV_HELD_FOR_EJECT "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾, Ð¿Ð¾ÑÐ¾Ð¼Ñ ÑÑÐ¾ Ð¾Ð½Ð¾ Ð¿Ð¾Ð´Ð³Ð¾ÑÐ¾Ð²Ð»ÐµÐ½Ð¾ Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾Ð³Ð¾ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ, Ð½Ð¾ ÐµÑÐµ Ð½Ðµ Ð±ÑÐ»Ð¾ Ð¸Ð·Ð²Ð»ÐµÑÐµÐ½Ð¾." IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." IDS_DEV_REGISTRY_TOO_LARGE "ReactOS cannot start new hardware devices because the system hive is too large (exceeds the Registry Size Limit)." - IDS_DEV_SETPROPERTIES_FAILED "ReactOS wasn't able to change the settings of this device." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÑÐ¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." END STRINGTABLE @@ -246,12 +246,12 @@ IDR_MAINMENU MENU BEGIN - POPUP "&File" + POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "Ð&ÑÑÐ¾Ð´", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU - POPUP "View" + MENUITEM "&ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ", IDC_ACTIONMENU + POPUP "&ÐÐ¸Ð´" BEGIN MENUITEM "&Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´&ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN @@ -260,9 +260,9 @@ MENUITEM SEPARATOR MENUITEM "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ &ÑÐºÑÑÑÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°", IDC_SHOWHIDDEN END - POPUP "Help" + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "Ð &Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", IDC_ABOUT END END @@ -305,7 +305,7 @@ IDS_HINT_UPDATE " ÐÐ°Ð¿ÑÑÐº Ð¼Ð°ÑÑÐµÑÐ° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð² Ð´Ð»Ñ Ð²ÑÐ´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." IDS_HINT_UNINSTALL " Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ° Ð´Ð»Ñ Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð³Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." IDS_HINT_ADD " ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ ÑÑÐ°ÑÐ¾Ðµ (Ð½Ðµ Plug-and-Play) ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ Ð½Ð° ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." - IDS_HINT_ABOUT " Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS." + IDS_HINT_ABOUT " Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ \"ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² ReactOS\"." IDS_HINT_EXIT " ÐÑÑÐ¾Ð´ Ð¸Ð· Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ." IDS_HINT_DEV_BY_TYPE " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ ÑÐ¸Ð¿Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ." @@ -314,10 +314,10 @@ IDS_HINT_RES_BY_CONN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐµÑÑÑÑÑ, Ð¾ÑÑÐ¾ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ." IDS_HINT_SHOW_HIDDEN " ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐµ Ð¸Ð· ÑÐ¸ÑÑÐµÐ¼Ñ Ð¸ ÑÑÑÐ°ÑÐµÐ²ÑÐ¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°." - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." - IDS_HINT_SYS_CLOSE " Closes this window." -END + IDS_HINT_SYS_RESTORE " ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾ÐºÐ½Ð¾ Ðº ÐµÐ³Ð¾ Ð½Ð¾ÑÐ¼Ð°Ð»ÑÐ½Ð¾Ð¼Ñ ÑÐ°Ð·Ð¼ÐµÑÑ." + IDS_HINT_SYS_MOVE " ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð¾ÐºÐ½Ð¾." + IDS_HINT_SYS_SIZE " ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." + IDS_HINT_SYS_MINIMIZE " Ð¡Ð²ÐµÑÐ½ÑÑÑ Ð¾ÐºÐ½Ð¾." + IDS_HINT_SYS_MAXIMIZE " Ð Ð°Ð·Ð²ÐµÑÐ½ÑÑÑ Ð¾ÐºÐ½Ð¾." + IDS_HINT_SYS_CLOSE " ÐÐ°ÐºÑÑÑÑ Ð¾ÐºÐ½Ð¾." +END

1 0

[hbelusca] 71619: [DXDIAG]: Update russian translation by "leha-bot" and "amber". CORE-11392
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 13:46:51 2016 New Revision: 71619 URL: http://svn.reactos.org/svn/reactos?rev=71619&view=rev Log: [DXDIAG]: Update russian translation by "leha-bot" and "amber". CORE-11392 Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Sun Jun 12 13:46:51 2016 @@ -230,15 +230,15 @@ IDS_REG_SUCCESS "OK" IDS_REG_FAIL "ÐÑÐ¸Ð±ÐºÐ°" IDS_DDTEST_ERROR "Ð¡Ð±Ð¾Ð¹ Ð² Ð¿ÑÐ¾Ð²ÐµÑÐºÐµ!" - IDS_DDTEST_DESCRIPTION "ÐÑÐ´ÐµÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° DirecDraw Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" + IDS_DDTEST_DESCRIPTION "ÐÑÐ´ÐµÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° DirectDraw Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_DDPRIMARY_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð¾Ð²ÐµÑÑÐ½Ð¾ÑÑÐ¸ ÑÐºÑÐ°Ð½Ð°. ÐÐ¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð²Ð¸Ð´Ð½Ñ ÑÐµÑÐ½ÑÐµ Ð¸ Ð±ÐµÐ»ÑÐµ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸ÐºÐ¸. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_DDPRIMARY_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ ÑÐµÑÐ½ÑÐµ Ð¸ Ð±ÐµÐ»ÑÐµ Ð¿ÑÑÐ¼Ð¾ÑÐ³Ð¾Ð»ÑÐ½Ð¸ÐºÐ¸?" IDS_DDOFFSCREEN_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð½Ð° Ð·Ð°ÐºÐ°Ð´ÑÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾Ð²ÐµÑÑÐ½Ð¾ÑÑÐ¸ ÑÐºÑÐ°Ð½Ð°. ÐÐ¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð²Ð¸Ð´ÐµÐ½ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_DDOFFSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº?" IDS_DDFULLSCREEN_DESCRIPTION "Ð ÑÑÐ¾Ð¼ ÑÐµÑÑÐµ Ð±ÑÐ´ÐµÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½Ð° Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ DirectDraw Ð² Ð¿Ð¾Ð»Ð½Ð¾ÑÐºÑÐ°Ð½Ð½Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ. ÐÐ¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð²Ð¸Ð´ÐµÐ½ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ Ð±ÐµÐ»ÑÐ¹ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_DDFULLSCREEN_RESULT "ÐÑ Ð²Ð¸Ð´ÐµÐ»Ð¸ Ð±ÐµÐ»ÑÐ¹ Ð´Ð²Ð¸Ð³Ð°ÑÑÐ¸Ð¹ÑÑ ÐºÐ²Ð°Ð´ÑÐ°ÑÐ¸Ðº Ð² Ð¿Ð¾Ð»Ð½Ð¾ÑÐºÑÐ°Ð½Ð½Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ?" - IDS_FORMAT_ADAPTER_MEM "%u ÐÐ" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±Ð¸Ñ)(%uÐÑ)" + IDS_FORMAT_ADAPTER_MEM "%u ÐÐ±" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u Ð±Ð¸Ñ)(%u ÐÑ)" IDS_OPTION_NO "ÐÐµÑ" IDS_D3DTEST_DESCRIPTION "ÐÑÐ´ÐµÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð° Ð¿ÑÐ¾Ð²ÐµÑÐºÐ° Direct3D Ð½Ð° ÑÑÐ¾Ð¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_D3DTEST_D3Dx "ÐÑÐ¾Ñ ÑÐµÑÑ Ð±ÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ Direct3D %u Ñ Ð°Ð¿Ð¿Ð°ÑÐ°ÑÐ½ÑÐ¼ ÑÑÐºÐ¾ÑÐµÐ½Ð¸ÐµÐ¼."

1 0

[hbelusca] 71618: [DXDIAG]: Sync some translations with the english one.
by hbelusca＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: hbelusca Date: Sun Jun 12 13:43:39 2016 New Revision: 71618 URL: http://svn.reactos.org/svn/reactos?rev=71618&view=rev Log: [DXDIAG]: Sync some translations with the english one. Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/he-IL.rc trunk/reactos/base/applications/dxdiag/lang/it-IT.rc trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ð©Ðµ Ð±ÑÐ´Ðµ Ð¸Ð·Ð¿Ð¸ÑÐ°Ð½ DirectDraw Ð·Ð° Ð¸Ð·Ð¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑÐ» ÐµÐºÑÐ°Ð½. Ð¢ÑÑÐ±Ð²Ð° Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð·Ð¾Ð±ÑÐ°Ð·ÐµÐ½ Ð´Ð²Ð¸Ð¶ÐµÑ ÑÐµ Ð±ÑÐ» Ð¿ÑÐ°Ð²Ð¾ÑÐ³ÑÐ»Ð½Ð¸Ðº. ÐÐ° Ð¿ÑÐ¾Ð´ÑÐ»Ð¶Ð¸Ð¼ Ð»Ð¸?" IDS_DDFULLSCREEN_RESULT "ÐÐ¸Ð´ÑÑÑÐµ Ð»Ð¸ Ð±ÑÐ» Ð´Ð²Ð¸Ð¶ÐµÑ ÑÐµ Ð¿ÑÐ°Ð²Ð¾ÑÐ³ÑÐ»Ð½Ð¸Ðº Ð² ÑÐµÐ¶Ð¸Ð¼ âÑÑÐ» ÐµÐºÑÐ°Ð½â?" IDS_FORMAT_ADAPTER_MEM "%u ÐÐ" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±Ð¸ÑÐ°)(%uÐ¥Ñ)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u Ð±Ð¸ÑÐ°)(%uÐ¥Ñ)" IDS_OPTION_NO "ÐÐµ" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -243,7 +243,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Tento test pouÅ¾ije DirectDraw k vykreslovÃ¡nÃ do celoobrazovkovÃ©ho mÃ³du. MÄl by bÃ½t vykreslen bÃlÃ½ pohybujÃcÃ se obdÃ©lnÃk. PokraÄovat?" IDS_DDFULLSCREEN_RESULT "VidÄli jste bÃlÃ½ pohybujÃcÃ se obdÃ©lnÃk v celoobrazovkovÃ©m mÃ³du?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Ne" IDS_D3DTEST_DESCRIPTION "SpustÃ se test rozhranÃ Direct3D. PokraÄovat?" IDS_D3DTEST_D3Dx "Tento test pouÅ¾ije hardwarovÄ akcelerovanÃ© rozhranÃ Direct3D %u." Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Vollbildmodus zu zeichnen. Ein bewegtes weiÃes Rechteck sollte zu sehen sein. Fortfahren?" IDS_DDFULLSCREEN_RESULT "Haben Sie das bewegte weiÃe Rechteck im Vollbildmodus gesehen?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nein" IDS_D3DTEST_DESCRIPTION "Dies wird den Direct3D-Interfacetest starten. Fortfahren?" IDS_D3DTEST_D3Dx "Dieser Test wird das hardwarebeschleunigte Direct3D %u Interface verwenden." Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Esta prueba usarÃ¡ DirectDraw para dibujar en pantalla completa. Debe aparecer un rectÃ¡ngulo blanco en movimiento. Â¿Desea continuar?" IDS_DDFULLSCREEN_RESULT "Â¿Ve un rectÃ¡ngulo blanco moviÃ©ndose en pantalla completa?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Va a comenzar la prueba del interfaz Direct3D. Â¿Desea continuar?" IDS_D3DTEST_D3Dx "Esta prueba utilizarÃ¡ un interfaz Direct3D %u acelerado por hardware." Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ce test utilisera DirectDraw pour dessiner en mode plein Ã©cran. Un rectangle blanc en mouvement devrait Ãªtre dessinÃ©. Continuer ?" IDS_DDFULLSCREEN_RESULT "Avez-vous vu le rectangle blanc en mouvement en mode plein Ã©cran ?" IDS_FORMAT_ADAPTER_MEM "%u Mo" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Non" IDS_D3DTEST_DESCRIPTION "Ceci va dÃ©marrer le test de l'interface Direct3D. Continuer ?" IDS_D3DTEST_D3Dx "Ce test va utiliser l'interface Direct3D %u accÃ©lÃ©rÃ©e matÃ©riellement." Modified: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -239,7 +239,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "×××××§× ×××× ×ª×©×ª××© ×- DirectDraw ××× ××¦×××¨ ×××¦× ××¡× ×××. ××ª× ××××¨ ××¨×××ª ×ª××× ××× × ×§××¤×¦×ª." IDS_DDFULLSCREEN_RESULT "××× ×¨×××ª ×ª××× ××× × ×§××¤×¦×ª ×××¡× ×××?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "××" IDS_D3DTEST_DESCRIPTION "×¤×¢××× ×× ×ª××××§ Direct3D ×××ª×§× ××. ××× ××××©××?" IDS_D3DTEST_D3Dx "××××§× ×× ×ª×©×ª××© ××××©×§× Direct3D %u ×××××¦×× ××××¦×¢××ª ××××¨×." Modified: trunk/reactos/base/applications/dxdiag/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Questo test utilizza DirectDraw per disegnare in una modalitÃ schermo intero. I Spostamenti del rettangolo bianco devono essere compilati. Continuare?" IDS_DDFULLSCREEN_RESULT "Hai visto un rettangolo bianco in movimento in modalitÃ schermo intero?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Avviare il test dell'interfaccia Direct3D. Continuare?" IDS_D3DTEST_D3Dx "Questo test utilizza accelerazione hardware dell'interfaccia Direct3D % u." Modified: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "ãã®ãã¹ãã§ã¯ãDirectDraw ãä½¿ã£ã¦å¨ç»é¢è¡¨ç¤ºã¢ã¼ãã§æç»ãã¾ããç§»åãã¦ããç½ãç©å½¢ãæç»ããã¾ããç¶è¡ãã¾ãã?" IDS_DDFULLSCREEN_RESULT "å¨ç»é¢è¡¨ç¤ºã¢ã¼ãã§ç§»åãã¦ããç½ãç©å½¢ãè¦ãã¾ããã?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "ããã" IDS_D3DTEST_DESCRIPTION "Direct3D ã¤ã³ã¿ãã§ã¼ã¹ãã¹ããéå§ãããã¨ãã¦ãã¾ããç¶è¡ãã¾ãã?" IDS_D3DTEST_D3Dx "ãã®ãã¹ãã¯ãã¼ãã¦ã§ã¢ ã¢ã¯ã»ã©ã¼ã¬ã¼ã¿ Direct3D %u ã¤ã³ã¿ã¼ãã§ã¤ã¹ãä½¿ãã¾ãã" Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "ì´ íì¤í¸ë DirectDrawë¥¼ ì¬ì©íì¬ ì ì²´ íë©´ì ê·¸ë¦´ ê²ìëë¤. ìì§ì´ë íì ì¬ê°íìì´ ê·¸ë ¤ì§ ê²ìëë¤. ê³ìí ê¹ì?" IDS_DDFULLSCREEN_RESULT "ì ì²´ íë©´ ìíìì ìì§ì´ë íì ì¬ê°íì ë³´ì¨ëì?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ë¹í¸)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u ë¹í¸)(%uHz)" IDS_OPTION_NO "ìëì¤" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "De volgende test gebruikt DirectDraw om te tekenen op het primaire oppervlak in de modus voor het volledige scherm. Er moet een stuiterend wit vlak worden weergegeven. Wilt u doorgaan?" IDS_DDFULLSCREEN_RESULT "Hebt u het stuiterende vlak op het volledige scherm gezien?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nee" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -238,7 +238,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Denne testen vil bruke DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Fortsette?" IDS_DDFULLSCREEN_RESULT "SÃ¥ du de hvite bevegende rektangeler i fullskjermmodus?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nei" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -247,7 +247,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ten test wykorzysta DirectDraw do rysowania w trybie peÅnoekranowym. Narysowany zostanie poruszajÄcy siÄ biaÅy kwadrat. KontynuowaÄ?" IDS_DDFULLSCREEN_RESULT "Czy byÅo widaÄ poruszajÄcy siÄ biaÅy kwadrat, w trybie peÅnoekranowym?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nie" IDS_D3DTEST_DESCRIPTION "Uruchomiony zostanie test interfejsu Direct3D. KontynuowaÄ?" IDS_D3DTEST_D3Dx "Test obejmie przyspieszany sprzÄtowo interfejs Direct3D dla %u." Modified: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Este teste utilizarÃ¡ DirectDraw para desenhar em tela cheia. Um retÃ¢ngulo branco em movimento serÃ¡ desenhado. Prosseguir?" IDS_DDFULLSCREEN_RESULT "VocÃª visualizou o retÃ¢ngulo branco se movendo em tela cheia?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "NÃ£o" IDS_D3DTEST_DESCRIPTION "SerÃ¡ iniciada a interface de teste do Direct3D. Prosseguir?" IDS_D3DTEST_D3Dx "Este teste utilizarÃ¡ a interface Direct3D %u com aceleraÃ§Ã£o por hardware." Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -244,7 +244,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Testul urmÄtor va utiliza DirectDraw pentru desenarea unui dreptunghi alb Ã®n miÈcare utilizÃ¢nd tot ecranul. ContinuaÈi?" IDS_DDFULLSCREEN_RESULT "Pe ecranul complet, dreptunghiul alb Ã®n miÈcare a fost vizibil?" IDS_FORMAT_ADAPTER_MEM "%u Mo" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u biÈi)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u biÈi)(%uHz)" IDS_OPTION_NO "Nu" IDS_D3DTEST_DESCRIPTION "UrmeazÄ testul de interfaÈÄ Direct3D. ContinuaÈi?" IDS_D3DTEST_D3Dx "Testul urmÄtor va utiliza interfaÈa Direct3D %u cu accelerare de echipament fizic." Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -243,7 +243,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nie" IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." Modified: trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -242,7 +242,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ky test do tÃ« pÃ«rdorÃ« DirectDraw pÃ«r tÃ« nxjerrÃ« nÃ« njÃ« buffer tÃ« paangazhuar. LÃ«vizja e drejtkÃ«ndÃ«shit tÃ« bardhÃ« duhet tÃ« vizatohet. Vazhdo?" IDS_DDFULLSCREEN_RESULT "A e shihni ju drejtkÃ«ndÃ«sh tÃ« bardhÃ« tÃ« lÃ«vizshem nÃ« ekran tÃ« plotÃ«?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "No" IDS_D3DTEST_DESCRIPTION "Kjo do tÃ« fillojÃ« ndÃ«rfaqes etestit Direct3D. Vazhdo?" IDS_D3DTEST_D3Dx "Ky test do tÃ« pÃ«rdore pjesÃ« elektronike tÃ« pÃ«rshpejtuara pÃ«r Direct3D %u ndÃ«rfaqe." Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -245,7 +245,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Denna testen kommer att anvÃ¤nda DirectDraw fÃ¶r att rita i fullskÃ¤rmslÃ¤ge. En animerad vit rektangel kommer att ritas. FortsÃ¤tta?" IDS_DDFULLSCREEN_RESULT "SÃ¥g du en vit animerad rektangel i fullskÃ¤rmslÃ¤ge?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "Nej" IDS_D3DTEST_DESCRIPTION "Detta kommer att starta Direct3D enhetstest. FortsÃ¤tt?" IDS_D3DTEST_D3Dx "Detta testet kommer att anvÃ¤nda hÃ¥rdvaruaccellererad Direct3D %u enheten." Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -240,7 +240,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± tÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte Ã§izmek iÃ§in kullanacak. Devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rmek ister misiniz?" IDS_DDFULLSCREEN_RESULT "TÃ¼m gÃ¶rÃ¼ntÃ¼lÃ¼kte devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%d*%d (%u bitlik) (%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bitlik) (%uHz)" IDS_OPTION_NO "HayÄ±r" IDS_D3DTEST_DESCRIPTION "Bu, React3D arayÃ¼z sÄ±namasÄ±nÄ± baÅlatÄ±lacak. SÃ¼rdÃ¼rmek ister misiniz?" IDS_D3DTEST_D3Dx "Bu sÄ±nama, donanÄ±m ivmeli React3D %u arayÃ¼zÃ¼nÃ¼ kullanacak." Modified: trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "Ð¦ÐµÐ¹ ÑÐµÑÑ Ð±ÑÐ´Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÐ²Ð°ÑÐ¸ DirectDraw Ð´Ð»Ñ Ð¼Ð°Ð»ÑÐ²Ð°Ð½Ð½Ñ Ð² Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑÐ°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ. ÐÐ¾Ð²Ð¸Ð½ÐµÐ½ ÑÑÑÐ°ÑÐ¸ÑÑ Ð±ÑÐ»Ð¸Ð¹ Ð¿ÑÑÐ¼Ð¾ÐºÑÑÐ½Ð¸Ðº. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_DDFULLSCREEN_RESULT "ÐÐ¸ Ð±Ð°ÑÐ¸Ð»Ð¸, ÑÐº ÑÑÑÐ°Ð²ÑÑ Ð±ÑÐ»Ð¸Ð¹ Ð¿ÑÑÐ¼Ð¾ÐºÑÑÐ½Ð¸Ðº Ð² Ð¿Ð¾Ð²Ð½Ð¾ÐµÐºÑÐ°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ?" IDS_FORMAT_ADAPTER_MEM "%u ÐÐ±" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u Ð±ÑÑ)(%uÐÑ)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u Ð±ÑÑ)(%uÐÑ)" IDS_OPTION_NO "ÐÑ" IDS_D3DTEST_DESCRIPTION "ÐÑÐ´Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð° Ð¿ÐµÑÐµÐ²ÑÑÐºÐ° ÑÐ½ÑÐµÑÑÐµÐ¹ÑÑ Direct3D. ÐÑÐ¾Ð´Ð¾Ð²Ð¶Ð¸ÑÐ¸?" IDS_D3DTEST_D3Dx "Ð¦ÐµÐ¹ ÑÐµÑÑ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Ð°Ð¿Ð°ÑÐ°ÑÐ½Ð¾-Ð¿ÑÐ¸ÑÐºÐ¾ÑÐµÐ½Ð¸Ð¹ Direct3D ÑÐ½ÑÐµÑÑÐµÐ¹Ñ %u." Modified: trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "æ¤æµè¯å°ä½¿ç¨ DirectDraw å¨å¨è¤å¹æ¨¡å¼ç»å¾ãä½ åºä¼çè§å¨ç§»å¨çç½è²ç©å½¢ãè¦ç»§ç»ï¼" IDS_DDFULLSCREEN_RESULT "ä½ å¨å¨è¤å¹æ¨¡å¼ä¸çè§å¨ç§»å¨çç½è²ç©å½¢åï¼" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "å¦" IDS_D3DTEST_DESCRIPTION "è¿å°å¯å¨ Direct3D çé¢æµè¯ãè¦ç»§ç»ï¼" IDS_D3DTEST_D3Dx "æ¤æµè¯å°ä½¿ç¨ç¡¬ä½å éç Direct3D %u çé¢ã" Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] Sun Jun 12 13:43:39 2016 @@ -246,7 +246,7 @@ IDS_DDFULLSCREEN_DESCRIPTION "æ¤æ¸¬è©¦å°ä½¿ç¨ DirectDraw å¨å¨è¢å¹æ¨¡å¼ç¹ªåãä½ ææçè¦å¨ç§»åçç½è²ç©å½¢ãè¦ç¹¼çºï¼" IDS_DDFULLSCREEN_RESULT "ä½ å¨å¨è¢å¹æ¨¡å¼ä¸çè¦å¨ç§»åçç½è²ç©å½¢åï¼" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%d x %d (%u bit)(%uHz)" IDS_OPTION_NO "å¦" IDS_D3DTEST_DESCRIPTION "éå°åå Direct3D çé¢æ¸¬è©¦ãè¦ç¹¼çºï¼" IDS_D3DTEST_D3Dx "æ¤æ¸¬è©¦å°ä½¿ç¨ç¡¬é«å éç Direct3D %u çé¢ã"

1 0

[tthompson] 71616: [NTFS] Add fixes to WriteAttribute(): -Remove erroneous check for end of run (before writing to the last run returned) -Properly dereference RealLengthWritten pointer, as reporte...
by tthompson＠svn.reactos.org 12 Jun '16

12 Jun '16

Author: tthompson Date: Sun Jun 12 04:02:52 2016 New Revision: 71616 URL: http://svn.reactos.org/svn/reactos?rev=71616&view=rev Log: [NTFS] Add fixes to WriteAttribute(): -Remove erroneous check for end of run (before writing to the last run returned) -Properly dereference RealLengthWritten pointer, as reported in CR-90 Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/mft.c [iso-8859-1] Sun Jun 12 04:02:52 2016 @@ -520,17 +520,6 @@ } else DataRunStartLCN = -1; - - if (*DataRun == 0) - { - if (Length == 0) - return STATUS_SUCCESS; - - // This code shouldn't execute, because we should have extended the allocation size - // or failed the request by now. It's just a sanity check. - DPRINT1("Encountered EOF before expected!\n"); - return STATUS_END_OF_FILE; - } } // Do we have more data to write? @@ -559,7 +548,7 @@ Length -= WriteLength; SourceBuffer += WriteLength; - RealLengthWritten += WriteLength; + *RealLengthWritten += WriteLength; // We finished this request, but there's still data in this data run. if (Length == 0 && WriteLength != DataRunLength * Vcb->NtfsInfo.BytesPerCluster)

1 0

[ekohl] 71615: [SC] Implement the qc, qdescription and qfailure commands.
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 21:24:40 2016 New Revision: 71615 URL: http://svn.reactos.org/svn/reactos?rev=71615&view=rev Log: [SC] Implement the qc, qdescription and qfailure commands. Added: trunk/reactos/base/applications/sc/qc.c (with props) trunk/reactos/base/applications/sc/qdescription.c (with props) trunk/reactos/base/applications/sc/qfailure.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -6,6 +6,9 @@ create.c delete.c print.c + qc.c + qdescription.c + qfailure.c query.c sc.c sdset.c Added: trunk/reactos/base/applications/sc/qc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/qc.c (added) +++ trunk/reactos/base/applications/sc/qc.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,190 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qc.c + * PURPOSE: Show the service configuration + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryConfig(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; + LPWSTR lpPtr; + INT nLen, i; + +#ifdef SCDBG + _tprintf(_T("service to show configuration - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceConfig = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceConfig == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig(hService, + pServiceConfig, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" TYPE : %-3lx "), pServiceConfig->dwServiceType); + switch (pServiceConfig->dwServiceType) + { + case SERVICE_KERNEL_DRIVER: + _tprintf(_T("KERNEL_DRIVER\n")); + break; + + case SERVICE_FILE_SYSTEM_DRIVER: + _tprintf(_T("FILE_SYSTEM_DRIVER\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS\n")); + break; + + case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); + break; + + case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: + _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" START_TYPE : %-3lx "), pServiceConfig->dwStartType); + switch (pServiceConfig->dwStartType) + { + case SERVICE_BOOT_START: + _tprintf(_T("BOOT_START\n")); + break; + + case SERVICE_SYSTEM_START: + _tprintf(_T("SYSTEM_START\n")); + break; + + case SERVICE_AUTO_START: + _tprintf(_T("AUTO_START\n")); + break; + + case SERVICE_DEMAND_START: + _tprintf(_T("DEMAND_START\n")); + break; + + case SERVICE_DISABLED: + _tprintf(_T("DISABLED\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" ERROR_CONTROL : %-3lx "), pServiceConfig->dwErrorControl); + switch (pServiceConfig->dwErrorControl) + { + case SERVICE_ERROR_IGNORE: + _tprintf(_T("IGNORE\n")); + break; + + case SERVICE_ERROR_NORMAL: + _tprintf(_T("NORMAL\n")); + break; + + case SERVICE_ERROR_SEVERE: + _tprintf(_T("SEVERE\n")); + break; + + case SERVICE_ERROR_CRITICAL: + _tprintf(_T("CRITICAL\n")); + break; + + default: + _tprintf(_T("\n")); + break; + } + + _tprintf(_T(" BINARY_PATH_NAME : %s\n"), pServiceConfig->lpBinaryPathName); + _tprintf(_T(" LOAD_ORDER_GROUP : %s\n"), pServiceConfig->lpLoadOrderGroup); + _tprintf(_T(" TAG : %lu\n"), pServiceConfig->dwTagId); + _tprintf(_T(" DISPLAY_NAME : %s\n"), pServiceConfig->lpDisplayName); + _tprintf(_T(" DEPENDENCIES : ")); + lpPtr = pServiceConfig->lpDependencies; + i = 0; + while (*lpPtr != _T('\0')) + { + nLen = _tcslen(lpPtr); + if (i != 0) + _tprintf(_T("\n : ")); + _tprintf(_T("%s"), lpPtr); + lpPtr = lpPtr + nLen + 1; + i++; + } + _tprintf(_T("\n")); + + _tprintf(_T(" SERVICE_START_NAME : %s\n"), pServiceConfig->lpServiceStartName); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceConfig != NULL) + HeapFree(GetProcessHeap(), 0, pServiceConfig); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/sc/qdescription.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qdesc… ============================================================================== --- trunk/reactos/base/applications/sc/qdescription.c (added) +++ trunk/reactos/base/applications/sc/qdescription.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qdescription.c + * PURPOSE: Show the service description + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryDescription(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPSERVICE_DESCRIPTION pServiceDescription = NULL; + +#ifdef SCDBG + _tprintf(_T("service to show description - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_DESCRIPTION, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceDescription = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceDescription == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)pServiceDescription, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" DESCRIPTION : %s\n"), pServiceDescription->lpDescription); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceDescription != NULL) + HeapFree(GetProcessHeap(), 0, pServiceDescription); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qdescription.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/sc/qfailure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/qfail… ============================================================================== --- trunk/reactos/base/applications/sc/qfailure.c (added) +++ trunk/reactos/base/applications/sc/qfailure.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -0,0 +1,118 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/qfailure.c + * PURPOSE: Show the service failure action + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL QueryFailure(LPCTSTR ServiceName) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + DWORD cbBytesNeeded = 0; + LPSERVICE_FAILURE_ACTIONS pServiceFailure = NULL; + INT i; + +#ifdef SCDBG + _tprintf(_T("service to show failure action - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, SERVICE_QUERY_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + NULL, + 0, + &cbBytesNeeded)) + { + if (cbBytesNeeded == 0) + { + bResult = FALSE; + goto done; + } + } + + pServiceFailure = HeapAlloc(GetProcessHeap(), 0, cbBytesNeeded); + if (pServiceFailure == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + bResult = FALSE; + goto done; + } + + if (!QueryServiceConfig2(hService, + SERVICE_CONFIG_FAILURE_ACTIONS, + (LPBYTE)pServiceFailure, + cbBytesNeeded, + &cbBytesNeeded)) + { + bResult = FALSE; + goto done; + } + + _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); + _tprintf(_T(" RESET_PERIOD : %lu seconds\n"), pServiceFailure->dwResetPeriod); + _tprintf(_T(" REBOOT_MESSAGE : %s\n"), (pServiceFailure->lpRebootMsg) ? pServiceFailure->lpRebootMsg : _T("")); + _tprintf(_T(" COMMAND_LINE : %s\n"), (pServiceFailure->lpCommand) ? pServiceFailure->lpCommand : _T("")); + _tprintf(_T(" FAILURE_ACTIONS : ")); + for (i = 0; i < pServiceFailure->cActions; i++) + { + if (i != 0) + _tprintf(_T(" ")); + switch (pServiceFailure->lpsaActions[i].Type) + { + case SC_ACTION_NONE: + continue; + + case SC_ACTION_RESTART: + _tprintf(_T("RESTART -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_REBOOT: + _tprintf(_T("REBOOT -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + case SC_ACTION_RUN_COMMAND: + _tprintf(_T("RUN_COMMAND -- Delay = %lu milliseconds.\n"), pServiceFailure->lpsaActions[i].Delay); + break; + + default: + _tprintf(_T("\n")); + break; + } + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceFailure != NULL) + HeapFree(GetProcessHeap(), 0, pServiceFailure); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/qfailure.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -208,6 +208,42 @@ else SdSetUsage(); } + else if (!lstrcmpi(Command, _T("qc"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryConfig(ServiceName); + } + else + QueryConfigUsage(); + } + else if (!lstrcmpi(Command, _T("qdescription"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryDescription(ServiceName); + } + else + QueryDescriptionUsage(); + } + else if (!lstrcmpi(Command, _T("qfailure"))) + { + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + QueryFailure(ServiceName); + } + else + QueryFailureUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -21,6 +21,9 @@ LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); BOOL SdShow(LPCTSTR ServiceName); BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); +BOOL QueryConfig(LPCTSTR ServiceName); +BOOL QueryDescription(LPCTSTR ServiceName); +BOOL QueryFailure(LPCTSTR ServiceName); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -40,5 +43,8 @@ VOID ControlUsage(VOID); VOID SdShowUsage(VOID); VOID SdSetUsage(VOID); +VOID QueryConfigUsage(VOID); +VOID QueryDescriptionUsage(VOID); +VOID QueryFailureUsage(VOID); #endif /* _SC_PCH_ */ Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Jun 11 21:24:40 2016 @@ -36,9 +36,9 @@ // "\t config : Changes the configuration of a service (persistant).\n" // "\t description : Changes the description of a service.\n" // "\t failure : Changes the actions taken by a service upon failure.\n" -// "\t qc : Queries the configuration information for a service.\n" -// "\t qdescription : Queries the description for a service.\n" -// "\t qfailure : Queries the actions taken by a service upon failure.\n" + _T("\t qc : Queries the configuration information for a service.\n") + _T("\t qdescription : Queries the description for a service.\n") + _T("\t qfailure : Queries the actions taken by a service upon failure.\n") _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") _T("\t control : Sends a control to a service.\n") @@ -194,15 +194,39 @@ VOID SdShowUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Displays a service's security descriptor in SDDL format.\n") - _T("USAGE:\n") - _T(" sc <server> sdshow <service name>\n")); + _T(" Displays a service's security descriptor in SDDL format.\n") + _T("USAGE:\n") + _T(" sc <server> sdshow <service name>\n")); } VOID SdSetUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sets a service's security descriptor.\n") - _T("USAGE:\n") - _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); -} + _T(" Sets a service's security descriptor.\n") + _T("USAGE:\n") + _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); +} + +VOID QueryConfigUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Queries the configuration information for a service.\n") + _T("USAGE:\n") + _T(" sc <server> qc [service name] <bufferSize>\n")); +} + +VOID QueryDescriptionUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Retrieves the description string of a service.\n") + _T("USAGE:\n") + _T(" sc <server> qdescription [service name] <bufferSize>\n")); +} + +VOID QueryFailureUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Retrieves the actions performed on service failure.\n") + _T("USAGE:\n") + _T(" sc <server> qfailure [service name] <bufferSize>\n")); +}

1 0

[mjansen] 71614: [APPHELP] Implement automatic stringtable generation when writing an Sdb database. CORE-10367
by mjansen＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: mjansen Date: Sat Jun 11 21:12:43 2016 New Revision: 71614 URL: http://svn.reactos.org/svn/reactos?rev=71614&view=rev Log: [APPHELP] Implement automatic stringtable generation when writing an Sdb database. CORE-10367 Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c (with props) trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h (with props) trunk/reactos/dll/appcompat/hacking.txt (with props) Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/apphelp.h trunk/reactos/dll/appcompat/apphelp/sdbapi.c trunk/reactos/dll/appcompat/apphelp/sdbpapi.h trunk/reactos/dll/appcompat/apphelp/sdbtypes.h trunk/reactos/dll/appcompat/apphelp/sdbwrite.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -5,9 +5,10 @@ apphelp.c layer.c sdbapi.c + sdbfileattr.c sdbread.c + sdbstringtable.c sdbwrite.c - sdbfileattr.c apphelp.spec apphelp.h ${CMAKE_CURRENT_BINARY_DIR}/apphelp_stubs.c) Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -50,26 +50,11 @@ }; } ATTRINFO, *PATTRINFO; -typedef enum _SHIM_LOG_LEVEL { - SHIM_ERR = 1, - SHIM_WARN = 2, - SHIM_INFO = 3, -}SHIM_LOG_LEVEL; - /* apphelp.c */ -BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); -extern ULONG g_ShimDebugLevel; - -#define SHIM_ERR(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) -#define SHIM_WARN(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) -#define SHIM_INFO(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) - #include "sdbpapi.h" PWSTR SdbpStrDup(LPCWSTR string); -BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); -BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type); void WINAPI SdbCloseDatabase(PDB); Modified: trunk/reactos/dll/appcompat/apphelp/sdbapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdba… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbapi.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -23,6 +23,7 @@ #include "ntndk.h" #include "strsafe.h" #include "apphelp.h" +#include "sdbstringtable.h" #include "wine/unicode.h" @@ -228,9 +229,6 @@ InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, NULL, NULL); - //Status = NtCreateFile(&db->file, FILE_GENERIC_READ | SYNCHRONIZE, - // &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - // FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); Status = NtCreateFile(&db->file, (write ? FILE_GENERIC_WRITE : FILE_GENERIC_READ )| SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, write ? FILE_SUPERSEDE : FILE_OPEN, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); @@ -454,6 +452,10 @@ if (db->file) NtClose(db->file); + if (db->string_buffer) + SdbCloseDatabase(db->string_buffer); + if (db->string_lookup) + SdbpTableDestroy(&db->string_lookup); SdbFree(db->data); SdbFree(db); } Modified: trunk/reactos/dll/appcompat/apphelp/sdbpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbp… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbpapi.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -68,6 +68,22 @@ DWORD SdbpStrlen(PCWSTR string); DWORD SdbpStrsize(PCWSTR string); +BOOL WINAPI SdbpCheckTagType(TAG tag, WORD type); +BOOL WINAPI SdbpCheckTagIDType(PDB db, TAGID tagid, WORD type); + + +typedef enum _SHIM_LOG_LEVEL { + SHIM_ERR = 1, + SHIM_WARN = 2, + SHIM_INFO = 3, +} SHIM_LOG_LEVEL; + +BOOL WINAPIV ShimDbgPrint(SHIM_LOG_LEVEL Level, PCSTR FunctionName, PCSTR Format, ...); +extern ULONG g_ShimDebugLevel; + +#define SHIM_ERR(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_ERR, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_WARN(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_WARN, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) +#define SHIM_INFO(fmt, ...) do { if (g_ShimDebugLevel) ShimDbgPrint(SHIM_INFO, __FUNCTION__, fmt, ##__VA_ARGS__ ); } while (0) #ifdef __cplusplus } // extern "C" Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,157 @@ +/* + * Copyright 2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if !defined(SDBWRITE_HOSTTOOL) +#define WIN32_NO_STATUS +#include "windows.h" +#include "sdbtypes.h" +#include "sdbpapi.h" +#else /* !defined(SDBWRITE_HOSTTOOL) */ +#include <typedefs.h> +#include "sdbtypes.h" +#include "sdbpapi.h" +#endif /* !defined(SDBWRITE_HOSTTOOL) */ + +#include "sdbstringtable.h" + +#define DEFAULT_TABLE_SIZE 0x100 + +typedef struct SdbHashEntry +{ + struct SdbHashEntry* Next; + TAGID Tagid; + WCHAR Name[1]; +} SdbHashEntry; + +struct SdbStringHashTable +{ + DWORD Size; + struct SdbHashEntry** Entries; +}; + + +static struct SdbStringHashTable* HashCreate(void) +{ + struct SdbStringHashTable* tab = SdbAlloc(sizeof(*tab)); + if (!tab) + { + SHIM_ERR("Failed to allocate 8 bytes.\r\n"); + return tab; + } + tab->Size = DEFAULT_TABLE_SIZE; + tab->Entries = SdbAlloc(tab->Size * sizeof(*tab->Entries)); + return tab; +} + + +void SdbpTableDestroy(struct SdbStringHashTable** pTable) +{ + struct SdbStringHashTable* table = *pTable; + struct SdbHashEntry* entry, *next; + DWORD n, depth = 0, once = 1; + + *pTable = NULL; + for (n = 0; n < table->Size; ++n) + { + depth = 0; + entry = next = table->Entries[n]; + while (entry) + { + next = entry->Next; + SdbFree(entry); + entry = next; + depth++; + } + if (once && depth > 3) + { + // warn + once = 0; + } + } + SdbFree(table->Entries); + SdbFree(table); +} + +/* Based on RtlHashUnicodeString */ +static DWORD StringHash(const WCHAR* str) +{ + DWORD hash = 0; + for (; *str; str++) + { + hash = ((65599 * hash) + (ULONG)(*str)); + } + return hash; +} + +static struct SdbHashEntry** TableFindPtr(struct SdbStringHashTable* table, const WCHAR* str) +{ + DWORD hash = StringHash(str); + struct SdbHashEntry** entry = &table->Entries[hash % table->Size]; + while (*entry) + { + if (!wcscmp((*entry)->Name, str)) + return entry; + entry = &(*entry)->Next; + } + return entry; +} + +static BOOL HashAddString(struct SdbStringHashTable* table, struct SdbHashEntry** position, const WCHAR* str, TAGID tagid) +{ + struct SdbHashEntry* entry; + SIZE_T size; + + if (!position) + position = TableFindPtr(table, str); + + size = offsetof(struct SdbHashEntry, Name[SdbpStrlen(str) + 2]); + entry = (*position) = SdbAlloc(size); + if (!entry) + { + SHIM_ERR("Failed to allocate %u bytes.", size); + return FALSE; + } + entry->Tagid = tagid; + wcscpy(entry->Name, str); + return TRUE; +} + + +BOOL SdbpAddStringToTable(struct SdbStringHashTable** table, const WCHAR* str, TAGID* tagid) +{ + struct SdbHashEntry** entry; + + if (!*table) + { + *table = HashCreate(); + if (!*table) + { + SHIM_ERR("Error creating hash table\n"); + return FALSE; + } + } + + entry = TableFindPtr(*table, str); + if (*entry) + { + *tagid = (*entry)->Tagid; + return FALSE; + } + return HashAddString(*table, entry, str, *tagid); +} + Propchange: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbs… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h (added) +++ trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,57 @@ +/* + * Copyright 2016 Mark Jansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef SDBSTRINGTABLE_H +#define SDBSTRINGTABLE_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * Destroy the hashtable and release all resources. + * + * @param [in] table Pointer to table pointer, will be cleared after use + * + */ +void SdbpTableDestroy(struct SdbStringHashTable* * table); + +/** + * Find an entry in the stringtable, or allocate it when an entry could not be found. + * - When the string specified does not yet exist, a new entry will be added to the table, + * and the pTagid specified will be associated with this string. + * - When the string specified does already exist, + * the TAGID associated with this string will be returned in pTagid. + * + * + * @param [in] table Pointer to table pointer, will be allocated when needed. + * @param [in] str The string to search for + * @param [in,out] pTagid + * the data written (in bytes) + * + * @return TRUE if the string was added to the table, FALSE if it already existed + */ +BOOL SdbpAddStringToTable(struct SdbStringHashTable* * table, const WCHAR* str, TAGID* pTagid); + + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // SDBSTRINGTABLE_H Propchange: trunk/reactos/dll/appcompat/apphelp/sdbstringtable.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/appcompat/apphelp/sdbtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbt… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbtypes.h [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -39,6 +39,8 @@ TAGID stringtable; DWORD write_iter; GUID database_id; + struct SdbStringHashTable* string_lookup; + struct _DB* string_buffer; } DB, *PDB; typedef enum _PATH_TYPE { Modified: trunk/reactos/dll/appcompat/apphelp/sdbwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbw… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbwrite.c [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -1,6 +1,6 @@ /* - * Copyright 2011 André Hentschel - * Copyright 2013 Mislav Blaevic + * Copyright 2011 AndrÃ© Hentschel + * Copyright 2013 Mislav BlaÅ¾eviÄ * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or @@ -19,27 +19,28 @@ */ #if !defined(SDBWRITE_HOSTTOOL) - #define WIN32_NO_STATUS #include "windows.h" #include "ntndk.h" -#include "apphelp.h" -#include "wine/unicode.h" - #else - #include <typedefs.h> #include <guiddef.h> +#endif #include "sdbtypes.h" #include "sdbpapi.h" #include "sdbtagid.h" - -#endif - +#include "sdbstringtable.h" + + +/* Local functions */ BOOL WINAPI SdbWriteStringRefTag(PDB db, TAG tag, TAGID tagid); +BOOL WINAPI SdbWriteStringTag(PDB db, TAG tag, LPCWSTR string); TAGID WINAPI SdbBeginWriteListTag(PDB db, TAG tag); BOOL WINAPI SdbEndWriteListTag(PDB db, TAGID tagid); + +/* sdbapi.c */ +void WINAPI SdbCloseDatabase(PDB); static void WINAPI SdbpWrite(PDB db, const void* data, DWORD size) @@ -57,19 +58,35 @@ static BOOL WINAPI SdbpGetOrAddStringRef(PDB db, LPCWSTR string, TAGID* tagid) { - /* TODO: - - Insert or find in stringtable - - return TAGID - */ - - return FALSE; -} - -static void WINAPI SdbpWriteStringtable(PDB db) -{ - TAGID table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); - /* TODO: Write out all strings*/ - SdbEndWriteListTag(db, table); + PDB buf = db->string_buffer; + if (db->string_buffer == NULL) + { + db->string_buffer = buf = SdbpAlloc(sizeof(DB)); + if (buf == NULL) + return FALSE; + buf->size = 128; + buf->data = SdbAlloc(buf->size); + if (buf->data == NULL) + return FALSE; + } + + *tagid = buf->write_iter + sizeof(TAG) + sizeof(DWORD); + if (SdbpAddStringToTable(&db->string_lookup, string, tagid)) + return SdbWriteStringTag(buf, TAG_STRINGTABLE_ITEM, string); + + return db->string_lookup != NULL; +} + +static BOOL WINAPI SdbpWriteStringtable(PDB db) +{ + TAGID table; + PDB buf = db->string_buffer; + if (buf == NULL || db->string_lookup == NULL) + return FALSE; + + table = SdbBeginWriteListTag(db, TAG_STRINGTABLE); + SdbpWrite(db, buf->data, buf->write_iter); + return SdbEndWriteListTag(db, table); } /** Added: trunk/reactos/dll/appcompat/hacking.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/hacking.txt?… ============================================================================== --- trunk/reactos/dll/appcompat/hacking.txt (added) +++ trunk/reactos/dll/appcompat/hacking.txt [iso-8859-1] Sat Jun 11 21:12:43 2016 @@ -0,0 +1,23 @@ + +Set the environment variable 'SHIM_DEBUG_LEVEL' to '4' before loading apphelp.dll for debug info related to loading / matching modules. +The environment variable 'SHIMENG_DEBUG_LEVEL' is related to the hooking code. + + +When there is not enough debug output, force memory allocations to fail: + +pSdbCreateDatabase + [Err ][SdbpCreateFile ] Failed to convert DOS path "TEST1.SDB" + [Err ][SdbCreateDatabase ] Failed to create the database. + [Err ][SdbpWriteBufferedData] Failed to allocate 65548 bytes. + +pSdbWriteStringTag + [Err ][SdbpAddStringToTable] Error Gettting temp path 0x8 + [Err ][SdbpCreateFile ] Failed to convert DOS path "C:\Users\MAE67~1.JAN\AppData\Local\Temp\SDBAB16.tmp" + [Err ][SdbpAddStringToTable] Error copying string table temp filename + [Err ][HashCreate ] Failed to allocate 8 bytes. + [Err ][SdbpAddStringToTable] Error creating hash table + [Err ][HashAddString ] Failed to allocate 22 bytes. + +pSdbCloseDatabaseWrite + [Err ][SdbCloseDatabase ] Failed to close the file. + [Err ][SdbpDeleteFile ] Failed to convert DOS path "C:\Users\MAE67~1.JAN\AppData\Local\Temp\SDBAB2D.tmp" Propchange: trunk/reactos/dll/appcompat/hacking.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 71613: [PIFMGR]: Add the PIF icon resource library. By Jared Smudde, Lee Schroeder, Ercan Ersoy, manuel. Icons adapted from Tango Icon set and from public domain OpenClipArt (https://ope...
by hbelusca＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: hbelusca Date: Sat Jun 11 16:16:26 2016 New Revision: 71613 URL: http://svn.reactos.org/svn/reactos?rev=71613&view=rev Log: [PIFMGR]: Add the PIF icon resource library. By Jared Smudde, Lee Schroeder, Ercan Ersoy, manuel. Icons adapted from Tango Icon set and from public domain OpenClipArt (https://openclipart.org/share) Part 1/2 CORE-10253 Added: trunk/reactos/subsystems/mvdm/pifmgr/ trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/pifmgr/README.txt (with props) trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/ trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico (with props) trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico (with props) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -5,6 +5,7 @@ add_subdirectory(config) add_subdirectory(dos) add_subdirectory(ntvdm) +add_subdirectory(pifmgr) if(ARCH STREQUAL "i386") add_subdirectory(samples) endif() Added: trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/CMa… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,6 @@ + +file(GLOB pifmgr_rc_deps res/*.*) +add_rc_deps(pifmgr.rc ${pifmgr_rc_deps}) +add_library(pifmgr SHARED pifmgr.rc) +set_module_type(pifmgr win32dll UNICODE ENTRYPOINT 0) +add_cd_file(TARGET pifmgr DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/subsystems/mvdm/pifmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/REA… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/README.txt (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/README.txt [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,38 @@ + +Most icons are from the Tango icon set. The other ones come from: + +OpenClipArt license: https://openclipart.org/share + + +DOS icon +https://commons.wikimedia.org/wiki/File:Contrived_MS-DOS_logo.svg + +Umbrella, based on +https://openclipart.org/detail/226065/open-umbrella + +Cube icon, based on +https://openclipart.org/detail/168258/3d-cube-icon + +Beach ball, based on +https://openclipart.org/detail/172888/simple-beach-ball + +Column +https://openclipart.org/detail/25388/architetto-capitello-modanatura + +Domino +https://openclipart.org/detail/3525/domino-set-15 + +Race flag +https://openclipart.org/detail/62779/wavy-checkered-flag + +Semaphore, based on +https://openclipart.org/detail/66427/traffic-semaphore-red-light +https://openclipart.org/detail/66433/traffic-semaphore-yellow-light +https://openclipart.org/detail/66421/traffic-semaphore-green-light + +Crossed swords +https://openclipart.org/detail/3058/crossed-swords + +Shield and sword, based on +Tango shield icon, and +https://openclipart.org/detail/22432/toy-sword Propchange: trunk/reactos/subsystems/mvdm/pifmgr/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/pif… ============================================================================== --- trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc (added) +++ trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc [iso-8859-1] Sat Jun 11 16:16:26 2016 @@ -0,0 +1,50 @@ +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS PIF Manager Icon Resource Library" +#define REACTOS_STR_INTERNAL_NAME "pifmgr" +#define REACTOS_STR_ORIGINAL_FILENAME "pifmgr.dll" +#include <reactos/version.rc> + +/* Icons */ +1 ICON "res/01.ico" +2 ICON "res/02.ico" +3 ICON "res/03.ico" +4 ICON "res/04.ico" +5 ICON "res/00.ico" +6 ICON "res/06.ico" +7 ICON "res/00.ico" +8 ICON "res/08.ico" +9 ICON "res/09.ico" +/* No icon 10 */ +11 ICON "res/11.ico" +12 ICON "res/00.ico" +13 ICON "res/13.ico" +14 ICON "res/14.ico" +15 ICON "res/15.ico" +16 ICON "res/00.ico" +17 ICON "res/00.ico" +18 ICON "res/00.ico" +19 ICON "res/00.ico" +20 ICON "res/00.ico" +21 ICON "res/00.ico" +22 ICON "res/00.ico" +23 ICON "res/00.ico" +24 ICON "res/24.ico" +25 ICON "res/25.ico" +26 ICON "res/00.ico" +27 ICON "res/00.ico" +28 ICON "res/00.ico" +29 ICON "res/29.ico" +30 ICON "res/00.ico" +31 ICON "res/00.ico" +32 ICON "res/32.ico" +33 ICON "res/33.ico" +34 ICON "res/00.ico" +35 ICON "res/00.ico" +36 ICON "res/36.ico" +37 ICON "res/37.ico" +38 ICON "res/00.ico" +39 ICON "res/00.ico" Propchange: trunk/reactos/subsystems/mvdm/pifmgr/pifmgr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/00.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/01.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/02.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/03.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/04.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/06.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/08.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/09.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/11.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/13.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/14.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/15.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/24.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/25.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/29.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/32.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/33.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/36.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/pifmgr/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/subsystems/mvdm/pifmgr/res/37.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[ekohl] 71612: [SC] Implement the sdset command.
by ekohl＠svn.reactos.org 11 Jun '16

11 Jun '16

Author: ekohl Date: Sat Jun 11 15:01:01 2016 New Revision: 71612 URL: http://svn.reactos.org/svn/reactos?rev=71612&view=rev Log: [SC] Implement the sdset command. Added: trunk/reactos/base/applications/sc/sdset.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/sc.c trunk/reactos/base/applications/sc/sc.h trunk/reactos/base/applications/sc/usage.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -8,6 +8,7 @@ print.c query.c sc.c + sdset.c sdshow.c start.c usage.c Modified: trunk/reactos/base/applications/sc/sc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.c?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -191,6 +191,23 @@ else SdShowUsage(); } + else if (!lstrcmpi(Command, _T("sdset"))) + { + LPCTSTR SecurityDescriptor; + + if (ArgCount > 1) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + SecurityDescriptor = *ServiceArgs++; + ArgCount--; + + SdSet(ServiceName, SecurityDescriptor); + } + else + SdSetUsage(); + } else { MainUsage(); Modified: trunk/reactos/base/applications/sc/sc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.h?… ============================================================================== --- trunk/reactos/base/applications/sc/sc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.h [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -20,6 +20,7 @@ LPSERVICE_STATUS_PROCESS QueryService(LPCTSTR ServiceName); BOOL SdShow(LPCTSTR ServiceName); +BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); /* print and error functions */ VOID PrintService(LPCTSTR ServiceName, LPSERVICE_STATUS_PROCESS pStatus, BOOL bExtended); @@ -38,5 +39,6 @@ VOID CreateUsage(VOID); VOID ControlUsage(VOID); VOID SdShowUsage(VOID); +VOID SdSetUsage(VOID); #endif /* _SC_PCH_ */ Added: trunk/reactos/base/applications/sc/sdset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sdset… ============================================================================== --- trunk/reactos/base/applications/sc/sdset.c (added) +++ trunk/reactos/base/applications/sc/sdset.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/sdset.c + * PURPOSE: Set a service security descriptor + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SdSet(LPCTSTR ServiceName, LPCTSTR StringSecurityDescriptor) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + ULONG ulSecurityDescriptorSize = 0; + PSECURITY_DESCRIPTOR pSecurityDescriptor = NULL; + +#ifdef SCDBG + _tprintf(_T("service to set sd - %s\n\n"), ServiceName); +#endif + + hManager = OpenSCManager(NULL, + NULL, + SC_MANAGER_CONNECT); + if (hManager == NULL) + { + bResult = FALSE; + goto done; + } + + hService = OpenService(hManager, ServiceName, WRITE_DAC); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + if (!ConvertStringSecurityDescriptorToSecurityDescriptor(StringSecurityDescriptor, + SDDL_REVISION_1, + &pSecurityDescriptor, + &ulSecurityDescriptorSize)) + { + bResult = FALSE; + goto done; + } + + if (!SetServiceObjectSecurity(hService, + DACL_SECURITY_INFORMATION, + pSecurityDescriptor)) + { + bResult = FALSE; + goto done; + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pSecurityDescriptor != NULL) + LocalFree(pSecurityDescriptor); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/sdset.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… ============================================================================== --- trunk/reactos/base/applications/sc/usage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/usage.c [iso-8859-1] Sat Jun 11 15:01:01 2016 @@ -42,8 +42,8 @@ _T("\t delete : Deletes a service (from the registry).\n") _T("\t create : Creates a service. (adds it to the registry).\n") _T("\t control : Sends a control to a service.\n") - _T("\t sdshow : Displays a service's security descriptor.\n")); -// "\t sdset : Sets a service's security descriptor.\n") + _T("\t sdshow : Displays a service's security descriptor.\n") + _T("\t sdset : Sets a service's security descriptor.\n")); // "\t GetDisplayName : Gets the DisplayName for a service.\n") // "\t GetKeyName : Gets the ServiceKeyName for a service.\n") // "\t EnumDepend : Enumerates Service Dependencies.\n") @@ -198,3 +198,11 @@ _T("USAGE:\n") _T(" sc <server> sdshow <service name>\n")); } + +VOID SdSetUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Sets a service's security descriptor.\n") + _T("USAGE:\n") + _T(" sc <server> sdset <service name> <SD in SDDL format>\n")); +}

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