Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66563: Whitespace fixes only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 4 21:37:35 2015 New Revision: 66563 URL: http://svn.reactos.org/svn/reactos?rev=66563&view=rev Log: Whitespace fixes only. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Mar 4 21:37:35 2015 @@ -264,7 +264,7 @@ /* Get the users token */ hProcess = OpenProcess(PROCESS_ALL_ACCESS, TRUE, ProcessId); - if(!hProcess) + if (!hProcess) { DPRINT1("OpenProcess failed with error %u\n", GetLastError()); goto cleanup; @@ -276,7 +276,7 @@ hUserToken = NULL; } - if(!OpenProcessToken(hProcess, TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, &hUserToken)) + if (!OpenProcessToken(hProcess, TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY, &hUserToken)) { DPRINT1("OpenProcessToken failed with error %u\n", GetLastError()); goto cleanup; @@ -289,7 +289,7 @@ ReturnValue = CR_SUCCESS; cleanup: - if(hProcess) + if (hProcess) CloseHandle(hProcess); return ReturnValue; @@ -1131,9 +1131,10 @@ DPRINT("PNP_GetClassName() called\n"); lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class\\"); - if(lstrlenW(pszClassGuid) + 1 < sizeof(szKeyName)/sizeof(WCHAR)-(lstrlenW(szKeyName) * sizeof(WCHAR))) + if (lstrlenW(pszClassGuid) + 1 < sizeof(szKeyName)/sizeof(WCHAR)-(lstrlenW(szKeyName) * sizeof(WCHAR))) lstrcatW(szKeyName, pszClassGuid); - else return CR_INVALID_DATA; + else + return CR_INVALID_DATA; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName, @@ -3068,7 +3069,7 @@ wcscat(PipeName, UuidString); hPipe = CreateNamedPipeW(PipeName, PIPE_ACCESS_OUTBOUND, PIPE_TYPE_BYTE, 1, 512, 512, 0, NULL); - if(hPipe == INVALID_HANDLE_VALUE) + if (hPipe == INVALID_HANDLE_VALUE) { DPRINT1("CreateNamedPipeW failed with error %u\n", GetLastError()); goto cleanup; @@ -3081,16 +3082,16 @@ ZeroMemory(&StartupInfo, sizeof(StartupInfo)); StartupInfo.cb = sizeof(StartupInfo); - if(hUserToken) + if (hUserToken) { /* newdev has to run under the environment of the current user */ - if(!CreateEnvironmentBlock(&Environment, hUserToken, FALSE)) + if (!CreateEnvironmentBlock(&Environment, hUserToken, FALSE)) { DPRINT1("CreateEnvironmentBlock failed with error %d\n", GetLastError()); goto cleanup; } - if(!CreateProcessAsUserW(hUserToken, NULL, CommandLine, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, Environment, NULL, &StartupInfo, &ProcessInfo)) + if (!CreateProcessAsUserW(hUserToken, NULL, CommandLine, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, Environment, NULL, &StartupInfo, &ProcessInfo)) { DPRINT1("CreateProcessAsUserW failed with error %u\n", GetLastError()); goto cleanup; @@ -3104,7 +3105,7 @@ (ShowWizard is only set to FALSE for these two modes) */ ASSERT(!ShowWizard); - if(!CreateProcessW(NULL, CommandLine, NULL, NULL, FALSE, 0, NULL, NULL, &StartupInfo, &ProcessInfo)) + if (!CreateProcessW(NULL, CommandLine, NULL, NULL, FALSE, 0, NULL, NULL, &StartupInfo, &ProcessInfo)) { DPRINT1("CreateProcessW failed with error %u\n", GetLastError()); goto cleanup; @@ -3112,7 +3113,7 @@ } /* Wait for the function to connect to our pipe */ - if(!ConnectNamedPipe(hPipe, NULL)) + if (!ConnectNamedPipe(hPipe, NULL)) { if (GetLastError() != ERROR_PIPE_CONNECTED) { @@ -3141,7 +3142,7 @@ WaitForSingleObject(ProcessInfo.hProcess, INFINITE); /* The following check for success is probably not compatible to Windows, but should do its job */ - if(!GetExitCodeProcess(ProcessInfo.hProcess, &Value)) + if (!GetExitCodeProcess(ProcessInfo.hProcess, &Value)) { DPRINT1("GetExitCodeProcess failed with error %u\n", GetLastError()); goto cleanup; @@ -3150,16 +3151,16 @@ DeviceInstalled = Value; cleanup: - if(hPipe != INVALID_HANDLE_VALUE) + if (hPipe != INVALID_HANDLE_VALUE) CloseHandle(hPipe); - if(Environment) + if (Environment) DestroyEnvironmentBlock(Environment); - if(ProcessInfo.hProcess) + if (ProcessInfo.hProcess) CloseHandle(ProcessInfo.hProcess); - if(ProcessInfo.hThread) + if (ProcessInfo.hThread) CloseHandle(ProcessInfo.hThread); if (!DeviceInstalled)

9 years, 8 months

[hbelusca] 66562: [MPLAY32]: Fix CID 515203 and CID 515204: replace remaining _tcscpy and _stprintf with strsafe functions. By Ricardo Hanke. CORE-9306 CORE-9308 #resolve #comment Fixed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 21:35:07 2015 New Revision: 66562 URL: http://svn.reactos.org/svn/reactos?rev=66562&view=rev Log: [MPLAY32]: Fix CID 515203 and CID 515204: replace remaining _tcscpy and _stprintf with strsafe functions. By Ricardo Hanke. CORE-9306 CORE-9308 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Tue Mar 3 21:35:07 2015 @@ -165,7 +165,7 @@ LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); } - _stprintf(szTempMessage, _T("MMSYS%lu: %s"), mciError, szErrorMessage); + StringCbPrintf(szTempMessage, sizeof(szTempMessage), _T("MMSYS%lu: %s"), mciError, szErrorMessage); MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); } @@ -412,7 +412,7 @@ MCIERROR mciError; MCI_STATUS_PARMS mciStatus; MCI_OPEN_PARMS mciOpen; - TCHAR szNewTitle[MAX_PATH]; + TCHAR szNewTitle[MAX_PATH + 128]; if (bIsOpened) { @@ -462,13 +462,13 @@ SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100000, (LPARAM) 0); } - _stprintf(szNewTitle, _T("%s - %s"), szAppTitle, lpFileName); + StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle, lpFileName); SetWindowText(hwnd, szNewTitle); MaxFilePos = mciStatus.dwReturn; wDeviceId = mciOpen.wDeviceID; bIsOpened = TRUE; - _tcscpy(szPrevFile, lpFileName); + StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName); EnableMenuItems(hwnd); @@ -656,11 +656,11 @@ if (szPrevFile[0] == _T('\0')) return; - _tcscpy(szLocalFileName, szPrevFile); + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); } else { - _tcscpy(szLocalFileName, lpFileName); + StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); } if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) @@ -918,7 +918,7 @@ if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir)) { - _tcscpy(szCurrentDir, _T("c:\\")); + StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\")); } OpenFileName.lStructSize = sizeof(OpenFileName);

9 years, 8 months

[hbelusca] 66561: Fix comment >_>

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 21:24:04 2015 New Revision: 66561 URL: http://svn.reactos.org/svn/reactos?rev=66561&view=rev Log: Fix comment >_> Modified: trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Mar 3 21:24:04 2015 @@ -31,7 +31,7 @@ HWND hDesktopWindow = NULL; -/* Current magnified area /* +/* Current magnified area */ POINT cp; /* Last positions */

9 years, 8 months

[hbelusca] 66560: [MAGNIFIER]: Code formatting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 21:20:49 2015 New Revision: 66560 URL: http://svn.reactos.org/svn/reactos?rev=66560&view=rev Log: [MAGNIFIER]: Code formatting. Modified: trunk/reactos/base/applications/magnify/magnifier.c trunk/reactos/base/applications/magnify/settings.c Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Mar 3 21:20:49 2015 @@ -21,35 +21,33 @@ #define MAX_LOADSTRING 100 -// Global Variables: -HINSTANCE hInst; // current instance +/* Global Variables */ +HINSTANCE hInst; HWND hMainWnd; -TCHAR szTitle[MAX_LOADSTRING]; // The title bar text - -#define REPAINT_SPEED 100 +TCHAR szTitle[MAX_LOADSTRING]; + +#define REPAINT_SPEED 100 HWND hDesktopWindow = NULL; -//Current magnified area +/* Current magnified area /* POINT cp; -//Last positions +/* Last positions */ POINT pMouse; POINT pCaret; POINT pFocus; -// Forward declarations of functions included in this code module: -ATOM MyRegisterClass(HINSTANCE hInstance); -BOOL InitInstance(HINSTANCE, int); -LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); -INT_PTR CALLBACK AboutProc(HWND, UINT, WPARAM, LPARAM); -INT_PTR CALLBACK OptionsProc(HWND, UINT, WPARAM, LPARAM); -INT_PTR CALLBACK WarningProc(HWND, UINT, WPARAM, LPARAM); +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK AboutProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK OptionsProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK WarningProc(HWND, UINT, WPARAM, LPARAM); int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - // TODO: Place code here. MSG msg; HACCEL hAccelTable; @@ -57,28 +55,26 @@ UNREFERENCED_PARAMETER(lpCmdLine); switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; - } - - // Initialize global strings + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } + + /* Initialize global strings */ LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); MyRegisterClass(hInstance); - // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) - { + /* Perform application initialization */ + if (!InitInstance(hInstance, nCmdShow)) return FALSE; - } hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_MAGNIFIER)); - // Main message loop: + /* Main message loop */ while (GetMessage(&msg, NULL, 0, 0)) { if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) @@ -91,21 +87,6 @@ return (int) msg.wParam; } - - -/* - * FUNCTION: MyRegisterClass() - * - * PURPOSE: Registers the window class. - * - * COMMENTS: - * - * This function and its usage are only necessary if you want this code - * to be compatible with Win32 systems prior to the 'RegisterClassEx' - * function that was added to Windows 95. It is important to call this function - * so that the application will get 'well formed' small icons associated - * with it. - */ ATOM MyRegisterClass(HINSTANCE hInstance) { WNDCLASS wc; @@ -124,25 +105,15 @@ return RegisterClass(&wc); } -/* - * FUNCTION: InitInstance(HINSTANCE, int) - * - * PURPOSE: Saves instance handle and creates main window - * - * COMMENTS: - * - * In this function, we save the instance handle in a global variable and - * create and display the main program window. - */ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { - RECT rcWorkArea; - hInst = hInstance; // Store instance handle in our global variable - - SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); - - /* Create the Window */ - hMainWnd = CreateWindowEx( + RECT rcWorkArea; + hInst = hInstance; // Store instance handle in our global variable + + SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + /* Create the Window */ + hMainWnd = CreateWindowEx( WS_EX_TOPMOST | WS_EX_PALETTEWINDOW, szWindowClass, szTitle, @@ -156,27 +127,23 @@ hInstance, NULL); - if (!hMainWnd) - { - return FALSE; - } - - ShowWindow(hMainWnd, (bStartMinimized) ? SW_MINIMIZE : nCmdShow); - UpdateWindow(hMainWnd); - - if (bShowWarning) - { - DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); - } - - return TRUE; -} - -void Refresh () + if (!hMainWnd) + return FALSE; + + ShowWindow(hMainWnd, bStartMinimized ? SW_MINIMIZE : nCmdShow); + UpdateWindow(hMainWnd); + + if (bShowWarning) + DialogBox(hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc); + + return TRUE; +} + +void Refresh() { if (!IsIconic(hMainWnd)) { - // Invalidate the client area forcing a WM_PAINT message + /* Invalidate the client area forcing a WM_PAINT message */ InvalidateRgn(hMainWnd, NULL, TRUE); } } @@ -197,28 +164,28 @@ int Width, Height, AppWidth, AppHeight; LONG blitAreaWidth, blitAreaHeight, blitAreaX, blitAreaY; - desktopHdc = GetWindowDC (hDesktopWindow); + desktopHdc = GetWindowDC(hDesktopWindow); GetClientRect(hMainWnd, &appRect); GetWindowRect(hDesktopWindow, &R); - ZeroMemory(&cinfo, sizeof(CURSORINFO)); - ZeroMemory(&iinfo, sizeof(ICONINFO)); + ZeroMemory(&cinfo, sizeof(cinfo)); + ZeroMemory(&iinfo, sizeof(iinfo)); cinfo.cbSize = sizeof(cinfo); GetCursorInfo(&cinfo); GetIconInfo(cinfo.hCursor, &iinfo); - /* Create a memory DC compatible with client area DC.*/ + /* Create a memory DC compatible with client area DC */ HdcStrech = CreateCompatibleDC(desktopHdc); - /* Create a bitmap compatible with the client area DC.*/ + /* Create a bitmap compatible with the client area DC */ HbmpStrech = CreateCompatibleBitmap( desktopHdc, R.right, R.bottom); - /* Select our bitmap in memory DC and save the old one.*/ - hOld = SelectObject (HdcStrech , HbmpStrech); + /* Select our bitmap in memory DC and save the old one */ + hOld = SelectObject(HdcStrech , HbmpStrech); /* Paint the screen bitmap to our in memory DC */ BitBlt( @@ -239,44 +206,34 @@ pMouse.y - iinfo.yHotspot, // - 10, cinfo.hCursor); - Width = (R.right - R.left); + Width = (R.right - R.left); Height = (R.bottom - R.top); - AppWidth = (appRect.right - appRect.left); + AppWidth = (appRect.right - appRect.left); AppHeight = (appRect.bottom - appRect.top); - blitAreaWidth = AppWidth / iZoom; + blitAreaWidth = AppWidth / iZoom; blitAreaHeight = AppHeight / iZoom; blitAreaX = (cp.x) - (blitAreaWidth /2); blitAreaY = (cp.y) - (blitAreaHeight /2); if (blitAreaX < 0) - { blitAreaX = 0; - } if (blitAreaY < 0) - { blitAreaY = 0; - } if (blitAreaX > (Width - blitAreaWidth)) - { blitAreaX = (Width - blitAreaWidth); - } if (blitAreaY > (Height - blitAreaHeight)) - { blitAreaY = (Height - blitAreaHeight); - } if (bInvertColors) - { rop = NOTSRCCOPY; - } - - /* Blast the stretched image from memory DC to window DC.*/ + + /* Blast the stretched image from memory DC to window DC */ StretchBlt( aDc, 0, @@ -291,27 +248,17 @@ rop | NOMIRRORBITMAP); - /* Cleanup.*/ + /* Cleanup */ if (iinfo.hbmMask) DeleteObject(iinfo.hbmMask); if (iinfo.hbmColor) DeleteObject(iinfo.hbmColor); - SelectObject (HdcStrech, hOld); + SelectObject(HdcStrech, hOld); DeleteObject (HbmpStrech); - DeleteDC (HdcStrech); + DeleteDC(HdcStrech); ReleaseDC(hDesktopWindow, desktopHdc); } -/* - * FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) - * - * PURPOSE: Processes messages for the main window. - * - * WM_COMMAND - process the application menu - * WM_PAINT - Paint the main window - * WM_DESTROY - post a quit message and return - * - */ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { int wmId; @@ -369,79 +316,87 @@ Refresh(); } break; - case WM_COMMAND: - wmId = LOWORD(wParam); - // Parse the menu selections: - switch (wmId) + + case WM_COMMAND: { - case IDM_OPTIONS: - DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); - break; - case IDM_ABOUT: - DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); - break; - case IDM_EXIT: - DestroyWindow(hWnd); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); + wmId = LOWORD(wParam); + /* Parse the menu selections */ + switch (wmId) + { + case IDM_OPTIONS: + DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc); + break; + case IDM_ABOUT: + DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc); + break; + case IDM_EXIT: + DestroyWindow(hWnd); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; } - break; - case WM_PAINT: + + case WM_PAINT: { PAINTSTRUCT PaintStruct; HDC dc; dc = BeginPaint(hWnd, &PaintStruct); Draw(dc); EndPaint(hWnd, &PaintStruct); + break; } - break; - case WM_ERASEBKGND: - //handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. - break; - case WM_DESTROY: - //Save settings to registry - SaveSettings (); - KillTimer (hWnd , 1); - PostQuitMessage(0); - break; - case WM_CREATE: - //Load settings from registry - LoadSettings (); - - //Get the desktop window + + case WM_ERASEBKGND: + // handle WM_ERASEBKGND by simply returning non-zero because we did all the drawing in WM_PAINT. + break; + + case WM_DESTROY: + /* Save settings to registry */ + SaveSettings(); + KillTimer(hWnd , 1); + PostQuitMessage(0); + break; + + case WM_CREATE: + /* Load settings from registry */ + LoadSettings(); + + /* Get the desktop window */ hDesktopWindow = GetDesktopWindow(); - //Set the timer + /* Set the timer */ SetTimer (hWnd , 1, REPAINT_SPEED , NULL); break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } + + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + return 0; } -// Message handler for about box. INT_PTR CALLBACK AboutProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); switch (message) { - case WM_INITDIALOG: - return (INT_PTR)TRUE; - - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); + case WM_INITDIALOG: return (INT_PTR)TRUE; - } - break; - } + + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return (INT_PTR)TRUE; + } + break; + } + return (INT_PTR)FALSE; } -// Message handler for options box. INT_PTR CALLBACK OptionsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); @@ -449,7 +404,7 @@ { case WM_INITDIALOG: { - //Add the zoom items.... + // Add the zoom items... SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("1")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("2")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("3")); @@ -459,7 +414,6 @@ SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("7")); SendDlgItemMessage(hDlg, IDC_ZOOM, CB_ADDSTRING, 0, (LPARAM)("8")); - // SendDlgItemMessage(hDlg, IDC_ZOOM, CB_SETCURSEL, iZoom - 1, 0); if (bFollowMouse) @@ -482,8 +436,9 @@ return (INT_PTR)TRUE; } + case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDOK: case IDCANCEL: @@ -491,51 +446,50 @@ return (INT_PTR)TRUE; case IDC_BUTTON_HELP: - /* unimplemented */ + /* Unimplemented */ MessageBox(hDlg , TEXT("Magnifier help not available yet!") , TEXT("Help") , MB_OK); break; case IDC_ZOOM: - if(HIWORD(wParam) == CBN_SELCHANGE) + if (HIWORD(wParam) == CBN_SELCHANGE) { HWND hCombo = GetDlgItem(hDlg,IDC_ZOOM); - /* Get index of current selection and the text of that selection. */ + /* Get index of current selection and the text of that selection */ iZoom = SendMessage( hCombo, CB_GETCURSEL, (WPARAM) wParam, (LPARAM) lParam ) + 1; - //Update the magnigier UI - Refresh (); + /* Update the magnifier UI */ + Refresh(); } break; case IDC_INVERTCOLORSCHECK: - bInvertColors = IsDlgButtonChecked (hDlg, IDC_INVERTCOLORSCHECK); - Refresh (); + bInvertColors = IsDlgButtonChecked(hDlg, IDC_INVERTCOLORSCHECK); + Refresh(); break; case IDC_FOLLOWMOUSECHECK: - bFollowMouse = IsDlgButtonChecked (hDlg, IDC_FOLLOWMOUSECHECK); + bFollowMouse = IsDlgButtonChecked(hDlg, IDC_FOLLOWMOUSECHECK); break; case IDC_FOLLOWKEYBOARDCHECK: - bFollowFocus = IsDlgButtonChecked (hDlg, IDC_FOLLOWKEYBOARDCHECK); + bFollowFocus = IsDlgButtonChecked(hDlg, IDC_FOLLOWKEYBOARDCHECK); break; case IDC_FOLLOWTEXTEDITINGCHECK: - bFollowCaret = IsDlgButtonChecked (hDlg, IDC_FOLLOWTEXTEDITINGCHECK); + bFollowCaret = IsDlgButtonChecked(hDlg, IDC_FOLLOWTEXTEDITINGCHECK); break; case IDC_STARTMINIMIZEDCHECK: - bStartMinimized = IsDlgButtonChecked (hDlg, IDC_STARTMINIMIZEDCHECK); + bStartMinimized = IsDlgButtonChecked(hDlg, IDC_STARTMINIMIZEDCHECK); break; case IDC_SHOWMAGNIFIER: - bShowMagnifier = IsDlgButtonChecked (hDlg, IDC_SHOWMAGNIFIERCHECK); - if (bShowMagnifier){ + bShowMagnifier = IsDlgButtonChecked(hDlg, IDC_SHOWMAGNIFIERCHECK); + if (bShowMagnifier) ShowWindow (hMainWnd , SW_SHOW); - }else{ + else ShowWindow (hMainWnd , SW_HIDE); - } break; } } + return (INT_PTR)FALSE; } -// Message handler for warning box. INT_PTR CALLBACK WarningProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); @@ -544,11 +498,12 @@ { case WM_INITDIALOG: return (INT_PTR)TRUE; + case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_SHOWWARNINGCHECK: - bShowWarning = !IsDlgButtonChecked (hDlg, IDC_SHOWWARNINGCHECK); + bShowWarning = !IsDlgButtonChecked(hDlg, IDC_SHOWWARNINGCHECK); break; } if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) @@ -558,5 +513,6 @@ } break; } + return (INT_PTR)FALSE; } Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Tue Mar 3 21:20:49 2015 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS Magnify + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/magnify/settings.c + * PURPOSE: Magnification of parts of the screen. + * COPYRIGHT: Copyright 2007 Marc Piulachs <marc.piulachs(a)codexchange.net> + * + */ + #include "magnifier.h" #include <tchar.h> @@ -17,74 +26,74 @@ void LoadSettings() { - HKEY hkey; - LONG value; - ULONG len; + HKEY hkey; + LONG value; + ULONG len; - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, KEY_READ, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, KEY_READ, &hkey) == ERROR_SUCCESS) { - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len)) - { - if(value >= 0 && value <= 9) - iZoom = value; - } + if (RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + { + if (value >= 0 && value <= 9) + iZoom = value; + } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len)) - bShowWarning = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bShowWarning = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len)) - bInvertColors = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bInvertColors = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len)) - bStartMinimized = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bStartMinimized = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len)) - bFollowMouse = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowMouse = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len)) - bFollowFocus = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowFocus = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len)) - bFollowFocus = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowFocus = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len)) - bFollowCaret = (value == 0 ? FALSE : TRUE); + if (RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len) == ERROR_SUCCESS) + bFollowCaret = (value == 0 ? FALSE : TRUE); - RegCloseKey(hkey); + RegCloseKey(hkey); } } void SaveSettings() { - HKEY hkey; - LONG value; + HKEY hkey; + LONG value; - if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) { - value = iZoom; - RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = iZoom; + RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bShowWarning; - RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bShowWarning; + RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bInvertColors; - RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bInvertColors; + RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bStartMinimized; - RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bStartMinimized; + RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowMouse; - RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowMouse; + RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - value = bFollowCaret; - RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowCaret; + RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof(value)); - RegCloseKey(hkey); + RegCloseKey(hkey); } }

9 years, 8 months

[janderwald] 66559: [KS] - fix multiple bugs in the software bus enumerator

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Mar 3 21:07:48 2015 New Revision: 66559 URL: http://svn.reactos.org/svn/reactos?rev=66559&view=rev Log: [KS] - fix multiple bugs in the software bus enumerator Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/drivers/ksfilter/swenum/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Tue Mar 3 21:07:48 2015 @@ -258,7 +258,7 @@ IN LPWSTR ReferenceString, IN LPWSTR InterfaceString) { - GUID DeviceGuid; + GUID InterfaceGUID; NTSTATUS Status; PLIST_ENTRY Entry; PBUS_INSTANCE_ENTRY CurEntry; @@ -268,7 +268,7 @@ RtlInitUnicodeString(&DeviceName, InterfaceString); /* first convert device name to guid */ - RtlGUIDFromString(&DeviceName, &DeviceGuid); + RtlGUIDFromString(&DeviceName, &InterfaceGUID); /* check if the device is already present */ Entry = DeviceEntry->DeviceInterfaceList.Flink; @@ -278,7 +278,7 @@ /* get offset */ CurEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); - if (IsEqualGUIDAligned(&CurEntry->InterfaceGuid, &DeviceGuid)) + if (IsEqualGUIDAligned(&CurEntry->InterfaceGuid, &InterfaceGUID)) { /* entry already exists */ return STATUS_SUCCESS; @@ -298,7 +298,7 @@ } /* store guid */ - RtlMoveMemory(&CurEntry->InterfaceGuid, &DeviceGuid, sizeof(GUID)); + RtlMoveMemory(&CurEntry->InterfaceGuid, &InterfaceGUID, sizeof(GUID)); /* now register the association */ Status = KspRegisterDeviceAssociation(BusDeviceExtension, DeviceEntry, CurEntry); @@ -391,7 +391,7 @@ InitializeListHead(&DeviceEntry->IrpPendingList); /* copy device guid */ - RtlInitUnicodeString(&String, ReferenceString); + RtlInitUnicodeString(&String, DeviceCategory); RtlGUIDFromString(&String, &DeviceEntry->DeviceGuid); /* copy device names */ @@ -1110,10 +1110,14 @@ return; } + /* now scan the bus */ + KspScanBus(Context->BusDeviceExtension); + /* acquire device entry lock */ KeAcquireSpinLock(&Context->BusDeviceExtension->Lock, &OldLevel); /* now iterate all device entries */ + ASSERT(!IsListEmpty(&Context->BusDeviceExtension->Common.Entry)); Entry = Context->BusDeviceExtension->Common.Entry.Flink; while(Entry != &Context->BusDeviceExtension->Common.Entry) { @@ -1514,8 +1518,6 @@ /* get device extension */ DeviceExtension = (PDEV_EXTENSION)BusDeviceObject->DeviceExtension; - DPRINT1("DeviceExtension %p BusDeviceExtension %p\n", DeviceExtension, DeviceExtension->Ext); - /* store bus device extension */ DeviceExtension->Ext = (PCOMMON_DEVICE_EXTENSION)BusDeviceExtension; @@ -1567,7 +1569,7 @@ /* check for success */ if (!NT_SUCCESS(Status)) { - + DPRINT1("IoRegisterDeviceInterface failed Status %lx\n", Status); FreeItem(BusDeviceExtension->ServicePath.Buffer); FreeItem(BusDeviceExtension); return Status; @@ -1578,6 +1580,7 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("IoSetDeviceInterfaceState failed Status %lx\n", Status); FreeItem(BusDeviceExtension->ServicePath.Buffer); FreeItem(BusDeviceExtension); return Status; @@ -1618,6 +1621,7 @@ if (!BusDeviceExtension->PnpDeviceObject) { /* failed to attach device */ + DPRINT1("IoAttachDeviceToDeviceStack failed with %x\n", Status); if (BusDeviceExtension->DeviceInterfaceLink.Buffer) { IoSetDeviceInterfaceState(&BusDeviceExtension->DeviceInterfaceLink, FALSE); @@ -1753,8 +1757,8 @@ /* perform access check */ if (!SeSinglePrivilegeCheck(luid, Mode)) { - /* insufficient privileges */ - return STATUS_PRIVILEGE_NOT_HELD; + /* FIXME insufficient privileges */ + //return STATUS_PRIVILEGE_NOT_HELD; } /* get device extension */ @@ -1848,6 +1852,13 @@ /* sanity checks */ ASSERT(IoStack->FileObject); + if (IoStack->FileObject->FileName.Buffer == NULL) + { + DPRINT1("KsServiceBusEnumCreateRequest PNP Hack\n"); + Irp->IoStatus.Status = STATUS_SUCCESS; + return STATUS_SUCCESS; + } + ASSERT(IoStack->FileObject->FileName.Buffer); DPRINT1("KsServiceBusEnumCreateRequest IRP %p Name %wZ\n", Irp, &IoStack->FileObject->FileName); Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Tue Mar 3 21:07:48 2015 @@ -11,7 +11,6 @@ const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; - NTSTATUS NTAPI SwDispatchPower( @@ -312,7 +311,7 @@ /* check if the device object is a child device */ Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); - DPRINT("SwDispatchCreate %x\n", Status); + DPRINT1("SwDispatchCreate %x\n", Status); /* check for success */ if (NT_SUCCESS(Status)) @@ -326,7 +325,7 @@ } /* perform the create request */ Status = KsServiceBusEnumCreateRequest(DeviceObject, Irp); - DPRINT("SwDispatchCreate %x\n", Status); + DPRINT1("SwDispatchCreate %x\n", Status); } /* check the irp is pending */ @@ -426,7 +425,7 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = SwDispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = SwDispatchSystemControl; - DPRINT("SWENUM loaded\n"); + DPRINT1("SWENUM loaded\n"); return STATUS_SUCCESS; }

9 years, 8 months

[hbelusca] 66558: [MAGNIFY]: Fix CID 512972 and CID 512973. [EVENTLOG]: Fix CID 515148, CID 515149 and CID 512988. By Ricardo Hanke. CORE-9314 CORE-9316 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 21:03:21 2015 New Revision: 66558 URL: http://svn.reactos.org/svn/reactos?rev=66558&view=rev Log: [MAGNIFY]: Fix CID 512972 and CID 512973. [EVENTLOG]: Fix CID 515148, CID 515149 and CID 512988. By Ricardo Hanke. CORE-9314 CORE-9316 #resolve #comment Committed, thanks! Modified: trunk/reactos/base/applications/magnify/settings.c trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventsource.c Modified: trunk/reactos/base/applications/magnify/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/settings.c [iso-8859-1] Tue Mar 3 21:03:21 2015 @@ -21,37 +21,37 @@ LONG value; ULONG len; - RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, - _T(""), 0, KEY_READ, NULL, &hkey, NULL); + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, KEY_READ, &hkey) == ERROR_SUCCESS) + { + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len)) + { + if(value >= 0 && value <= 9) + iZoom = value; + } - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryMagLevel"), 0, 0, (BYTE *)&value, &len)) - { - if(value >= 0 && value <= 9) - iZoom = value; - } + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len)) + bShowWarning = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("ShowWarning"), 0, 0, (BYTE *)&value, &len)) - bShowWarning = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len)) + bInvertColors = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryInvertColors"), 0, 0, (BYTE *)&value, &len)) - bInvertColors = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len)) + bStartMinimized = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryStartMinimized"), 0, 0, (BYTE *)&value, &len)) - bStartMinimized = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len)) + bFollowMouse = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackCursor"), 0, 0, (BYTE *)&value, &len)) - bFollowMouse = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len)) + bFollowFocus = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackFocus"), 0, 0, (BYTE *)&value, &len)) - bFollowFocus = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len)) + bFollowFocus = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, 0, (BYTE *)&value, &len)) - bFollowFocus = (value == 0 ? FALSE : TRUE); + if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len)) + bFollowCaret = (value == 0 ? FALSE : TRUE); - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("StationaryTrackText"), 0, 0, (BYTE *)&value, &len)) - bFollowCaret = (value == 0 ? FALSE : TRUE); - - RegCloseKey(hkey); + RegCloseKey(hkey); + } } void SaveSettings() @@ -59,32 +59,32 @@ HKEY hkey; LONG value; - RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, - _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Magnify"), 0, _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + value = iZoom; + RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = iZoom; - RegSetValueEx(hkey, _T("StationaryMagLevel"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bShowWarning; + RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bShowWarning; - RegSetValueEx(hkey, _T("ShowWarning"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bInvertColors; + RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bInvertColors; - RegSetValueEx(hkey, _T("StationaryInvertColors"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bStartMinimized; + RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bStartMinimized; - RegSetValueEx(hkey, _T("StationaryStartMinimized"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowMouse; + RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bFollowMouse; - RegSetValueEx(hkey, _T("StationaryTrackCursor"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowFocus; + RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bFollowFocus; - RegSetValueEx(hkey, _T("StationaryTrackSecondaryFocus"), 0, REG_DWORD, (BYTE *)&value, sizeof value); + value = bFollowCaret; + RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - value = bFollowCaret; - RegSetValueEx(hkey, _T("StationaryTrackText"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - - RegCloseKey(hkey); + RegCloseKey(hkey); + } } Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Tue Mar 3 21:03:21 2015 @@ -280,8 +280,13 @@ DPRINT("LoadLogFile: %S\n", LogName); - RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, &MaxValueLen, NULL, NULL); + Result = RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, &MaxValueLen, NULL, NULL); + if (Result != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey failed: %lu\n", Result); + return NULL; + } Buf = HeapAlloc(MyHeap, 0, MaxValueLen); if (!Buf) @@ -300,7 +305,7 @@ &ValueLen); if (Result != ERROR_SUCCESS) { - DPRINT1("RegQueryValueEx failed: %lu\n", GetLastError()); + DPRINT1("RegQueryValueEx failed: %lu\n", Result); HeapFree(MyHeap, 0, Buf); return NULL; } @@ -367,16 +372,21 @@ BOOL LoadLogFiles(HKEY eventlogKey) { - LONG result; + LONG Result; DWORD MaxLognameLen, LognameLen; WCHAR *Buf = NULL; INT i; PLOGFILE pLogFile; - RegQueryInfoKey(eventlogKey, - NULL, NULL, NULL, NULL, - &MaxLognameLen, - NULL, NULL, NULL, NULL, NULL, NULL); + Result = RegQueryInfoKey(eventlogKey, + NULL, NULL, NULL, NULL, + &MaxLognameLen, + NULL, NULL, NULL, NULL, NULL, NULL); + if (Result != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey failed: %lu\n", Result); + return FALSE; + } MaxLognameLen++; @@ -401,8 +411,8 @@ DPRINT("%S\n", Buf); - result = RegOpenKeyEx(eventlogKey, Buf, 0, KEY_ALL_ACCESS, &SubKey); - if (result != ERROR_SUCCESS) + Result = RegOpenKeyEx(eventlogKey, Buf, 0, KEY_ALL_ACCESS, &SubKey); + if (Result != ERROR_SUCCESS) { DPRINT1("Failed to open %S key.\n", Buf); HeapFree(MyHeap, 0, Buf); @@ -433,7 +443,7 @@ { WCHAR LogPath[MAX_PATH]; INT RetCode = 0; - LONG result; + LONG Result; HKEY elogKey; LogfListInitialize(); @@ -457,13 +467,13 @@ } else { - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + Result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Services\\EventLog", 0, KEY_ALL_ACCESS, &elogKey); - if (result != ERROR_SUCCESS) + if (Result != ERROR_SUCCESS) { DPRINT1("Fatal error: can't open eventlog registry key.\n"); RetCode = 1; Modified: trunk/reactos/base/services/eventlog/eventsource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventsource.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventsource.c [iso-8859-1] Tue Mar 3 21:03:21 2015 @@ -62,11 +62,17 @@ DWORD dwEventSourceNameLength; DWORD dwIndex; WCHAR *Buf = NULL; + LONG Result; DPRINT("LoadEventSources\n"); - RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, &dwMaxSubKeyLength, NULL, - NULL, NULL, NULL, NULL, NULL); + Result = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, &dwMaxSubKeyLength, NULL, + NULL, NULL, NULL, NULL, NULL); + if (Result != ERROR_SUCCESS) + { + DPRINT1("RegQueryInfoKey failed: %lu\n", Result); + return FALSE; + } DPRINT("dwMaxSubKeyLength: %lu\n", dwMaxSubKeyLength);

9 years, 8 months

[cwittich] 66557: [WLANAPI] partially implement RpcOpenHandle and RpcCloseHandle

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Mar 3 20:57:33 2015 New Revision: 66557 URL: http://svn.reactos.org/svn/reactos?rev=66557&view=rev Log: [WLANAPI] partially implement RpcOpenHandle and RpcCloseHandle Modified: trunk/reactos/base/services/wlansvc/precomp.h trunk/reactos/base/services/wlansvc/rpcserver.c trunk/reactos/base/services/wlansvc/wlansvc.c trunk/reactos/dll/win32/wlanapi/main.c trunk/reactos/dll/win32/wlanapi/profile.c trunk/reactos/include/psdk/wlanapi.h trunk/reactos/include/reactos/idl/wlansvc.idl Modified: trunk/reactos/base/services/wlansvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/prec… ============================================================================== --- trunk/reactos/base/services/wlansvc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/precomp.h [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -12,4 +12,13 @@ #include <winsvc.h> #include <wlansvc_s.h> +#include <ndk/rtlfuncs.h> +#include <ndk/obfuncs.h> + +typedef struct _WLANSVCHANDLE +{ + LIST_ENTRY WlanSvcHandleListEntry; + DWORD dwClientVersion; +} WLANSVCHANDLE, *PWLANSVCHANDLE; + #endif /* _WLANSVC_PCH_ */ Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -12,21 +12,103 @@ #include <debug.h> //#define GET_IF_ENTRY2_IMPLEMENTED 1 +LIST_ENTRY WlanSvcHandleListHead; + +DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter) +{ + RPC_STATUS Status; + + InitializeListHead(&WlanSvcHandleListHead); + + Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(wlansvc_interface_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, 0); + if (Status != RPC_S_OK) + { + DPRINT("RpcServerListen() failed (Status %lx)\n", Status); + } + + DPRINT("RpcServerListen finished\n"); + return 0; +} + +PWLANSVCHANDLE WlanSvcGetHandleEntry(LPWLANSVC_RPC_HANDLE ClientHandle) +{ + PLIST_ENTRY CurrentEntry; + PWLANSVCHANDLE lpWlanSvcHandle; + + CurrentEntry = WlanSvcHandleListHead.Flink; + while (CurrentEntry != &WlanSvcHandleListHead) + { + lpWlanSvcHandle = CONTAINING_RECORD(CurrentEntry, + WLANSVCHANDLE, + WlanSvcHandleListEntry); + CurrentEntry = CurrentEntry->Flink; + + if (lpWlanSvcHandle == (PWLANSVCHANDLE) ClientHandle) + return lpWlanSvcHandle; + } + + return NULL; +} + DWORD _RpcOpenHandle( wchar_t *arg_1, DWORD dwClientVersion, DWORD *pdwNegotiatedVersion, LPWLANSVC_RPC_HANDLE phClientHandle) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PWLANSVCHANDLE lpWlanSvcHandle; + + lpWlanSvcHandle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WLANSVCHANDLE)); + if (lpWlanSvcHandle == NULL) + { + DPRINT1("Failed to allocate Heap!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + if (dwClientVersion > 2) + dwClientVersion = 2; + + if (dwClientVersion < 1) + dwClientVersion = 1; + + lpWlanSvcHandle->dwClientVersion = dwClientVersion; + *pdwNegotiatedVersion = dwClientVersion; + + InsertTailList(&WlanSvcHandleListHead, &lpWlanSvcHandle->WlanSvcHandleListEntry); + *phClientHandle = lpWlanSvcHandle; + + return ERROR_SUCCESS; } DWORD _RpcCloseHandle( LPWLANSVC_RPC_HANDLE phClientHandle) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + PWLANSVCHANDLE lpWlanSvcHandle; + + lpWlanSvcHandle = WlanSvcGetHandleEntry(phClientHandle); + if (!lpWlanSvcHandle) + { + return ERROR_INVALID_HANDLE; + } + + RemoveEntryList(&lpWlanSvcHandle->WlanSvcHandleListEntry); + HeapFree(GetProcessHeap(), 0, lpWlanSvcHandle); + + return ERROR_SUCCESS; } DWORD _RpcEnumInterfaces( @@ -120,6 +202,14 @@ const GUID *pInterfaceGuid, PWLAN_INTERFACE_CAPABILITY *ppCapability) { + PWLANSVCHANDLE lpWlanSvcHandle; + + lpWlanSvcHandle = WlanSvcGetHandleEntry(hClientHandle); + if (!lpWlanSvcHandle) + { + return ERROR_INVALID_HANDLE; + } + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -167,6 +257,14 @@ PDOT11_SSID pDot11Ssid, PWLAN_RAW_DATA pIeData) { + PWLANSVCHANDLE lpWlanSvcHandle; + + lpWlanSvcHandle = WlanSvcGetHandleEntry(hClientHandle); + if (!lpWlanSvcHandle) + { + return ERROR_INVALID_HANDLE; + } + /* DWORD dwBytesReturned; HANDLE hDevice; @@ -284,7 +382,7 @@ DWORD _RpcDeleteProfile( WLANSVC_RPC_HANDLE hClientHandle, const GUID *pInterfaceGuid, - wchar_t *strProfileName) + const wchar_t *strProfileName) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -293,8 +391,8 @@ DWORD _RpcRenameProfile( WLANSVC_RPC_HANDLE hClientHandle, const GUID *pInterfaceGuid, - wchar_t *strOldProfileName, - wchar_t *strNewProfileName) + const wchar_t *strOldProfileName, + const wchar_t *strNewProfileName) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -501,7 +599,7 @@ DWORD _RpcSetSecuritySettings( WLANSVC_RPC_HANDLE hClientHandle, WLAN_SECURABLE_OBJECT SecurableObject, - wchar_t *strModifiedSDDL) + const wchar_t *strModifiedSDDL) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/base/services/wlansvc/wlansvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/wlan… ============================================================================== --- trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/wlansvc.c [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -21,34 +21,9 @@ SERVICE_STATUS SvcStatus; static WCHAR ServiceName[] = L"WlanSvc"; +DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter); + /* FUNCTIONS *****************************************************************/ -static DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter) -{ - RPC_STATUS Status; - - Status = RpcServerUseProtseqEpW(L"ncalrpc", 20, L"wlansvc", NULL); - if (Status != RPC_S_OK) - { - DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); - return 0; - } - - Status = RpcServerRegisterIf(wlansvc_interface_v1_0_s_ifspec, NULL, NULL); - if (Status != RPC_S_OK) - { - DPRINT("RpcServerRegisterIf() failed (Status %lx)\n", Status); - return 0; - } - - Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, 0); - if (Status != RPC_S_OK) - { - DPRINT("RpcServerListen() failed (Status %lx)\n", Status); - } - - DPRINT("RpcServerListen finished\n"); - return 0; -} static void UpdateServiceStatus(HANDLE hServiceStatus, DWORD NewStatus, DWORD Increment) { Modified: trunk/reactos/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/main.c [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -106,22 +106,22 @@ IN const PWLAN_CONNECTION_PARAMETERS pConnectionParameters, PVOID pReserved) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (pConnectionParameters == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - _RpcConnect(hClientHandle, pInterfaceGuid, &pConnectionParameters); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = _RpcConnect(hClientHandle, pInterfaceGuid, &pConnectionParameters); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -130,22 +130,22 @@ IN const GUID *pInterfaceGuid, PVOID pReserved) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - _RpcDisconnect(hClientHandle, pInterfaceGuid); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = _RpcDisconnect(hClientHandle, pInterfaceGuid); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -155,7 +155,7 @@ OUT DWORD *pdwNegotiatedVersion, OUT HANDLE *phClientHandle) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; WCHAR szDummy[] = L"localhost"; if ((pReserved != NULL) || (pdwNegotiatedVersion == NULL) || (phClientHandle == NULL)) @@ -163,18 +163,18 @@ RpcTryExcept { - dwError = _RpcOpenHandle(szDummy, + dwResult = _RpcOpenHandle(szDummy, dwClientVersion, pdwNegotiatedVersion, (WLANSVC_RPC_HANDLE) phClientHandle); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -182,22 +182,22 @@ WlanCloseHandle(IN HANDLE hClientHandle, PVOID pReserved) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; if ((pReserved != NULL) || (hClientHandle == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - _RpcCloseHandle(hClientHandle); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = _RpcCloseHandle(&hClientHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -206,22 +206,22 @@ PVOID pReserved, OUT PWLAN_INTERFACE_INFO_LIST *ppInterfaceList) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; if ((pReserved != NULL) || (ppInterfaceList == NULL) || (hClientHandle == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - _RpcEnumInterfaces(hClientHandle, ppInterfaceList); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = _RpcEnumInterfaces(hClientHandle, ppInterfaceList); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -232,22 +232,22 @@ IN PWLAN_RAW_DATA pIeData, PVOID pReserved) { - DWORD dwError = ERROR_SUCCESS; + DWORD dwResult = ERROR_SUCCESS; if ((pReserved != NULL) || (pInterfaceGuid == NULL) || (hClientHandle == NULL)) return ERROR_INVALID_PARAMETER; RpcTryExcept { - _RpcScan(hClientHandle, pInterfaceGuid, pDot11Ssid, pIeData); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - dwError = RpcExceptionCode(); - } - RpcEndExcept; - - return dwError; + dwResult = _RpcScan(hClientHandle, pInterfaceGuid, pDot11Ssid, pIeData); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -319,11 +319,22 @@ IN WLAN_SECURABLE_OBJECT SecurableObject, IN LPCWSTR strModifiedSDDL) { + DWORD dwResult = ERROR_SUCCESS; + if ((hClientHandle == NULL) || (strModifiedSDDL == NULL) || (SecurableObject >= WLAN_SECURABLE_OBJECT_COUNT)) return ERROR_INVALID_PARAMETER; - UNIMPLEMENTED; - return ERROR_SUCCESS; + RpcTryExcept + { + dwResult = _RpcSetSecuritySettings(hClientHandle, SecurableObject, strModifiedSDDL); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD Modified: trunk/reactos/dll/win32/wlanapi/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/profile.… ============================================================================== --- trunk/reactos/dll/win32/wlanapi/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wlanapi/profile.c [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -39,11 +39,22 @@ IN LPCWSTR strProfileName, PVOID pReserved) { + DWORD dwResult = ERROR_SUCCESS; + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strProfileName == NULL)) return ERROR_INVALID_PARAMETER; - UNIMPLEMENTED; - return ERROR_SUCCESS; + RpcTryExcept + { + dwResult = _RpcDeleteProfile(hClientHandle, pInterfaceGuid, strProfileName); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD @@ -54,11 +65,22 @@ IN LPCWSTR strNewProfileName, PVOID pReserved) { + DWORD dwResult = ERROR_SUCCESS; + if ((pReserved != NULL) || (hClientHandle == NULL) || (pInterfaceGuid == NULL) || (strOldProfileName == NULL) || (strNewProfileName == NULL)) return ERROR_INVALID_PARAMETER; - UNIMPLEMENTED; - return ERROR_SUCCESS; + RpcTryExcept + { + dwResult = _RpcRenameProfile(hClientHandle, pInterfaceGuid, strOldProfileName, strNewProfileName); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwResult = RpcExceptionCode(); + } + RpcEndExcept; + + return dwResult; } DWORD Modified: trunk/reactos/include/psdk/wlanapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wlanapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wlanapi.h [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -10,6 +10,9 @@ #endif /* Defines */ +#define WLAN_API_VERSION_1_0 0x00000001 +#define WLAN_API_VERSION_2_0 0x00000002 + #define WLAN_MAX_PHY_INDEX 64 #define WLAN_MAX_NAME_LENGTH 256 Modified: trunk/reactos/include/reactos/idl/wlansvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wlansv… ============================================================================== --- trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/wlansvc.idl [iso-8859-1] Tue Mar 3 20:57:33 2015 @@ -6,7 +6,7 @@ #include <wlanapi.h> typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; -typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; +typedef WLANSVC_RPC_HANDLE *LPWLANSVC_RPC_HANDLE; typedef [handle, string] LPWSTR WLANSVC_HANDLE; /* FIXME */ @@ -39,8 +39,12 @@ } struct_E ; [ - uuid(266f33b4-c7c1-4bd1-8f52-ddb8f2214ea9), - version(1.0) + uuid(266f33b4-c7c1-4bd1-8f52-ddb8f2214ea9), + version(1.0), + pointer_default(unique) +#ifndef __midl + ,explicit_handle +#endif ] interface wlansvc_interface @@ -50,11 +54,11 @@ [in] WLANSVC_HANDLE szMachineName, [in] DWORD dwClientVersion, [out] DWORD* pdwNegotiatedVersion, - [out] LPWLANSVC_RPC_HANDLE phClientHandle); + [out] WLANSVC_RPC_HANDLE *phClientHandle); /* Function: 0x01 */ DWORD _RpcCloseHandle( - [in, out] LPWLANSVC_RPC_HANDLE phClientHandle); + [in, out] WLANSVC_RPC_HANDLE *phClientHandle); /* Function: 0x02 */ DWORD _RpcEnumInterfaces( @@ -189,14 +193,14 @@ DWORD _RpcDeleteProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, [in] const GUID* pInterfaceGuid, - [in][string] wchar_t * strProfileName); + [in][string] const wchar_t * strProfileName); /* Function: 0x14 */ DWORD _RpcRenameProfile( [in] WLANSVC_RPC_HANDLE hClientHandle, [in] const GUID* pInterfaceGuid, - [in][string] wchar_t * strOldProfileName, - [in][string] wchar_t * strNewProfileName); + [in][string] const wchar_t * strOldProfileName, + [in][string] const wchar_t * strNewProfileName); /* Function: 0x15 */ DWORD _RpcSetProfileList( @@ -262,35 +266,35 @@ [in] DWORD dwFlags, [in] BOOL bOverWrite); - /* Function: 0x1E, address: 0x2C992E36 */ + /* Function: 0x1E */ DWORD _RpcIsUIRequestPending( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] const GUID* pInterfaceGuid, [in] struct_C * arg_3, [out] LPDWORD arg_4); - /* Function: 0x1F, address: 0x2C992EB3 */ + /* Function: 0x1F */ DWORD _RpcSetUIForwardingNetworkList( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in][size_is(dwSize)] GUID* arg_2, [in] DWORD dwSize, [out] GUID* arg_4); /* Function: 0x20 */ DWORD _RpcIsNetworkSuppressed( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] DWORD arg_2, [in] const GUID* pInterfaceGuid, [out] LPDWORD arg_4); /* Function: 0x21 */ DWORD _RpcRemoveUIForwardingNetworkList( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] const GUID* pInterfaceGuid); /* Function: 0x22 */ DWORD _RpcQueryExtUIRequest( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] GUID* arg_2, [in] GUID* arg_3, [in] /* enum16 */ short arg_4, @@ -299,13 +303,13 @@ /* Function: 0x23 */ DWORD _RpcUIResponse( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] struct_C * arg_2, [in] struct_D * arg_3); /* Function: 0x24 */ DWORD _RpcGetProfileKeyInfo( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] DWORD arg_2, [in] const GUID* pInterfaceGuid, [in][string] wchar_t * arg_4, @@ -316,7 +320,7 @@ /* Function: 0x25 */ DWORD _RpcAsyncDoPlap( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] const GUID* pInterfaceGuid, [in][string] wchar_t * arg_3, [in] DWORD dwSize, @@ -324,7 +328,7 @@ /* Function: 0x26 */ DWORD _RpcQueryPlapCredentials( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in, out] LPDWORD dwSize, [out][ref][size_is(*dwSize)] struct_E ** arg_3, [out][ref][string] wchar_t ** arg_4, @@ -336,14 +340,14 @@ /* Function: 0x27 */ DWORD _RpcCancelPlap( - [in] wchar_t * arg_1, + [in] WLANSVC_HANDLE arg_1, [in] const GUID* pInterfaceGuid); /* Function: 0x28 */ DWORD _RpcSetSecuritySettings( [in] WLANSVC_RPC_HANDLE hClientHandle, [in] WLAN_SECURABLE_OBJECT SecurableObject, - [in][string] wchar_t * strModifiedSDDL); + [in][string] const wchar_t * strModifiedSDDL); /* Function: 0x29 */ DWORD _RpcGetSecuritySettings(

9 years, 8 months

[hbelusca] 66556: [CMD]: Improve German translation, by Robert Naumann. CORE-9311 #resolve #comment Committed, thanks! (with Codeseite --> Codepage change).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 20:53:33 2015 New Revision: 66556 URL: http://svn.reactos.org/svn/reactos?rev=66556&view=rev Log: [CMD]: Improve German translation, by Robert Naumann. CORE-9311 #resolve #comment Committed, thanks! (with Codeseite --> Codepage change). Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Tue Mar 3 20:53:33 2015 @@ -25,9 +25,9 @@ /D Verarbeitet auch die Ordner.\n\n\ ATTRIB ohne Parameter zeigt die derzeit gesetzten Attribute aller Dateien an." STRING_ALIAS_HELP "Setzt, lÃ¶scht oder zeigt ein Alias.\n\n\ -ALIAS [alias=[command]]\n\n\ - alias Name des Alias.\n\ - command Text welcher fÃ¼r den Alias zugeordnet wird.\n\n\ +ALIAS [Alias=[Befehl]]\n\n\ + Alias Name des Alias.\n\ + Befehl Text welcher dem Alias zugeordnet wird.\n\n\ Listet alle Aliase auf:\n\ ALIAS\n\n\ Setzt ein neues oder Ã¼berschreibt ein bestehendes Alias:\n\ @@ -45,31 +45,31 @@ CD [Laufwerk:][Pfad]\n\ CD[..|.]\n\n\ .. Ã¼bergeordnetes Verzeichnis\n\ - . vorhergehende Verzeichnis\n\n\ -Geben Sie CD-Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\ + . vorhergehendes Verzeichnis\n\n\ +Geben Sie CD Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\ Laufwerk anzuzeigen.\n\ Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt." - STRING_CHCP_HELP "Zeigt die aktuelle Codepage oder wechselt sie.\n\n\ + STRING_CHCP_HELP "Zeigt die aktuelle Codepage an oder wechselt diese.\n\n\ CHCP [nnn]\n\n\ nnn Codepage angeben.\n\n\ Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." - STRING_CHOICE_HELP "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option wÃ¤hlen muss.\n\n\ -CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ - /C[:]choices Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\ - /N Zeigt choices und ? am ende des Prompt-Strings NICHT an.\n\ + STRING_CHOICE_HELP "Wartet auf Auswahl einer Option durch den Benutzer.\n\n\ +CHOICE [/C[:]optionen][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]optionen Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\ + /N Zeigt die Optionen und ? am Ende des Prompt-Strings NICHT an.\n\ /S GroÃ- und Kleinschreibung wird beachtet.\n\ - /T[:]c,nn Standard-Auswahl wird auf c gesetzt nach nn Sekunden.\n\ + /T[:]c,nn Standard-Auswahl wird nach nn Sekunden auf c gesetzt.\n\ text Zeigt eine Beschreibung an.\n\n\ -ERRORLEVEL wird auf den Offset der Taste welche der Benutzer gedrÃ¼ckt hat gesetzt." +ERRORLEVEL wird auf den Offset der Taste, welche der Benutzer gedrÃ¼ckt hat, gesetzt." STRING_CLS_HELP "LÃ¶scht den Bildschirminhalt.\n\nCLS" STRING_CMD_HELP1 "\nInterne Befehle verfÃ¼gbar:\n" STRING_CMD_HELP2 "\nVerfÃ¼gbare Funktionen:" - STRING_CMD_HELP3 " [aliases]" - STRING_CMD_HELP4 " [history]" - STRING_CMD_HELP5 " [unix filename completion]" - STRING_CMD_HELP6 " [directory stack]" - STRING_CMD_HELP7 " [redirections and piping]" - STRING_CMD_HELP8 "Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\n\ + STRING_CMD_HELP3 " [Aliase]" + STRING_CMD_HELP4 " [Verlauf]" + STRING_CMD_HELP5 " [Unix Dateinamen-VervollstÃ¤ndigung]" + STRING_CMD_HELP6 " [Verzeichnis-Stack]" + STRING_CMD_HELP7 " [Weiterleitung und Piping]" + STRING_CMD_HELP8 "Startet eine neue Instanz der ReactOS-Eingabeaufforderung.\n\n\ CMD [/[C|K] Befehl][/P][/Q][/T:bf]\n\n\ /C Befehl FÃ¼hrt den Befehl in der Zeichenfolge aus. AnschlieÃend\n\ wird diese Instanz beendet.\n\ @@ -101,12 +101,12 @@ farbe fest" STRING_COPY_HELP1 " %s Ã¼berschreiben (Ja/Nein/Alle)? " STRING_COPY_HELP2 "Kopiert eine oder mehrere Dateien an eine andere Position.\n\n\ -COPY [/V][/Y|/-Y][/A|/B] Quelle [/A|/B]\n\ - [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ - source Bezeichnet die zu kopierende(n) Datei(en).\n\ +COPY [/V][/Y|/-Y][/A|/B] \n\ + [+ Quelle [/A|/B] [+ ...]] [Ziel [/A|/B]]\n\n\ + Quelle Bezeichnet die zu kopierende(n) Datei(en).\n\ /A Weist auf eine ASCII-Textdatei hin.\n\ /B Weist auf eine BinÃ¤rdatei hin.\n\ - destination Bezeichnet das Verzeichnis und/oder Dateinamen der neuen Datei(en).\n\ + Ziel Bezeichnet das Verzeichnis und/oder Dateinamen der neuen Datei(en).\n\ /V ÃberprÃ¼ft, ob die Dateien richtig geschrieben wurden.\n\ /Y UnterdrÃ¼ckt die BestÃ¤tigungsaufforderung beim Ãberschreiben\n\ vorhandener Zieldateien.\n\ @@ -118,35 +118,35 @@ STRING_DATE_HELP2 "\nGeben Sie das neue Datum ein (dd%cmm%cyyyy): " STRING_DATE_HELP3 "\nGeben Sie das neue Datum ein (yyyy%cmm%cdd): " STRING_DATE_HELP4 "Ãndert das eingestellte Datum oder zeigt es an.\n\n\ -DATE [/T][date]\n\n\ - /T nur Datum anzeigen\n\n\ +DATE [/T][Datum]\n\n\ + /T nur Datum anzeigen\n\n\ Der Befehl DATE ohne Parameter zeigt das aktuelle Datum an und fragt nach\n\ einem neuen. DrÃ¼cken Sie die EINGABETASTE, um das bisherige Datum zu behalten." STRING_DEL_HELP1 "LÃ¶scht eine oder mehrere Dateien.\n\n\ DEL [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ DELETE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ ERASE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\n\ - file Geben Sie die Dateinamen an, welche Sie lÃ¶schen mÃ¶chten\n\n\ - /N Nichts.\n\ - /P Fordert Sie vor dem LÃ¶schen jeder Datei zur BestÃ¤tigung auf.\n\ - /T Zeigt die Anzahl der gelÃ¶schten Dateien und deren vorherigen Speicherplatzbedarf an.\n\ - /Q Beenden.\n\ - /W Sicheres LÃ¶schen. Dateien werden mit Zufallszahlen Ã¼berschrieben, bevor sie gelÃ¶scht werden.\n\ - /Y LÃ¶scht alles (*.*) ohne Vorwarnung.\n\ - /Z LÃ¶scht versteckte Dateien mit Nur-Leserechten und Systemdateien.\n" - STRING_DEL_HELP2 "Alle Dateien in diesem Verzeichnis werden gelÃ¶scht!\nSind Sie sich sicher (Y/N)?" + Dateinamen Geben Sie die Dateinamen an, welche Sie lÃ¶schen mÃ¶chten\n\n\ + /N Nichts.\n\ + /P Fordert Sie vor dem LÃ¶schen jeder Datei zur BestÃ¤tigung auf.\n\ + /T Zeigt die Anzahl der gelÃ¶schten Dateien und deren vorherigen Speicherplatzbedarf an.\n\ + /Q Beenden.\n\ + /W Sicheres LÃ¶schen. Dateien werden mit Zufallszahlen Ã¼berschrieben, bevor sie gelÃ¶scht werden.\n\ + /Y LÃ¶scht alles (*.*) ohne Vorwarnung.\n\ + /Z LÃ¶scht versteckte, schreibgeschÃ¼tzte und Systemdateien.\n" + STRING_DEL_HELP2 "Alle Dateien in diesem Verzeichnis werden gelÃ¶scht!\nSind Sie sich sicher (J/N)?" STRING_DEL_HELP3 " %lu Datei(en) gelÃ¶scht\n" STRING_DEL_HELP4 " %lu Datei(en) gelÃ¶scht\n" STRING_DELAY_HELP "Pause fÃ¼r n Sekunden oder Millisekunden\n\ DELAY [/m]n\n\n\ /m Millisekunden, ansonsten Sekunden\n" STRING_DIR_HELP1 "Listet die Dateien und Unterverzeichnisse eines Verzeichnisses auf.\n\n\ -DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ +DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]Attribute]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]Reihenfolge]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ [Laufwerk:][path][Dateiname]\n\ Bezeichnet Laufwerk, Verzeichnis und/oder Dateien.\n\n\ /A Listet Dateien mit angegebenen Attributen auf.\n\ - attributes D Verzeichnisse R SchreibgeschÃ¼tzte Dateien\n\ + Attribute D Verzeichnisse R SchreibgeschÃ¼tzte Dateien\n\ H Versteckte Dateien A Zu archivierende Dateien\n\ S Systemdateien - vorangestellt kehrt die Bedeutung um\n\ /B Einfaches Format (keine Kopfdaten, keine Zusammenfassung).\n\ @@ -157,7 +157,7 @@ /L Verwendet Kleinschreibung.\n\ /N Neues, langes Listenformat (Dateinamen auf der rechten Seite).\n\ /O Gibt die Liste sortiert aus.\n\ - sortorder N Name (alphabetisch) S GrÃ¶Ãe (kleinere zuerst)\n\ + Reihenfolge N Name (alphabetisch) S GrÃ¶Ãe (kleinere zuerst)\n\ E Erweiterung (alphabetisch) D Datum/Zeit (Ã¤ltere zuerst)\n\ G Verzeichnisse zuerst - vorangestellt kehrt die\n\ /P Pausiert nach jeder vollen Bildschirmseite.\n\ @@ -224,19 +224,19 @@ Marken stehen am Zeilenanfang mit einem vorangestellten Doppelpunkt." STRING_IF_HELP1 "Verarbeitet AusdrÃ¼cke in einer Batchdatei abhÃ¤ngig von Bedingungen.\n\n\ IF [NOT] ERRORLEVEL Nummer Befehl\n\ - IF [NOT] variable1==variable2 Befehl\n\ + IF [NOT] Variable1==Variable2 Befehl\n\ IF [NOT] EXIST Dateiname Befehl\n\ - IF [NOT] DEFINED variable Befehl\n\n\ + IF [NOT] DEFINED Variable Befehl\n\n\ NOT Befehl wird nur dann ausgefÃ¼hrt, wenn die Bedingung nicht\n\ erfÃ¼llt wird\n\ -ERRORLEVEL number Bedingung ist erfÃ¼llt, wenn das zuletzt ausgefÃ¼hrte\n\ +ERRORLEVEL Nummer Bedingung ist erfÃ¼llt, wenn das zuletzt ausgefÃ¼hrte\n\ Programm einen Code grÃ¶Ãer oder gleich der Nummer zurÃ¼ckgibt.\n\ command Gibt den Befehl an, der bei erfÃ¼llter Bedingung ausgefÃ¼hrt\n\ werden soll.\n\ -variable1==variable2\n\ +Variable1==Variable2\n\ Bedingung ist erfÃ¼llt, falls die Zeichenfolgen gleich sind.\n\ EXIST Dateiname Bedingung ist erfÃ¼llt, wenn die angegebene Datei existiert.\n\ -DEFINED variable Bedingung ist erfÃ¼llt, wenn die angegebene Datei definiert\n\ +DEFINED Variable Bedingung ist erfÃ¼llt, wenn die angegebene Datei definiert\n\ wurde." STRING_LABEL_HELP1 "Erstellt, Ã¤ndert oder lÃ¶scht die Bezeichnung eines Volumes.\n\nLABEL [Laufwerk:][label]" STRING_LABEL_HELP2 "DatentrÃ¤ger im Laufwerk %c: ist %s\n" @@ -254,12 +254,12 @@ Wenn weder /H noch /J angegeben werden, wird eine symbolische VerknÃ¼pfung angelegt." STRING_MEMMORY_HELP1 "Zeigt die GrÃ¶Ãe des Systemspeicher an.\n\nMEMORY" STRING_MEMMORY_HELP2 "\n %12s%% Speicher geladen.\n\n\ - %13s bytes RAM (insgesamt)\n\ - %13s bytes verfÃ¼gbarer RAM\n\n\ - %13s bytes Auslagerungsdatei (insgesamt)\n\ - %13s bytes verfÃ¼gbare Auslagerungsdatei\n\n\ - %13s bytes Virtueller Speicher (insgesamt)\n\ - %13s bytes verfÃ¼gbarer virtueller Speicher\n" + %13s Bytes RAM (insgesamt)\n\ + %13s Bytes verfÃ¼gbarer RAM\n\n\ + %13s Bytes Auslagerungsdatei (insgesamt)\n\ + %13s Bytes verfÃ¼gbare Auslagerungsdatei\n\n\ + %13s Bytes Virtueller Speicher (insgesamt)\n\ + %13s Bytes verfÃ¼gbarer virtueller Speicher\n" STRING_MISC_HELP1 "DrÃ¼cken Sie eine beliebige Taste . . .\n" STRING_MOVE_HELP1 "Ãberschreiben %s (Ja/Nein/Alle)? " STRING_MOVE_HELP2 "Verschiebt Dateien und benennt Dateien sowie Verzeichnisse um.\n\n\ @@ -273,12 +273,12 @@ Derzeitige EinschrÃ¤nkung:\n\ Es ist noch nicht mÃ¶glich, Objekte Ã¼ber die Laufwerksgrenzen hinaus zu verschieben.\n" STRING_MSGBOX_HELP "Zeigt ein Fenster und wartet auf eine Eingabe vom Benutzer.\n\n\ -MSGBOX type ['title'] prompt\n\n\ +MSGBOX type ['Titel'] Anzeigetext\n\n\ type Button anzeigen\n\ mÃ¶gliche Werte sind: OK, OKCANCEL,\n\ YESNO, YESNOCANCEL\n\ -title Titel des Fensters\n\ -prompt Text der in dem Fenster angezeigt wird\n\n\n\ +Titel Titel des Fensters\n\ +Anzeigetext Text der in dem Fenster angezeigt wird\n\n\n\ ERRORLEVEL wird je nach dem gedrÃ¼ckten Button gesetzt:\n\n\ YES : 10 | NO : 11\n\ OK : 10 | CANCEL : 12\n" @@ -334,7 +334,7 @@ STRING_REPLACE_HELP1 "Ersetzt Dateien.\n\n\ REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/A] [/P] [/R] [/W]\n\ REPLACE [Laufwerk1:][Pfad1]Dateiname [Laufwerk2:][Pfad2] [/P] [/R] [/S] [/W] [/U]\n\n\ - [Laufwerk1:][Pfad1]dateiname Bezeichnet die Quelldatei(en).\n\ + [Laufwerk1:][Pfad1]Dateiname Bezeichnet die Quelldatei(en).\n\ [Laufwerk2:][Pfad2] Bezeichnet den Pfad in dem die Dateien ersetzt\n\ werden sollen.\n\ /A FÃ¼gt neue Dateien dem Zielpfad hinzu. Kann nicht\n\ @@ -357,8 +357,8 @@ STRING_REPLACE_HELP6 "Ersetze %s\n" STRING_REPLACE_HELP7 "Keine Dateien hinzugefÃ¼gt\n" STRING_REPLACE_HELP8 "%lu Datei(en) hinzugefÃ¼gt\n" - STRING_REPLACE_HELP9 "FÃ¼ge %s hinzu (Y/N) " - STRING_REPLACE_HELP10 "Ersetze %s (Y/N) " + STRING_REPLACE_HELP9 "FÃ¼ge %s hinzu (J/N) " + STRING_REPLACE_HELP10 "Ersetze %s (J/N) " STRING_REPLACE_HELP11 "FÃ¼ge %s hinzu\n" STRING_SHIFT_HELP "VerÃ¤ndert die Position ersetzbarer Parameter in einem Batchprogramm.\n\n\ SHIFT [DOWN]" @@ -367,7 +367,7 @@ Reihe Reihe, in die der Curser bewegt werden soll\n\ Spalte Spalte, in die der Curser bewegt werden soll" STRING_SET_HELP "Setzt oder lÃ¶scht Umgebungsvariablen fÃ¼r CMD.EXE oder zeigt diese an.\n\n\ -SET [variable[=][Zeichenfolge]]\n\n\ +SET [Variable[=][Zeichenfolge]]\n\n\ Variable Bezeichnet den Namen der Umgebungsvariablen.\n\ Zeichenfolge Eine Zeichenfolge, die der Variable zugewiesen werden soll.\n\n\ Der Befehl SET ohne Parameter zeigt die aktuellen Umgebungsvariablen an.\n" @@ -376,7 +376,7 @@ Befehl Befehl welcher ausgefÃ¼hrt werden soll\n\n\ Achtung: Derzeit werden alle Befehle asynchron ausgefÃ¼hrt.\n" STRING_TITLE_HELP "Legt den Fenstertitel fÃ¼r das Eingabeaufforderungsfenster fest.\n\n\ -TITLE [string]\n\n\ +TITLE [Zeichenfolge]\n\n\ Zeichenfolge Bezeichnet den Titel des Eingabeaufforderungsfensters." STRING_TIME_HELP1 "Stellt die Systemzeit oder zeigt sie an.\n\n\ TIME [/T][Zeit]\n\n\ @@ -420,15 +420,15 @@ und Sie kÃ¶nnen die Software unter bestimmten Bedingungen weiter\n\ vertreiben; tippen Sie `ver /R' fÃ¼r nÃ¤here Informationen darÃ¼ber.\n\ Tippen Sie `ver /C' um die Mitwirkenden (Credits) aufzulisten." - STRING_VERSION_HELP3 "\n This program is distributed in the hope that it will be useful,\n\ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ - GNU General Public License for more details." - STRING_VERSION_HELP4 "\n This program is free software; you can redistribute it and/or modify\n\ - it under the terms of the GNU General Public License as published by\n\ - the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version." - STRING_VERSION_HELP5 "\nSenden Sie Bug-Reports an <ros-dev(a)reactos.org>.\n\ + STRING_VERSION_HELP3 "\n Dieses Programm wir in der Hoffnung, dass es nÃ¼tzlich ist,\n\ + jedoch OHNE JEGLICHE GARANTIE, auch die der implizierten Garantie der \n\ + MARKTFÃHIGKEIT und der EIGNUNG FÃR EINEN BESTIMMTEN ZWECK, verteilt. \n\ + Siehe GNU General Public License fÃ¼r weitere Details.\n" + STRING_VERSION_HELP4 "\n Dieses Programm ist freie Software; Sie kÃ¶nnen es verteilen\n\ + und/oder unter den Bedingungnen der GNU General Public License, von der\n\ + Free Software Foundation entweder in Version 2 oder\n\ + (nach eigenem Belieben) jeder hÃ¶heren Version verÃ¶ffentlicht, verÃ¤ndern." + STRING_VERSION_HELP5 "\nSenden Sie Fehlerberichte an <ros-dev(a)reactos.org>.\n\ Updates sind auf der offiziellen ReactOS-Webseite verfÃ¼gbar:\n\ http://www.reactos.org" STRING_VERSION_HELP6 "\nFreeDOS-Version programmiert von:\n" @@ -438,21 +438,21 @@ STRING_VOL_HELP3 " DatentrÃ¤ger-Seriennummer: %04X-%04X\n" STRING_VOL_HELP4 "Zeigt die Laufwerksbezeichnung und die Seriennummer an, falls diese existieren.\n\nVOL [drive:]" STRING_WINDOW_HELP1 "VerÃ¤ndert die GrÃ¶Ãe des Konsolenfensters\n\n\ -WINDOW [/POS[=]left,top,width,heigth]\n\ - [MIN|MAX|RESTORE] ['title']\n\n\ +WINDOW [/POS[=]links, oben, Breite, HÃ¶he]\n\ + [MIN|MAX|RESTORE] ['Titel']\n\n\ /POS Gibt Position und GrÃ¶Ãe des Fensters an\n\ MIN minimiert das Fenster\n\ MAX maximiert das Fenster\n\ RESTORE stellt das Fenster wieder her" STRING_WINDOW_HELP2 "VerÃ¤ndert die GrÃ¶Ãe des Konsolenfensters\n\n\ -ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ - [MIN|MAX|RESTORE] ['title']\n\n\ +ACTIVATE 'window' [/POS[=]links, oben, Breite, HÃ¶he]\n\ + [MIN|MAX|RESTORE] ['Titel']\n\n\ window Titel des Fensters, das bearbeitet wird\n\ /POS einstellen der Fensterplatzierung und der Dimensionen\n\ MIN minimiert das Fenster\n\ MAX maximiert das Fenster\n\ RESTORE stellt das Fenster wieder her\n\ -title neuer Titel" +Titel neuer Titel" STRING_CHOICE_OPTION "JN" STRING_COPY_OPTION "JNA" STRING_ALIAS_ERROR "Die Befehlszeile ist zu lange nach der Alias-Erweiterung!\n" @@ -460,7 +460,7 @@ STRING_BATCH_ERROR "Es trat ein Fehler auf, wÃ¤hrend die Batchdatei geÃ¶ffnet wurde.\n" STRING_CHCP_ERROR1 "Aktive Codepage: %u\n" STRING_CHCP_ERROR4 "UngÃ¼ltige Codepage\n" - STRING_CHOICE_ERROR "UngÃ¼ltige Option. Erwartetes Format: /C[:]options" + STRING_CHOICE_ERROR "UngÃ¼ltige Option. Erwartetes Format: /C[:]Optionen" STRING_CHOICE_ERROR_TXT "UngÃ¼ltige Option. Erwartetes Format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "UngÃ¼ltige Option: %s" STRING_CMD_ERROR1 "Die Eingaben konnten nicht umgeleitet werden (von der Datei) %s\n" @@ -509,10 +509,10 @@ STRING_ERROR_INVALID_PARAM_FORMAT "UngÃ¼ltiges Parameterformat - %s\n" STRING_ERROR_BADCOMMAND "UngÃ¼ltiger Befehl oder Dateiname - %s\n" STRING_ERROR_OUT_OF_MEMORY "Fehler: Zu wenig Speicher verfÃ¼gbar.\n" - STRING_ERROR_CANNOTPIPE "Fehler: Cannot pipe! TemporÃ¤re Datei kann nicht geÃ¶ffnet werden!\n" + STRING_ERROR_CANNOTPIPE "Fehler: Pipen nicht mÃ¶glich! TemporÃ¤re Datei kann nicht geÃ¶ffnet werden!\n" STRING_ERROR_D_PAUSEMSG "DrÃ¼cken Sie eine beliebige Taste . . ." STRING_ERROR_DRIVER_NOT_READY "Laufwerk ist nicht bereit" - STRING_PATH_ERROR "CMD: Nicht in environment '%s'\n" + STRING_PATH_ERROR "CMD: Nicht in Umgebung '%s'\n" STRING_REPLACE_ERROR1 "UngÃ¼ltiger Parameter - %s\n" STRING_REPLACE_ERROR2 "Pfad wurde nicht gefunden - %s\n" STRING_REPLACE_ERROR3 "Der Dateiname, Ordnername oder die Syntax der Volumenbezeichung sind inkorrekt.\n" @@ -520,9 +520,9 @@ STRING_REPLACE_ERROR5 "Zugriff verweigert - %s\n" STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n" - STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " + STRING_CMD_INFOLINE " ReactOS Eingabeaufforderung HELP eingeben = Hilfe " STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s-%s]\n" - STRING_CMD_SHELLINFO "\nReactOS-Befehlszeileninterpreter\nVersion %s %s" + STRING_CMD_SHELLINFO "\nReactOS Eingabeaufforderung\nVersion %s %s" STRING_VERSION_RUNNING_ON "LÃ¤uft in: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" STRING_COPY_FILE " %d Datei(en) kopiert\n"

9 years, 8 months

[hbelusca] 66555: [TRANSLATION]: Global Romanian translation update, by Stefan Fulea. See CORE-9313 for all the details! CORE-9313 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 3 20:49:07 2015 New Revision: 66555 URL: http://svn.reactos.org/svn/reactos?rev=66555&view=rev Log: [TRANSLATION]: Global Romanian translation update, by Stefan Fulea. See CORE-9313 for all the details! CORE-9313 #resolve #comment Committed, thanks! Added: trunk/reactos/base/system/services/lang/ro-RO.rc (with props) trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc (with props) trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/spider/lang/ro-RO.rc trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc trunk/reactos/base/applications/mmc/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/winhlp32/lang/Ro.rc trunk/reactos/base/applications/wordpad/lang/Ro.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/services/services.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/win32/browseui/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/media/doc/Romanian translation notes.txt trunk/reactos/media/inf/wdmaudio.inf trunk/reactos/media/themes/lautus.msstyles/lautus.rc Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,4 +1,8 @@ -/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +/* +Translators: Petru Dumitriu (petrimetri at gmail dot com) + Ètefan Fulea (stefan dot fulea at mail dot md) +*/ + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL /* Dialogs */ @@ -346,7 +350,7 @@ MENUITEM SEPARATOR MENUITEM "GrupeazÄ &cifrele", IDM_VIEW_GROUP, CHECKED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDM_HELP_HELP MENUITEM SEPARATOR @@ -379,7 +383,7 @@ MENUITEM SEPARATOR MENUITEM "GrupeazÄ &cifrele", IDM_VIEW_GROUP, CHECKED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDM_HELP_HELP MENUITEM SEPARATOR @@ -402,7 +406,7 @@ MENUITEM SEPARATOR MENUITEM "GrupeazÄ &cifre", IDM_VIEW_GROUP, CHECKED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDM_HELP_HELP MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -78,7 +78,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_GAME_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦\tF1", IDM_HELP_CONTENTS MENUITEM "&Despreâ¦", IDM_HELP_ABOUT Modified: trunk/reactos/base/applications/games/spider/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,11 +1,4 @@ -/* - * PROJECT: Spider Solitaire - * LICENSE: See COPYING in top level directory - * FILE: base/applications/games/spider/lang/en-US.rc - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum at fulea.stefan) - * LAST CHANGE: 2011-12-18 corrections - */ - +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL /* Dialoguri */ @@ -66,7 +59,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_GAME_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦\tF1", IDM_HELP_CONTENTS MENUITEM "&Despreâ¦", IDM_HELP_ABOUT Modified: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,3 +1,4 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE @@ -22,7 +23,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+X", IDM_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "Scoruri ma&xime", IDM_TIMES MENUITEM "&Despreâ¦", IDM_ABOUT Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -14,7 +14,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", IDM_HELP_ABOUT END @@ -32,7 +32,7 @@ BEGIN MENUITEM "List", IDM_WINDOWS_LIST END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", IDM_HELP_ABOUT END Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -32,7 +32,7 @@ MENUITEM SEPARATOR MENUITEM "Control &volumâ¦", IDM_VOLUMECTL END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", IDM_ABOUT END Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,4 +1,7 @@ -/* 2011.10.19 - Fulea Ètefan: minor changes */ +/* +Translators: Petru Dumitriu (petrimetri at gmail dot com) + Ètefan Fulea (stefan dot fulea at mail dot md) +*/ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -10,11 +13,11 @@ END POPUP "A&cÈiune" BEGIN - MENUITEM "Im&primare", IDC_PRINT, GRAYED + MENUITEM "I&mprimare", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "P&roprietÄÈi", IDC_PROP, GRAYED MENUITEM SEPARATOR - MENUITEM "&?", IDC_PROGHELP, GRAYED + MENUITEM "Aj&utor", IDC_PROGHELP, GRAYED END POPUP "&AfiÈare" BEGIN @@ -25,7 +28,7 @@ MENUITEM SEPARATOR MENUITEM "AfiÈea&zÄ dispozitive ascunse", IDC_SHOWHIDDEN END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDC_PROGHELP MENUITEM "Despreâ¦", IDC_ABOUT Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,4 +1,4 @@ -//2011.10.19 - Fulea Ètefan: minor changes +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDR_MAINMENU MENU @@ -20,7 +20,7 @@ MENUITEM "Resurse dupÄ t&ip", IDC_STATIC, GRAYED MENUITEM "Resurse dupÄ c&onexiune", IDC_STATIC, GRAYED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "Despreâ¦", IDC_ABOUT END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,10 +1,13 @@ -/* Romanian translation by Petru Dimitriu and Ètefan Fulea */ +/* +Translators: Petru Dumitriu (petrimetri at gmail dot com) + Ètefan Fulea (stefan dot fulea at mail dot md) +*/ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDM_EVENTVWR MENU BEGIN - POPUP "J&urnal" + POPUP "&Jurnal" BEGIN MENUITEM "PÄstrare p&rotocolâ¦", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR @@ -17,7 +20,7 @@ MENUITEM "Ãmp&rospÄtare", IDM_REFRESH END MENUITEM "&OpÈiuni", IDM_OPTIONS - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDM_HELP MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -13,21 +13,21 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire", ID_EXIT END - POPUP "AcÈi&uni" + POPUP "A&cÈiuni" BEGIN MENUITEM "Co&nectare laâ¦", ID_CONNECT, GRAYED MENUITEM SEPARATOR MENUITEM "P&orneÈte", ID_START, GRAYED MENUITEM "&OpreÈte", ID_STOP, GRAYED - MENUITEM "S&uspendÄ", ID_PAUSE, GRAYED - MENUITEM "&ContinuÄ", ID_RESUME, GRAYED + MENUITEM "Ãntr&erupe", ID_PAUSE, GRAYED + MENUITEM "R&eia", ID_RESUME, GRAYED MENUITEM "&ReporneÈte", ID_RESTART, GRAYED MENUITEM SEPARATOR MENUITEM "ÃmprospÄtea&zÄ", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Mo&dificareâ¦", ID_EDIT, GRAYED - MENUITEM "Cre&areâ¦", ID_CREATE, GRAYED - MENUITEM "&Eliminareâ¦", ID_DELETE, GRAYED + MENUITEM "&Creareâ¦", ID_CREATE, GRAYED + MENUITEM "Elimin&areâ¦", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "&ProprietÄÈiâ¦", ID_PROP, GRAYED END @@ -40,7 +40,7 @@ MENUITEM SEPARATOR MENUITEM "Pa&rticularizareâ¦", ID_VIEW_CUST, GRAYED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", ID_HELP MENUITEM "&Despreâ¦", ID_ABOUT @@ -53,14 +53,14 @@ BEGIN MENUITEM "P&orneÈte", ID_START, GRAYED MENUITEM "&OpreÈte", ID_STOP, GRAYED - MENUITEM "S&uspendÄ", ID_PAUSE, GRAYED - MENUITEM "&ContinuÄ", ID_RESUME, GRAYED + MENUITEM "Ãntr&erupe", ID_PAUSE, GRAYED + MENUITEM "R&eia", ID_RESUME, GRAYED MENUITEM "&ReporneÈte", ID_RESTART, GRAYED MENUITEM SEPARATOR MENUITEM "ÃmprospÄtea&zÄ", ID_REFRESH MENUITEM SEPARATOR MENUITEM "Mo&dificareâ¦", ID_EDIT, GRAYED - MENUITEM "&Eliminareâ¦", ID_DELETE, GRAYED + MENUITEM "Elimin&areâ¦", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "&ProprietÄÈiâ¦", ID_PROP, GRAYED MENUITEM SEPARATOR @@ -91,8 +91,8 @@ COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST PUSHBUTTON "P&orneÈte", IDC_START, 6, 155, 54, 15, WS_DISABLED PUSHBUTTON "&OpreÈte", IDC_STOP, 68, 155, 54, 15, WS_DISABLED - PUSHBUTTON "S&uspendÄ", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED - PUSHBUTTON "&ContinuÄ", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Ãntr&erupe", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "R&eia", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED LTEXT "Nume serviciu:", IDC_STATIC, 4, 11, 53, 11 LTEXT "Nume afiÈat:", IDC_STATIC, 4, 29, 53, 11 LTEXT "Descriere:", IDC_STATIC, 4, 51, 53, 11 @@ -226,7 +226,7 @@ IDS_TOOLTIP_DELETE "EliminÄ un serviciu existent" IDS_TOOLTIP_START "PorneÈte serviciul" IDS_TOOLTIP_STOP "OpreÈte serviciul" - IDS_TOOLTIP_PAUSE "SuspendÄ serviciul" + IDS_TOOLTIP_PAUSE "Ãntrerupe serviciul" IDS_TOOLTIP_RESTART "ReporneÈte serviciul" END @@ -234,8 +234,8 @@ BEGIN IDS_PROGRESS_INFO_START "Se Ã®ncearcÄ pornirea urmÄtorului serviciu" IDS_PROGRESS_INFO_STOP "Se Ã®ncearcÄ oprirea urmÄtorului serviciu" - IDS_PROGRESS_INFO_PAUSE "Se Ã®ncearcÄ suspendarea urmÄtorului serviciu" - IDS_PROGRESS_INFO_RESUME "Se Ã®ncearcÄ a se continua urmÄtorul serviciu" + IDS_PROGRESS_INFO_PAUSE "Se Ã®ncearcÄ Ã®ntreruperea urmÄtorului serviciu" + IDS_PROGRESS_INFO_RESUME "Se Ã®ncearcÄ reluarea urmÄtorului serviciu" IDS_CREATE_SUCCESS "Serviciu creat cu succes" IDS_DELETE_SUCCESS "Serviciu eliminat cu succes" IDS_CREATE_REQ "CÃ¢mpurile cu\nasterisc sunt obligatorii" @@ -256,8 +256,8 @@ IDS_HINT_CONNECT " GestioneazÄ un alt calculator." IDS_HINT_START " PorneÈte serviciul selectat." IDS_HINT_STOP " OpreÈte serviciul selectat." - IDS_HINT_PAUSE " SuspendÄ serviciul selectat." - IDS_HINT_RESUME " ContinuÄ serviciul selectat." + IDS_HINT_PAUSE " Ãntrerupe serviciul selectat." + IDS_HINT_RESUME " Reia serviciul selectat." IDS_HINT_RESTART " OpreÈte apoi reporneÈte serviciul selectat." IDS_HINT_REFRESH " ÃmprospÄteazÄ lista de servicii." IDS_HINT_EDIT " EditeazÄ proprietÄÈile serviciului selectat." Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -80,7 +80,7 @@ MENUITEM "PaletÄ &modernÄ", IDM_COLORSMODERNPALETTE MENUITEM "PaletÄ &veche", IDM_COLORSOLDPALETTE END - POPUP "&Ajutor" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDM_HELPHELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -63,7 +63,7 @@ BEGIN MENUITEM "&BarÄ de stare", CMD_STATUSBAR END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", CMD_HELP_CONTENTS MENUITEM "&CÄutareâ¦", CMD_HELP_SEARCH @@ -78,37 +78,37 @@ DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Configurare paginÄ" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "Previzionare", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "HÃ¢rtie", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "F&ormat:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "&Tip:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + GROUPBOX "Orientare", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&VerticalÄ", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "Ori&zontalÄ", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Margini", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "StÃ¢ng&a:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "&Dreapta:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "S&us:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "&Jos:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "Ant&et:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "Su&bsol:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "&Manualâ¦", IDHELP, 8, 170, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "Imp&rimantÄâ¦", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -187,5 +187,5 @@ STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Linie %d, coloanÄ %d" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR "Nu se poate imprima fiÈierul '%s'.\n\nAsiguraÈi-vÄ cÄ imprimanta este pornitÄ Èi configuratÄ corespunzÄtor." END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -26,7 +26,7 @@ MENUITEM SEPARATOR MENUITEM "&ActualizeazÄ baza de date", ID_RESETDB END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", ID_HELP, GRAYED MENUITEM "&Despreâ¦", ID_ABOUT Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -20,7 +20,7 @@ BEGIN MENUITEM "I&eÈire", ID_REGISTRY_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", ID_HELP_ABOUT END @@ -81,7 +81,7 @@ MENUITEM "&AdaugÄ la favorite", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED MENUITEM "&EliminÄ favorite", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -61,7 +61,7 @@ MENUITEM "&AdaugÄ ecou", ID_EFFECTS_ECHO MENUITEM "In&verseazÄ", ID_EFFECTS_REVERSE END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", ID_ABOUT END Modified: trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,10 +1,4 @@ -/* - * FILE: base/applications/sndvol32/lang/ro-RO.rc - * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) - * LAST CHANGE: 2011-12-19 small correction - */ - +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDM_MAINMENU MENU @@ -16,7 +10,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire", IDC_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", IDC_HELP_TOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -64,7 +64,7 @@ MENUITEM "Deconectea&zÄ", ID_SHUTDOWN_DISCONNECT, GRAYED MENUITEM "&EliminÄ calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Manualâ¦", ID_HELP_TOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/winhlp32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Ro.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -52,7 +52,7 @@ MENUITEM "M&are", MNID_OPTS_FONTS_LARGE END } - POPUP "&?" { + POPUP "Aj&utor" { MENUITEM "&Despreâ¦", MNID_HELP_HELPON MENUITEM "Ã&ntotdeauna deasupra", MNID_HELP_HELPTOP MENUITEM "In&formaÈiiâ¦", MNID_HELP_ABOUT Modified: trunk/reactos/base/applications/wordpad/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -90,7 +90,7 @@ MENUITEM "&GÄlbui de post-it\tCtrl+2", ID_BACK_2 END END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despre Wine Wordpadâ¦", ID_ABOUT END Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -153,6 +153,6 @@ IDS_SUMMARYSUBTITLE "Lista cu opÈiuni de instalare ce necesitÄ verificare Ã®nainte de a continua instalarea." IDS_ABORTSETUP "ReactOS Ã®ncÄ nu este complet instalat Ã®n calculator. Daca Ã®ntrerupeÈi procesul de instalare, pentru a instala va fi necesarÄ repetarea paÈilor parcurÈi pÃ¢nÄ acum. Sigur doriÈi asta?" IDS_ABORTSETUP2 "AbandonaÈi instalarea?" - IDS_NO_TXTSETUP_SIF "Unable to find 'txtsetup.sif'\nSetup is unable to continue." + IDS_NO_TXTSETUP_SIF "Nu se poate gÄsi âtxtsetup.sifâ\nInstalarea nu se poate continua." IDS_CAPTION "Asistentul de instalare ReactOS" END Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,9 +1,7 @@ /* * FILE: base/shell/cmd/lang/ro-RO.rc * ReactOS Project (http://www.reactos.org) - * TRANSLATOR: Fulea Ètefan (PM on ReactOS Forum to fulea.stefan) - * CHANGE LOG: 2011-08-25 initial translation - * 2011-10-30 UTF-8 encoding (with diacritics conversion), minor changes + * TRANSLATOR: Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -558,7 +556,7 @@ STRING_REPLACE_ERROR5 "Acces nepermis - %s\n" STRING_REPLACE_ERROR6 "FiÈierele nu au fost gÄsite - %s\n" STRING_REPLACE_ERROR7 "Eroare ExtinsÄ 32\n" - STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " + STRING_CMD_INFOLINE " Interpretorul de comenzi ReactOS TastaÈi HELP = Ajutor " STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n" STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s" STRING_VERSION_RUNNING_ON "OperÃ¢nd pe: " Added: trunk/reactos/base/system/services/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/ro-RO.rc (added) +++ trunk/reactos/base/system/services/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -0,0 +1,13 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "porneÈte" + IDS_SERVICE_STOP "opreÈte" + IDS_SERVICE_PAUSE "Ã®ntrerupe" + IDS_SERVICE_RESUME "reia" + IDS_SERVICE_RUNNING "Ãn curs" + IDS_SERVICE_STOPPED "Oprit" + IDS_SERVICE_PAUSED "Ãntrerupt" +END Propchange: trunk/reactos/base/system/services/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -19,3 +19,7 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif + +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -1,4 +1,4 @@ -/* Romanian translation by Fulea Ètefan */ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -19,7 +19,7 @@ MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_EXIT END - POPUP "&?" + POPUP "Aj&utor" BEGIN MENUITEM "&Despreâ¦", IDM_ABOUT END Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -98,7 +98,7 @@ IDS_NONE "(nespecificat)" IDS_UNKNOWN "(necunoscut)" IDS_RESTART "DoriÈi sÄ reporniÈi calculatorul acum?" - IDS_WHATS_THIS "Ce-i asta?" + IDS_WHATS_THIS "Aceasta ce este?" IDS_LANGUAGE "LimbÄ" IDS_LAYOUT "Aranjament de tastaturÄ" IDS_REM_QUESTION "DoriÈi eliminarea aranjamentului de tastaturÄ slectat?" Added: trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc (added) +++ trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -0,0 +1,7 @@ +/* Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_NAME "SpaÈiu de nume Obiect NT" +END Propchange: trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -20,4 +20,8 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" -#endif +#endif + +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif Modified: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -72,7 +72,7 @@ MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&OpÈiuni de dosarâ¦", IDM_TOOLS_FOLDEROPTIONS END - POPUP "&?", FCIDM_MENU_HELP + POPUP "Aj&utor", FCIDM_MENU_HELP BEGIN MENUITEM "&Este aceastÄ copie a ReactOS legalÄ?", IDM_HELP_ISTHISCOPYLEGAL MENUITEM "&Despreâ¦", IDM_HELP_ABOUT @@ -102,7 +102,7 @@ LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 - PUSHBUTTON "Cancel", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 205, 65, 50, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE } IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33 @@ -138,8 +138,8 @@ STRINGTABLE BEGIN - IDS_CANCELLING "Canceling..." - IDS_REMAINING "Remaining" + IDS_CANCELLING "Anulareâ¦" + IDS_REMAINING "RÄmas" END STRINGTABLE @@ -272,5 +272,5 @@ STRINGTABLE BEGIN - IDS_STANDARD_TOOLBAR, "|Back|Forward|Up|Search|Folders|Move To|Copy To|Delete|Undo|Views|Stop|Refresh|Home|Map Drive|Disconnect|Favorites|History|Full Screen|Properties|Cut|Copy|Paste|Folder Options||" -END + IDS_STANDARD_TOOLBAR, "|Ãnapoi|Ãnainte|Sus|CautÄ|Dosare|MutÄ Ã®n|Copie Ã®n|Èterge|AnuleazÄ|AfiÈÄri|OpreÈte|ÃmprospÄteazÄ|AcasÄ|ConecteazÄ unitate|DeconecteazÄ|Favorite|Istoric|Pe tot ecranul|ProprietÄÈi|DecupeazÄ|Copie|LipeÈte|OpÈiuni dosar||" +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -668,7 +668,7 @@ IDS_VIEW_SMALL "&Pictograme" IDS_VIEW_LIST "&ListÄ" IDS_VIEW_DETAILS "&Detalii" - IDS_SELECT "SelecteazÄ" + IDS_SELECT "Selectea&zÄ" IDS_OPEN "&Deschide" IDS_CREATELINK "CreeazÄ sc&urtÄturÄ" IDS_COPY "&CopiazÄ" @@ -678,7 +678,7 @@ IDS_RESTORE "&RestabileÈte" IDS_FORMATDRIVE "F&ormatareâ¦" IDS_RENAME "Rede&numeÈte" - IDS_PASTE "Inserea&zÄ" + IDS_PASTE "&LipeÈte" IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Eroare de permisiune." IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" @@ -695,12 +695,12 @@ IDS_OVERWRITEFILE_CAPTION "Confirmarea Ã®nlocuirii fiÈierului" IDS_OVERWRITEFOLDER_TEXT "Acest dosar deja conÈine un sub-dosar cu numele â%1â.\n\nDacÄ fiÈierele din dosarul de destinaÈie au acelaÈi nume ca cele din\ndosarul selectat, ele vor fi Ã®nlocuite. Sigur doriÈi sÄ copiaÈi sau\nsÄ mutaÈi dosarul?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" - IDS_FILEOOP_PREFLIGHT "Preflight" + IDS_FILEOOP_COPYING "Se copie" + IDS_FILEOOP_MOVING "Se mutÄ" + IDS_FILEOOP_DELETING "Se Èterge" + IDS_FILEOOP_FROM_TO "Din %1 Ã®n %2" + IDS_FILEOOP_FROM "Din %1" + IDS_FILEOOP_PREFLIGHT "Se verificÄ" /* message box strings */ IDS_RESTART_TITLE "Repornire" Modified: trunk/reactos/media/doc/Romanian translation notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/Romanian%20trans… ============================================================================== --- trunk/reactos/media/doc/Romanian translation notes.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/Romanian translation notes.txt [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -8,8 +8,7 @@ * ConvenÈii adoptate -Normele de traducere curente conÈin Ã®n mare parte normele de traducere adoptate Èi Ã®n alte traduceri Èi localizÄri de logicÄ computaÈionalÄ. Cele mai importante Ã®n aceastÄ privinÈÄ se regÄsesc la i18n.ro Èi anume Ã®n âghidul traducÄtoruluiâ: -http://i18n.ro/Ghidul_traducÄtorului_de_software +Normele de traducere curente conÈin Ã®n mare parte normele de traducere adoptate Èi Ã®n alte traduceri Èi localizÄri de logicÄ computaÈionalÄ. Cele mai importante Ã®n aceastÄ privinÈÄ se regÄsesc la i18n.ro Èi anume Ã®n âghidul traducÄtoruluiâ [1]: Astfel: 1. Se folosesc diacriticele corecte ale limbii romÃ¢ne. 2. Traducerile trebuiesc adaptate respectÃ¢nd topica limbii romÃ¢ne. @@ -20,16 +19,18 @@ 7. Se evitÄ politeÈea excesivÄ prin omiterea expresiilor de politeÈe explicite. 8. Este recomandatÄ o formulare independentÄ de gen (gramatical). 9. Se evitÄ utilizarea diacriticelor ca taste active (acceleratori sau taste de acces). - 10. Se evitÄ utilizarea pe post de taste de acces (evidenÈiate prin subliniere), a literelor âiâ, âlâ Èi âIâ, din cauza lÄÈimii lor reduse care le face dificilÄ reperarea, Èi a literelor âgâ, âjâ, âpâ, âqâ Èi âyâ care ar intersecta marcajul de evidenÈiere. + 10. Pentru tastele de acces (care rÄspund la combinaÈia de taste Â«AltÂ» + Â«tastÄÂ», evidenÈiate prin sublinierea tastei respective): + - Se folosesc doar litere sau cifre (recomandare de la Microsoft [2]: âAccess keys are alphanumeric keysâ). Sunt deci de evitat alte simboluri sau semne de punctuaÈie. + - Sunt de evitat (tot conform aceiaÈi recomandÄri [2]) literele sau cifrele care fac reperarea lor un exerciÈiu dificil, cum e grupul âlâ, â1â, âiâ Èi âIâ (din cauza lÄÈimii lor reduse), sau âgâ, âjâ, âpâ, âqâ Èi âyâ (care intersecteazÄ marcajul de evidenÈiere). 11. Ghilimelele folosite Ã®n limba romÃ¢nÄ sunt perechea ghilimelele-deschise (99 jos) cu ghilimele-Ã®nchise (99 sus), Èi ghilimelele unghiulare. -La acestea se adaugÄ Èi cÃ¢teva norme (deduse) din âgreÈeli frecventeâ raportate tot la i18n.ro: http://i18n.ro/GreÈeli_frecvente +La acestea se adaugÄ Èi cÃ¢teva norme (deduse) din âgreÈeli frecventeâ raportate tot la i18n.ro [3]. 12. Se evitÄ articularea inutilÄ, Ã®nsÄ adaptarea mesajelor traduse trebuie totuÈi sÄ primeaze. 13. Nu se traduc numele proprii, Ã®nsÄ numele traductibile ale componentelor/subcomponentelor unui program sau pachet de programe pot fi traduse. 14. Nu se capitalizeazÄ decÃ¢t prima literÄ dintr-un text. * ParticularizÄri locale -Ãn resursele romÃ¢neÈti din ReactOS existÄ Èi o serie de particularizÄri care fie nu se regÄsesc Ã®n alte traduceri fie din cauza diferenÈelor de naturÄ ale proiectelor, fie e vorba de termeni Ã®ncÄ disputaÈi sau neadoptaÈi Ã®n localizÄrile altor proiecte din diverse motive. Multe dintre acestea au fost menÈionate/discutate Ã®n grupul âDiacriticeâ (http://groups.google.com/group/diacritice). CÃ¢teva dintre cele mai relevante: +Ãn resursele romÃ¢neÈti din ReactOS existÄ Èi o serie de particularizÄri care fie nu se regÄsesc Ã®n alte traduceri fie din cauza diferenÈelor de naturÄ ale proiectelor, fie e vorba de termeni Ã®ncÄ disputaÈi sau neadoptaÈi Ã®n localizÄrile altor proiecte din diverse motive. Multe dintre acestea au fost menÈionate/discutate Ã®n grupul âDiacriticeâ [4]. CÃ¢teva dintre cele mai relevante: 15. Ãn glosar sunt preferate: - âlogicÄ computaÈionalÄâ vs. âsoftwareâ - âconfigurareâ/âparticularizareâ vs. âSetareâ @@ -39,10 +40,16 @@ 16. Acceleratorii (combinaÈiile de taste de gen âÂ«CtrlÂ» + Â«tastÄÂ»â) rÄmÃ¢n aceiaÈi ca Ã®n limba englezÄ. 17. Tastele de acces (combinaÈiile de taste de gen âÂ«AltÂ» + Â«tastÄÂ»â) nu rÄmÃ¢n neapÄrat la fel ca Ã®n limba englezÄ. Ãn mulÈimea de taste cu aceastÄ utilizare: - Se recomandÄ a evita utilizarea literelor âsâ Èi âtâ pe post de taste de acces pentru a preveni confuzia Ã®ntre acestea Èi diacriticele âÈâ Èi âÈâ. - - âfâ Èi ânâ sunt rezervate pentru âConfirmÄâ Èi respectiv âAnuleazÄâ; âaâ pentru âAplicÄâ (dacÄ existÄ Ã®n aceiaÈi fereastrÄ). - - Ãn cazul ferestrelor-asistent, âaâ, âoâ, âfâ Èi ânâ sunt rezervate pentru âÃnainteâ, âÃnapoiâ, âSfÃ¢rÈitâ Èi âAnuleazÄâ. + - âfâ Èi ânâ sunt rezervate pentru âConfirmÄâ Èi respectiv âAnuleazÄâ; âaâ pentru âAplicÄâ (dacÄ existÄ Ã®n aceiaÈi fereastrÄ). Ãn cazul ferestrelor de tip asistent, âaâ, âoâ, âfâ Èi ânâ sunt rezervate respectiv pentru âÃnainteâ, âÃnapoiâ, âSfÃ¢rÈitâ Èi âAnuleazÄâ. [NOTÄ] - Ãn cazul interfeÈelor grafice opÈiunilor âDaâ Èi âNuâ le corespund tastele de acces âaâ Èi âuâ. (Ãn cazul interfeÈelor linie-de-comandÄ, corespunzÄtoare opÈiunilor âDa|Nuâ, care NU sunt taste de acces, rÄmÃ¢n âdâ Èi ânâ.) 18. Din considerente de lizibilitate, Ã®n cazul programelor executate Ã®n linie-de-comandÄ se folosesc doar ghilimele unghiulare. Tot ghilimelele unghiulare sunt preferate Èi pentru citarea tastelor fizice Ã®n mesajele elementelor GUI. 19. EnunÈul de la convenÈia 2 se poate extinde la âtraducerile trebuiesc adaptate respectÃ¢nd (Èi beneficiind de) particularitÄÈile limbii romÃ¢neâ, iar urmÄtoarele zece coonvenÈii ce urmeazÄ dupÄ el (3-13) definesc de fapt reguli implicite aplicabile Ã®n lipsa unui context bine definit Ã®n toate aspectele sale. Unde este posibil, o adaptare la context este dezirabilÄ: - Ãn cazul opÈiunilor despre care existÄ suficiente informaÈii de context, este recomandatÄ flexionarea. De exemplu, opÈiunea nulÄ pentru lista de animaÈii pentru ecran inactiv se poate flexiona Ã®n siguranÈÄ specificÃ¢ndu-i-se genul gramatical feminin - â(nespecificatÄ)â. - Ãn cazul unor subiecte unice (dintr-un context local sau global), se foloseÈte forma articulatÄ. Exemple: âCalculatorul meuâ (numai unul, conÈinut concret), âSistemul de operareâ (unic Ã®n cadrul sÄu), âDocumentele meleâ (conÈinut concret) vs. âLocaÈii Ã®n reÈeaâ (nedefinit), âLinie de comandÄâ (cu multiple posibile instanÈe distincte/independente), etc. + +[1] http://i18n.ro/Ghidul_traducÄtorului_de_software +[2] https://msdn.microsoft.com/en-us/library/ms971323.aspx#atg_keyboardshortcut… +[3] http://i18n.ro/GreÈeli_frecvente +[4] http://groups.google.com/group/diacritice +___________________________ +[NOTÄ] AceastÄ convenÈie deviazÄ de la recomandarea Microsoft [2] de a nu aloca taste de acces pentru controalele cÄrora le corespund efectele implicite ale tastelor Â«EnterÂ» Èi Â«EscÂ», sau care ar putea interfera cu alte grupuri de formulare-client ce utilizeazÄ Èabloanele âConfirmÄâ-âAnuleazÄâ-âAplicÄâ Èi âÃnapoiâ-âÃnainteâ/âSfÃ¢rÈitâ-âAnuleazÄâ. TotuÈi, alocarea de taste de acces nu intrÄ Ã®n conflict cu efectul acÈionÄrii tastelor fizice (dimpotrivÄ, navigÃ¢nd utilizÃ¢nd tasta Â«TabÂ» Ã®ntr-o fereastrÄ de dialog poate schimba efectul implicit al tastei Â«EnterÂ» pe o altceva decÃ¢t butonul-control de confirmare a Ã®ntregii ferestre de dialog). Evitarea suprapunerii cu alte combinaÈii de acces din formularele-client este Èi ea realizabilÄ (Èi recomandatÄ prin urmare Ã®n lista de convenÈii). Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -99,3 +99,9 @@ WDM_DRMKAUD.FriendlyName = "ReactOS Trusted Audio Drivers" drmkaud.SvcDesc = "ReactOS Trusted Audio Drivers" WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "ReactOS WDM Audio Drivers" + +[Strings.0418] +WDM_DRMKAUD.DeviceDesc = "Module-pilot audio de încredere ale ReactOS" +WDM_DRMKAUD.FriendlyName = "Module-pilot audio de încredere ale ReactOS" +drmkaud.SvcDesc = "Module-pilot audio de încredere ale ReactOS" +WDMAUDIO_CopyFilesOnlyId.DeviceDesc = "Module-pilot audio WDM ale ReactOS" Added: trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc (added) +++ trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -0,0 +1,38 @@ +/* Translator: Ètefan Fulea (stefan dot fulea at mail dot md) */ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ +1000, "Ater" +} + +STRINGTABLE +{ +2000, "Lautus Ater" +} + +STRINGTABLE +{ +3000, "NormalÄ" +3001, "Mare" +3002, "Foarte mare" +} + +STRINGTABLE +{ +4000, "NormalÄ" +4001, "Mare" +4002, "Foarte mare" +} + +STRINGTABLE +{ +5000, "Lautus" +5001, "Visual Style" +5002, "ReactOS Foundation" +5003, "Pisarz, based on Luna Inspirat" +5004, "Released under GNU/GPL 2.0, 2011" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Visual Style for ReactOS" +} Propchange: trunk/reactos/media/themes/lautus.msstyles/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Tue Mar 3 20:49:07 2015 @@ -188,4 +188,7 @@ #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" -#endif +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif

9 years, 8 months

[janderwald] 66554: [NTOS] - fix bug

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Mar 3 16:39:31 2015 New Revision: 66554 URL: http://svn.reactos.org/svn/reactos?rev=66554&view=rev Log: [NTOS] - fix bug Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Tue Mar 3 16:39:31 2015 @@ -1330,8 +1330,8 @@ /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ - StartPosition = wcsrchr(SymbolicLinkName->Buffer, L'{'); - EndPosition = wcsrchr(SymbolicLinkName->Buffer, L'}'); + StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); + EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); if (!StartPosition ||!EndPosition || StartPosition > EndPosition) { DPRINT1("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n");

9 years, 8 months

← Newer
1
...
42
43
44
45
46
47
48
49
50
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 March 2015