Ros-diffs June 2016

ros-diffs@reactos.org

17 participants
228 discussions

[ekohl] 71628: [SC] Merge the description functions into a single file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 12 20:12:15 2016 New Revision: 71628 URL: http://svn.reactos.org/svn/reactos?rev=71628&view=rev Log: [SC] Merge the description functions into a single file. Removed: trunk/reactos/base/applications/sc/qdescription.c Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/description.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] Sun Jun 12 20:12:15 2016 @@ -8,7 +8,6 @@ description.c print.c qc.c - qdescription.c qfailure.c query.c sc.c Modified: trunk/reactos/base/applications/sc/description.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/descr… ============================================================================== --- trunk/reactos/base/applications/sc/description.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/description.c [iso-8859-1] Sun Jun 12 20:12:15 2016 @@ -2,12 +2,92 @@ * PROJECT: ReactOS Services * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/sc/description.c - * PURPOSE: Change the service description + * PURPOSE: Query/Set 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) ? pServiceDescription->lpDescription : _T("")); + +done: + if (bResult == FALSE) + ReportLastError(); + + if (pServiceDescription != NULL) + HeapFree(GetProcessHeap(), 0, pServiceDescription); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} + BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description) { Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/qdescription.c (removed) @@ -1,89 +0,0 @@ -/* - * 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) ? pServiceDescription->lpDescription : _T("")); - -done: - if (bResult == FALSE) - ReportLastError(); - - if (pServiceDescription != NULL) - HeapFree(GetProcessHeap(), 0, pServiceDescription); - - if (hService) - CloseServiceHandle(hService); - - if (hManager) - CloseServiceHandle(hManager); - - return bResult; -}

8 years, 5 months

[ekohl] 71627: [SC] - Add the 'description' command. - Fix a little display bug in the 'qdescription' command: Do not print '(null)' if the service does not have a description.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 12 19:18:15 2016 New Revision: 71627 URL: http://svn.reactos.org/svn/reactos?rev=71627&view=rev Log: [SC] - Add the 'description' command. - Fix a little display bug in the 'qdescription' command: Do not print '(null)' if the service does not have a description. Added: trunk/reactos/base/applications/sc/description.c (with props) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/sc/qdescription.c 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] Sun Jun 12 19:18:15 2016 @@ -5,6 +5,7 @@ control.c create.c delete.c + description.c print.c qc.c qdescription.c Added: trunk/reactos/base/applications/sc/description.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/descr… ============================================================================== --- trunk/reactos/base/applications/sc/description.c (added) +++ trunk/reactos/base/applications/sc/description.c [iso-8859-1] Sun Jun 12 19:18:15 2016 @@ -0,0 +1,60 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/sc/description.c + * PURPOSE: Change the service description + * COPYRIGHT: Copyright 2016 Eric Kohl + * + */ + +#include "sc.h" + +BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description) +{ + SC_HANDLE hManager = NULL; + SC_HANDLE hService = NULL; + BOOL bResult = TRUE; + SERVICE_DESCRIPTION ServiceDescription; + +#ifdef SCDBG + _tprintf(_T("service to set 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_CHANGE_CONFIG); + if (hService == NULL) + { + bResult = FALSE; + goto done; + } + + ServiceDescription.lpDescription = (LPTSTR)Description; + + if (!ChangeServiceConfig2(hService, + SERVICE_CONFIG_DESCRIPTION, + (LPBYTE)&ServiceDescription)) + { + bResult = FALSE; + goto done; + } + +done: + if (bResult == FALSE) + ReportLastError(); + + if (hService) + CloseServiceHandle(hService); + + if (hManager) + CloseServiceHandle(hManager); + + return bResult; +} Propchange: trunk/reactos/base/applications/sc/description.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/qdescription.c [iso-8859-1] Sun Jun 12 19:18:15 2016 @@ -69,7 +69,8 @@ } _tprintf(_T("SERVICE_NAME: %s\n"), ServiceName); - _tprintf(_T(" DESCRIPTION : %s\n"), pServiceDescription->lpDescription); + _tprintf(_T(" DESCRIPTION : %s\n"), + (pServiceDescription->lpDescription) ? pServiceDescription->lpDescription : _T("")); done: if (bResult == FALSE) 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] Sun Jun 12 19:18:15 2016 @@ -244,6 +244,26 @@ else QueryFailureUsage(); } + else if (!lstrcmpi(Command, _T("description"))) + { + LPCTSTR Description = NULL; + + if (ArgCount > 0) + { + ServiceName = *ServiceArgs++; + ArgCount--; + + if (ArgCount > 0) + { + Description = *ServiceArgs++; + ArgCount--; + } + + SetDescription(ServiceName, Description); + } + else + SetDescriptionUsage(); + } 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] Sun Jun 12 19:18:15 2016 @@ -23,6 +23,7 @@ BOOL SdSet(LPCTSTR ServiceName, LPCTSTR SecurityDescriptor); BOOL QueryConfig(LPCTSTR ServiceName); BOOL QueryDescription(LPCTSTR ServiceName); +BOOL SetDescription(LPCTSTR ServiceName, LPCTSTR Description); BOOL QueryFailure(LPCTSTR ServiceName); /* print and error functions */ @@ -46,5 +47,6 @@ VOID QueryConfigUsage(VOID); VOID QueryDescriptionUsage(VOID); VOID QueryFailureUsage(VOID); +VOID SetDescriptionUsage(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] Sun Jun 12 19:18:15 2016 @@ -34,7 +34,7 @@ _T("\t continue : Sends a CONTINUE control request to a service.\n") _T("\t stop : Sends a STOP request to a service.\n") // "\t config : Changes the configuration of a service (persistant).\n" -// "\t description : Changes the description of a service.\n" + _T("\t description : Changes the description of a service.\n") // "\t failure : Changes 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") @@ -230,3 +230,11 @@ _T("USAGE:\n") _T(" sc <server> qfailure [service name] <bufferSize>\n")); } + +VOID SetDescriptionUsage(VOID) +{ + _tprintf(_T("DESCRIPTION:\n") + _T(" Sets the description string of a service.\n") + _T("USAGE:\n") + _T(" sc <server> description [service name] [description]\n")); +}

8 years, 5 months

[ekohl] 71626: [ADVAPI32] Implement I_ScGetCurrentGroupStateW.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 12 17:48:09 2016 New Revision: 71626 URL: http://svn.reactos.org/svn/reactos?rev=71626&view=rev Log: [ADVAPI32] Implement I_ScGetCurrentGroupStateW. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Jun 12 17:48:09 2016 @@ -1,4 +1,4 @@ -1 stub I_ScGetCurrentGroupStateW +1 stdcall I_ScGetCurrentGroupStateW(ptr wstr ptr) 2 stdcall A_SHAFinal(ptr ptr) 3 stdcall A_SHAInit(ptr) 4 stdcall A_SHAUpdate(ptr ptr long) Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Jun 12 17:48:09 2016 @@ -1675,6 +1675,42 @@ /********************************************************************** + * I_ScGetCurrentGroupStateW + * + * @implemented + */ +DWORD WINAPI +I_ScGetCurrentGroupStateW(SC_HANDLE hSCManager, + LPWSTR pszGroupName, + LPDWORD pdwGroupState) +{ + DWORD dwError; + + TRACE("I_ScGetCurrentGroupStateW() called\n"); + + RpcTryExcept + { + dwError = RI_ScGetCurrentGroupStateW((SC_RPC_HANDLE)hSCManager, + pszGroupName, + pdwGroupState); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept + + if (dwError != ERROR_SUCCESS) + { + TRACE("RI_ScGetCurrentGroupStateW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + } + + return dwError; +} + + +/********************************************************************** * LockServiceDatabase * * @implemented

8 years, 5 months

[dreimer] 71625: [RAPPS] Fix Burnaware hash CORE-11190 #resolve #comment Fixed, thx ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jun 12 17:37:39 2016 New Revision: 71625 URL: http://svn.reactos.org/svn/reactos?rev=71625&view=rev Log: [RAPPS] Fix Burnaware hash CORE-11190 #resolve #comment Fixed, thx ^^ Modified: trunk/reactos/media/rapps/burnawarefree.txt Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… ============================================================================== --- trunk/reactos/media/rapps/burnawarefree.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/burnawarefree.txt [iso-8859-1] Sun Jun 12 17:37:39 2016 @@ -1,18 +1,18 @@ [Section] Name = BurnAware Free -Version = 9.1 +Version = 9.2 License = Freeware for non-commercial uses Description = Full-featured and free burning software to create CD, DVD and Blu-ray discs of all types. -Size = 8.6 MiB +Size = 9.4 MiB Category = 12 URLSite = http://www.burnaware.com/ -URLDownload = http://www.burnaware.com/downloads/burnaware_free.exe -SHA1 = de11fbf606dd75b7d4c936133fbe9ad205d58781 +URLDownload = http://www.burnaware.com/downloads/burnaware_free_9.2.exe +SHA1 = 5e89f51ed6ec3c92f40dac107db319083153d6a3 CDPath = none [Section.0407] Description = Freie Brennsoftware mit vollem Funktionsumfang, um CDs, DVDs und Blu-Ray Disks aller Arten zu erstellen. -Size = 8,6 MiB +Size = 9,4 MiB [Section.0a] Description = Completa suite de grabaciÃ³n gratuita con la que crear CDs, DVDs y BluRay de todo tipo. @@ -21,13 +21,13 @@ Name = BurnAware Gratuit License = Gratuit pentru uz necomercial Description = Program de inscripÈionare gratuit, complet, pentru discuri CD, DVD Èi Blue-ray de toate tipurile. -Size = 8,6 Mio +Size = 9,4 Mio [Section.041f] Name = BurnAware Ãcretsiz License = Tecimlik olmayan kullanÄ±mlar iÃ§in Ã¼cretsiz Description = CD, DVD ve Blu-ray disklerinin tÃ¼m tÃ¼rlerini oluÅturmak iÃ§in eksiksiz husÃ»siyetli ve Ã¼cretsiz bir CD, DVD ve Blu-ray yazma yazÄ±lÄ±mÄ±dÄ±r. -Size = 8,6 MiB +Size = 9,4 MiB [Section.0804] Description = BurnAware æ¯å¨åè½ååè´¹çå»å½è½¯ä»¶æ¥åå»º CDã DVD åèååççææç±»åã

8 years, 5 months

[dreimer] 71624: [RAPPS] Wrong version in Free Stopwatch entry. CORE-11198 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jun 12 17:04:13 2016 New Revision: 71624 URL: http://svn.reactos.org/svn/reactos?rev=71624&view=rev Log: [RAPPS] Wrong version in Free Stopwatch entry. CORE-11198 #resolve Modified: trunk/reactos/media/rapps/freestopwatch.txt Modified: trunk/reactos/media/rapps/freestopwatch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freestopwatch.… ============================================================================== --- trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/freestopwatch.txt [iso-8859-1] Sun Jun 12 17:04:13 2016 @@ -1,6 +1,6 @@ -[Section] +ï»¿[Section] Name = Free Stopwatch -Version = 3.0.2 +Version = 4.0 License = Freeware Description = A flexible digital stopwatch software. Size = 1.5 MiB

8 years, 5 months

[hbelusca] 71623: [ROSTEST:PAINTDESKTOP]: Improve the test: don't force complete redraw when resizing the window, and return a non-zero value from WM_ERASEBKGD if the PaintDesktop call succeeded.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 12 16:48:25 2016 New Revision: 71623 URL: http://svn.reactos.org/svn/reactos?rev=71623&view=rev Log: [ROSTEST:PAINTDESKTOP]: Improve the test: don't force complete redraw when resizing the window, and return a non-zero value from WM_ERASEBKGD if the PaintDesktop call succeeded. Modified: trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c Modified: 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 [iso-8859-1] (original) +++ trunk/rostests/win32/user32/paintdesktop/PaintDesktop.c [iso-8859-1] Sun Jun 12 16:48:25 2016 @@ -46,7 +46,7 @@ { WNDCLASS wc; - wc.style = CS_HREDRAW | CS_VREDRAW; + wc.style = 0; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -87,8 +87,7 @@ break; case WM_ERASEBKGND: - PaintDesktop((HDC)wParam); - break; + return (LRESULT)PaintDesktop((HDC)wParam); case WM_DESTROY: PostQuitMessage(0);

8 years, 5 months

[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

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

8 years, 5 months

[hbelusca] 71621: [NETSHELL]: Update russian translation by "leha-bot" and "amber". CORE-11392

by hbelusca＠svn.reactos.org

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

8 years, 5 months

[hbelusca] 71620: [DEVMGR]: Update russian translation by "leha-bot" and "amber". CORE-11392

by hbelusca＠svn.reactos.org

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

8 years, 5 months

[hbelusca] 71619: [DXDIAG]: Update russian translation by "leha-bot" and "amber". CORE-11392

by hbelusca＠svn.reactos.org

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 Ñ Ð°Ð¿Ð¿Ð°ÑÐ°ÑÐ½ÑÐ¼ ÑÑÐºÐ¾ÑÐµÐ½Ð¸ÐµÐ¼."

8 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2016