Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 54450: [MSVCRT_APITEST] Force linking to msvcrt instead of ntdll. Purpose is to test crt from msvcrt not ntdll. Patch by Sylvain Petreolle.
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 22:06:18 2011 New Revision: 54450 URL: http://svn.reactos.org/svn/reactos?rev=54450&view=rev Log: [MSVCRT_APITEST] Force linking to msvcrt instead of ntdll. Purpose is to test crt from msvcrt not ntdll. Patch by Sylvain Petreolle. Modified: trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild Modified: trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/msvcrt_ap… ============================================================================== --- trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild [iso-8859-1] Sat Nov 19 22:06:18 2011 @@ -5,6 +5,7 @@ <include base="msvcrt_apitest">.</include> <library>wine</library> <library>pseh</library> + <library>msvcrt</library> <file>testlist.c</file> <file>ieee.c</file>

1 0

[pschweitzer] 54449: [MSVCRT_APITEST] Fix tests according to the platform they are run on. This fixes msvcrt_apitest crash on w2k3.
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 21:59:12 2011 New Revision: 54449 URL: http://svn.reactos.org/svn/reactos?rev=54449&view=rev Log: [MSVCRT_APITEST] Fix tests according to the platform they are run on. This fixes msvcrt_apitest crash on w2k3. Modified: trunk/rostests/apitests/msvcrt/splitpath.c Modified: trunk/rostests/apitests/msvcrt/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath… ============================================================================== --- trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] Sat Nov 19 21:59:12 2011 @@ -23,6 +23,9 @@ char dir[64]; char fname[32]; char ext[10]; + DWORD Major; + + Major = (DWORD)(LOBYTE(LOWORD(GetVersion()))); _splitpath("c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext); ok_str(drive, "c:"); @@ -34,17 +37,32 @@ _splitpath("c:\\dir1\\dir2\\file.ext", 0, 0, 0, 0); ok_int(*_errno(), 0); - *_errno() = 0; - _splitpath(0, drive, dir, fname, ext); - ok_int(*_errno(), EINVAL); - ok_str(drive, ""); - ok_str(dir, ""); - ok_str(fname, ""); - ok_str(ext, ""); + if (Major >= 6) + { + *_errno() = 0; + _splitpath(0, drive, dir, fname, ext); + ok_int(*_errno(), EINVAL); + ok_str(drive, ""); + ok_str(dir, ""); + ok_str(fname, ""); + ok_str(ext, ""); + } + else + { + win_skip("This test only succeed on NT6+\n"); + } _splitpath("\\\\?\\c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext); - ok_str(drive, "c:"); - ok_str(dir, "\\dir1\\dir2\\"); + if (Major >= 6) + { + ok_str(drive, "c:"); + ok_str(dir, "\\dir1\\dir2\\"); + } + else + { + ok_str(drive, ""); + ok_str(dir, "\\\\?\\c:\\dir1\\dir2\\"); + } ok_str(fname, "file"); ok_str(ext, ".ext"); @@ -61,8 +79,16 @@ ok_str(ext, ".ext"); _splitpath("\\\\?\\0:/dir1\\dir2/file.", drive, dir, fname, ext); - ok_str(drive, "0:"); - ok_str(dir, "/dir1\\dir2/"); + if (Major >= 6) + { + ok_str(drive, "0:"); + ok_str(dir, "/dir1\\dir2/"); + } + else + { + ok_str(drive, ""); + ok_str(dir, "\\\\?\\0:/dir1\\dir2/"); + } ok_str(fname, "file"); ok_str(ext, ".");

1 0

[ekohl] 54448: [SYSDM] - Display all hardware profiles - Add the hardware profile copy dialog to most languages. - Disable the Up, Down, Property, Copy, Rename and Delete buttons in the Hardware Pr...
by ekohl＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: ekohl Date: Sat Nov 19 19:10:18 2011 New Revision: 54448 URL: http://svn.reactos.org/svn/reactos?rev=54448&view=rev Log: [SYSDM] - Display all hardware profiles - Add the hardware profile copy dialog to most languages. - Disable the Up, Down, Property, Copy, Rename and Delete buttons in the Hardware Profiles dialog. Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -8,13 +8,27 @@ */ #include "precomp.h" - -/* Property page dialog callback */ -static INT_PTR CALLBACK -RenameProfDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +#include <debug.h> + +typedef struct _PROFILE +{ + WCHAR szFriendlyName[256]; +} PROFILE, *PPROFILE; + +typedef struct _PROFILEDATA +{ + DWORD dwProfileCount; + PPROFILE pProfiles; +} PROFILEDATA, *PPROFILEDATA; + + +static +INT_PTR +CALLBACK +CopyProfileDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); @@ -36,6 +50,33 @@ static +INT_PTR +CALLBACK +RenameProfileDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); + + switch (uMsg) + { + case WM_COMMAND: + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + } + break; + } + return FALSE; +} + + +static DWORD GetUserWaitInterval(VOID) { @@ -89,10 +130,134 @@ static +BOOL +GetProfileCount(LPDWORD lpProfileCount) +{ + HKEY hKey; + LONG lError; + + *lpProfileCount = 0; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\IDConfigDB\\Hardware Profiles", + 0, + KEY_READ, + &hKey); + if (lError != ERROR_SUCCESS) + return FALSE; + + lError = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, lpProfileCount, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + + RegCloseKey(hKey); + + if (lError != ERROR_SUCCESS) + return FALSE; + + return TRUE; +} + + +static VOID +GetProfile(HWND hwndDlg, HKEY hKey, LPWSTR lpName, PPROFILE pProfile) +{ + HKEY hProfileKey; + DWORD dwSize; + LONG lError; + + lError = RegOpenKeyExW(hKey, + lpName, + 0, + KEY_READ, + &hProfileKey); + if (lError != ERROR_SUCCESS) + return; + + dwSize = 256 * sizeof(WCHAR); + lError = RegQueryValueExW(hProfileKey, + L"FriendlyName", + NULL, + NULL, + (LPBYTE)pProfile->szFriendlyName, + &dwSize); + if (lError == ERROR_SUCCESS) + { + DPRINT1("Profile: %S\n", pProfile->szFriendlyName); + SendDlgItemMessageW(hwndDlg, IDC_HRDPROFLSTBOX, LB_ADDSTRING, 0, (LPARAM)pProfile->szFriendlyName); + } + + RegCloseKey(hProfileKey); +} + + +static +BOOL +GetProfiles(HWND hwndDlg) +{ + PPROFILEDATA pProfileData; + WCHAR szName[8]; + DWORD dwNameLength; + DWORD dwIndex = 0; + HKEY hKey; + LONG lError; + + pProfileData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PROFILEDATA)); + if (pProfileData == NULL) + return FALSE; + + if (!GetProfileCount(&pProfileData->dwProfileCount)) + return FALSE; + + pProfileData->pProfiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pProfileData->dwProfileCount * sizeof(PROFILE)); + if (pProfileData->pProfiles == NULL) + { + HeapFree(GetProcessHeap(), 0, pProfileData); + return FALSE; + } + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pProfileData); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\IDConfigDB\\Hardware Profiles", + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + return FALSE; + + for (dwIndex = 0; dwIndex < pProfileData->dwProfileCount; dwIndex++) + { + dwNameLength = 8; + lError = RegEnumKeyExW(hKey, + dwIndex, + szName, + &dwNameLength, + NULL, + NULL, + NULL, + NULL); + if (lError != ERROR_SUCCESS) + break; + + DPRINT("Profile name: %S\n", szName); + + GetProfile(hwndDlg, hKey, szName, &pProfileData->pProfiles[dwIndex]); + } + + RegCloseKey(hKey); + + return TRUE; +} + + +static +BOOL OnInitDialog(HWND hwndDlg) { DWORD dwWaitInterval; + + DPRINT("OnInitDialog()\n"); SendMessage(GetDlgItem(hwndDlg, IDC_HRDPROFUP), BM_SETIMAGE,(WPARAM)IMAGE_ICON, @@ -101,6 +266,8 @@ BM_SETIMAGE,(WPARAM)IMAGE_ICON, (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_DOWN))); + if (!GetProfiles(hwndDlg)) + return FALSE; SendDlgItemMessageW(hwndDlg, IDC_HRDPROFUPDWN, UDM_SETRANGE, (WPARAM)0, (LPARAM)MAKELONG((SHORT)500, 0)); @@ -116,6 +283,8 @@ CheckDlgButton(hwndDlg, IDC_HRDPROFSELECT, BST_CHECKED); SendDlgItemMessageW(hwndDlg, IDC_HRDPROFUPDWN, UDM_SETPOS, 0, dwWaitInterval); } + + return TRUE; } @@ -139,30 +308,50 @@ /* Property page dialog callback */ -INT_PTR CALLBACK +INT_PTR +CALLBACK HardProfDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PPROFILEDATA pProfileData; + UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); + pProfileData = (PPROFILEDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: - OnInitDialog(hwndDlg); + return OnInitDialog(hwndDlg); + + case WM_DESTROY: + if (pProfileData != NULL) + { + if (pProfileData->pProfiles != NULL) + HeapFree(GetProcessHeap(), 0, pProfileData->pProfiles); + HeapFree(GetProcessHeap(), 0, pProfileData); + } break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_HRDPROFCOPY: + DialogBox(hApplet, + MAKEINTRESOURCE(IDD_COPYPROFILE), + hwndDlg, + (DLGPROC)CopyProfileDlgProc); + break; + case IDC_HRDPROFRENAME: DialogBox(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), hwndDlg, - (DLGPROC)RenameProfDlgProc); + (DLGPROC)RenameProfileDlgProc); break; case IDC_HRDPROFWAIT: Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -68,6 +68,7 @@ PUSHBUTTON "Äîêëàäâàíå íà ãðåøêè", IDC_ERRORREPORT, 160, 192, 90, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -89,12 +90,12 @@ LTEXT "Ìîæåòå íà íàïðàâèòå ïðîôèëè çà ðàçëè÷íî îáîðóäâàíå è ïðè ïóñêàíå äà èçáåðåòå êîé äà èçïîëçâàòå." , IDC_STATIC, 46, 11, 188, 25 LTEXT "Íàëè÷íè ïðîôèëè çà îáîðóäâàíåòî", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 - PUSHBUTTON "&Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 54, 14 - PUSHBUTTON "Çà&ïîìíÿíå", IDC_HRDPROFCOPY, 63, 106, 54, 14 - PUSHBUTTON "Ïðå&èìåíóâàíå", IDC_HRDPROFRENAME, 118, 106, 54, 14 - PUSHBUTTON "Èç&òðèâàíå", IDC_HRDPROFDEL, 173, 106, 54, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15, BS_ICON | WS_DISABLED + PUSHBUTTON "&Ñâîéñòâà", IDC_HRDPROFPROP, 8, 106, 54, 14, WS_DISABLED + PUSHBUTTON "Çà&ïîìíÿíå", IDC_HRDPROFCOPY, 63, 106, 54, 14, WS_DISABLED + PUSHBUTTON "Ïðå&èìåíóâàíå", IDC_HRDPROFRENAME, 118, 106, 54, 14, WS_DISABLED + PUSHBUTTON "Èç&òðèâàíå", IDC_HRDPROFDEL, 173, 106, 54, 14, WS_DISABLED GROUPBOX "Èçáîð íà ïðîôèëè çà îáîðóäâàíåòî", IDC_STATIC, 7, 130, 240, 75 LTEXT "Ïðè ïóñêàíå íà ÐåàêòÎÑ:", IDC_STATIC, 14, 142, 210, 8 @@ -106,6 +107,21 @@ DEFPUSHBUTTON "Äîáðå", IDOK, 143, 213, 50, 14 PUSHBUTTON "Îòêàç", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -72,6 +72,7 @@ PUSHBUTTON "Hláení chyb", IDC_ERRORREPORT, 170, 192, 80, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Nastavení systému" @@ -93,12 +94,12 @@ LTEXT "Zde lze nastavovat hardwarové profily pro rùzné konfigurace hardwaru. Nastavení, které bude pouito, lze vybrat pøi startu systému.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Dostupné hardwarové profily:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Vlastnosti", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopírovat", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Pøejmenovat", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Odstranit", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Vlastnosti", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopírovat", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Pøejmenovat", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Odstranit", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Výbìr hardwarového profilu", IDC_STATIC, 7, 130, 240, 75 LTEXT "Pøi sputìní systému ReactOS:", IDC_STATIC, 14, 142, 210, 8 @@ -110,6 +111,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Storno", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -30,6 +30,7 @@ PUSHBUTTON "&Lizenz anzeigen...", IDC_LICENCE, 170, 199, 78, 14 END + IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" @@ -51,15 +52,16 @@ PUSHBUTTON "Hard&ware-Profile...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Systemeinstellungen" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Versionsinfo",IDC_STATIC,6,3,210,73 - CONTROL "Als Workstation identifizieren",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,110,10 - LTEXT "ReactOS ist als Serversystem konzipiert worden und identifiziert sich auch als solches. Diese Einstellung ändert das Verhalten für Anwendungen.",IDC_STATIC,15,15,183,41 - PUSHBUTTON "OK",IDOK,166,83,50,14 + GROUPBOX "Versionsinfo",IDC_STATIC,6,3,210,73 + CONTROL "Als Workstation identifizieren",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,110,10 + LTEXT "ReactOS ist als Serversystem konzipiert worden und identifiziert sich auch als solches. Diese Einstellung ändert das Verhalten für Anwendungen.",IDC_STATIC,15,15,183,41 + PUSHBUTTON "OK",IDOK,166,83,50,14 END @@ -95,12 +97,12 @@ LTEXT "Sie können Hardwareprofile für verschiedene Hardware-Konfigurationen einrichten. Beim Starten können Sie dann das Profil auswählen, welches benutzt werden soll.", IDC_STATIC, 46, 11, 200, 25 LTEXT "Verfügbare Hardwareprofile:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Eigenschaften", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopieren", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Umbenennen", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Löschen", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Eigenschaften", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopieren", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Umbenennen", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Löschen", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Hardwareprofil-Auswahl", IDC_STATIC, 7, 130, 240, 75 LTEXT "Wenn ReactOS startet:", IDC_STATIC, 14, 142, 210, 8 @@ -112,6 +114,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profil kopieren" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Von:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "Nach:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -43,6 +43,7 @@ PUSHBUTTON "&Ðñïößë õëéêïý...", IDC_HARDWARE_PROFILE, 148, 190, 98, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -54,6 +55,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÅéäéêÝò ñõèìßóåéò" @@ -86,12 +88,12 @@ LTEXT "Ìðïñåßôå íá åãêáôáóôÞóåôå ðñïößë ãéá äéáöïñåôéêÝò ðáñáìÝôñïõò õëéêïý. ÊáôÜ ôçí åêêßíçóç, ìðïñåßôå íá åðéëÝîåôå ôï ðñïößë ôï ïðïßï èÝëåôå íá ÷ñçóéìïðïéÞóåôå.", IDC_STATIC, 46, 11, 188, 25 LTEXT "ÄéáèÝóéìá ðñïößë &õëéêïý:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 - PUSHBUTTON "É&äéüôçôåò", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "Áíôé&ãñáöÞ", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Ìåôïíïìáóßá", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "Äéáãñá&öÞ", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15, BS_ICON | WS_DISABLED + PUSHBUTTON "É&äéüôçôåò", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Áíôé&ãñáöÞ", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Ìåôïíïìáóßá", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Äéáãñá&öÞ", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "ÅðéëïãÞ ðñïößë õëéêïý", IDC_STATIC, 7, 130, 240, 75 LTEXT "¼ôáí îåêéíÜ ôï ReactOS:", IDC_STATIC, 14, 142, 210, 8 @@ -105,6 +107,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "¢êõñï", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -67,6 +67,7 @@ PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -88,12 +89,12 @@ LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Available hardware profiles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Delete", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Delete", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Hardware profiles selection", IDC_STATIC, 7, 130, 240, 75 LTEXT "When ReactOS starts:", IDC_STATIC, 14, 142, 210, 8 @@ -105,6 +106,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -48,6 +48,7 @@ PUSHBUTTON "Perfiles Hard&ware...", IDC_HARDWARE_PROFILE, 138, 190, 106, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Ajustes del sistema" @@ -59,6 +60,7 @@ PUSHBUTTON "Aceptar",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Opciones avanzadas" @@ -91,12 +93,12 @@ LTEXT "Puede configurar perfiles de hardware para diferentes configuraciones de hardware. Puede elegir el perfil que desea usar al inicio.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Perfiles de hardware disponibles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Propiedades", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copiar", IDC_HRDPROFCOPY, 63, 106, 40, 14 - PUSHBUTTON "Cambiar No&mbre", IDC_HRDPROFRENAME, 108, 106, 60, 14 - PUSHBUTTON "&Eliminar", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Propiedades", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copiar", IDC_HRDPROFCOPY, 63, 106, 40, 14, WS_DISABLED + PUSHBUTTON "Cambiar No&mbre", IDC_HRDPROFRENAME, 108, 106, 60, 14, WS_DISABLED + PUSHBUTTON "&Eliminar", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Selección de perfiles de hardware ", IDC_STATIC, 7, 130, 240, 75 LTEXT "Cuando inicie ReactOS:", IDC_STATIC, 13, 142, 210, 8 @@ -108,6 +110,21 @@ DEFPUSHBUTTON "Aceptar", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancelar", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -1,8 +1,4 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDI_CPLSYSTEM ICON "resources/applet.ico" -IDI_DEVMGR ICON "resources/devmgr.ico" -RC_LICENSE RTDATA "resources/gpl.txt" IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -25,6 +21,7 @@ PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 199, 78, 14 END + IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Matériel" @@ -46,6 +43,7 @@ PUSHBUTTON "&Profils Matériels...", IDC_HARDWARE_PROFILE, 135, 190, 110, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -57,6 +55,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avancé" @@ -89,12 +88,12 @@ LTEXT "Vous pouvez paramétrer des profils matériels pour différentes configurations matérielles. Au démarrage, vous pouvez choisir le profil désiré.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Profils Matériels disponibles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Propriétés", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copier", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Renommer", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Effacer", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Propriétés", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copier", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Renommer", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Effacer", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Sélection de Profils Matériels ", IDC_STATIC, 7, 130, 240, 75 LTEXT "Quand ReactOS démarre :", IDC_STATIC, 14, 142, 210, 8 @@ -106,6 +105,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -43,6 +43,7 @@ PUSHBUTTON "Profil Hard&ware...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -54,6 +55,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Lanjutan" @@ -86,12 +88,12 @@ LTEXT "You can set up hardware profiles for different hardware configurations. At startup, you can choose the profile you want to use.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Available hardware profiles:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Delete", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Properties", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copy", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Rename", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Delete", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Hardware profiles selection", IDC_STATIC, 7, 130, 240, 75 LTEXT "When ReactOS starts:", IDC_STATIC, 14, 142, 210, 8 @@ -103,6 +105,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -67,6 +67,7 @@ PUSHBUTTON "Registrazione errori", IDC_ERRORREPORT, 170, 192, 80, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -88,12 +89,12 @@ LTEXT "Profili Hardware mette a disposizione un modo per definire e memorizzare diverse configurazioni hardware. All'avvio del computer è possibile scegliere quale usare.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Profili Hardware disponibili:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Proprietà", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copia", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Rinomina", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "C&ancella", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Proprietà", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copia", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Rinomina", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "C&ancella", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Selezione dei Profili Hardware", IDC_STATIC, 7, 130, 240, 75 LTEXT "All'avvio di ReactOS:", IDC_STATIC, 14, 142, 210, 8 @@ -105,6 +106,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Annulla", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -67,6 +67,7 @@ PUSHBUTTON "G[ñ", IDC_ERRORREPORT, 170, 192, 80, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "VXeÌÝè" @@ -88,12 +89,12 @@ LTEXT "ÙÈén[hEFA\\¬Éí¹½n[hEFA vt@CðZbgAbvÅ«Ü·B N®Égp·évt@CðIðÅ«Ü·B", IDC_STATIC, 46, 11, 188, 25 LTEXT "pÂ\\Èn[hEFA vt@C:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "vpeB(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "Rs[(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "¼OÌÏX(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "í(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "vpeB(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Rs[(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "¼OÌÏX(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "í(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "n[hEFA vt@CÌIð", IDC_STATIC, 7, 130, 240, 75 LTEXT "ReactOS N®Ì®ì:", IDC_STATIC, 14, 142, 210, 8 @@ -105,6 +106,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "LZ", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -44,6 +44,7 @@ PUSHBUTTON "Maskin&vare profiler...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -55,6 +56,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avansert" @@ -87,12 +89,12 @@ LTEXT "Du kan sette opp maskinvareprofiler for forskjellige maskinvarekonfigurasjoner. Ved oppstart, kan du velge hvilken profil du vil bruke.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Tilgjengelige maskinvareprofiler:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Egenskaper", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopier", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Endre navn", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Slett", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Egenskaper", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopier", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Endre navn", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Slett", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Valg av maskinvareprofil", IDC_STATIC, 7, 130, 240, 75 LTEXT "Når ReactOS starter:", IDC_STATIC, 14, 142, 210, 8 @@ -104,6 +106,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -1,4 +1,4 @@ -/* +ï»¿/* * translated by xrogers * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl @@ -52,6 +52,7 @@ PUSHBUTTON "Profile &sprzÄtu", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zaawansowane" @@ -74,6 +75,7 @@ PUSHBUTTON "&Raportowanie bÅÄdÃ³w", IDC_ERRORREPORT, 170, 192, 80, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Ustawienia systemowe" @@ -95,12 +97,12 @@ LTEXT "MoÅ¼esz okreÅliÄ profile sprzÄtu dla rÃ³Å¼nych konfiguracji sprzÄtu. Podczas uruchamiania moÅ¼esz wybraÄ profil, ktÃ³rego chcesz uÅ¼yÄ.", IDC_STATIC, 46, 11, 188, 25 LTEXT "&DostÄpne profile sprzÄtu:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&WÅaÅciwoÅci", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopiuj", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "Z&mieÅ nazwÄ", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&UsuÅ", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&WÅaÅciwoÅci", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopiuj", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Z&mieÅ nazwÄ", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&UsuÅ", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "WybÃ³r profili sprzÄtu", IDC_STATIC, 7, 130, 240, 75 LTEXT "Podczas uruchamiania ReactOS:", IDC_STATIC, 14, 142, 210, 8 @@ -112,6 +114,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -43,6 +43,7 @@ PUSHBUTTON "&Profile hardware", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -54,6 +55,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avansat" @@ -86,12 +88,12 @@ LTEXT "PuteÈi stabili profile de hardware pentru diverse configurÄri de hardware. La pornire puteÈi alege ce profil vreÈi sÄ folosiÈi.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Profile disponibile:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&ProprietÄÈi", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Copiere", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Redenumire", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Eliminare", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&ProprietÄÈi", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Copiere", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Redenumire", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Eliminare", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "SelecÈie profile de hardware", IDC_STATIC, 7, 130, 240, 75 LTEXT "CÃ¢nd ReactOS porneÈte:", IDC_STATIC, 14, 142, 210, 8 @@ -103,6 +105,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Anulare", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +ï»¿LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -43,6 +43,7 @@ PUSHBUTTON "&ÐÑÐ¾ÑÐ¸Ð»Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ...", IDC_HARDWARE_PROFILE, 144, 190, 100, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -54,6 +55,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾" @@ -86,12 +88,12 @@ LTEXT "ÐÐ¾Ð¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Ð¿ÑÐ¾ÑÐ¸Ð»ÐµÐ¹ Ð´Ð»Ñ ÑÐ°Ð·Ð»Ð¸ÑÐ½ÑÑ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ð¹ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð²ÑÐ±ÑÐ°ÑÑ Ð½ÑÐ¶Ð½ÑÐ¹ Ð¿ÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ÑÐ¸ÑÑÐµÐ¼Ñ.", IDC_STATIC, 46, 11, 188, 25 LTEXT "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ Ð¿ÑÐ¾ÑÐ¸Ð»Ð¸ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_HRDPROFPROP, 8, 106, 47, 14 - PUSHBUTTON "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ", IDC_HRDPROFCOPY, 60, 106, 47, 14 - PUSHBUTTON "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ", IDC_HRDPROFRENAME, 112, 106, 59, 14 - PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_HRDPROFDEL, 176, 106, 47, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_HRDPROFPROP, 8, 106, 47, 14, WS_DISABLED + PUSHBUTTON "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ", IDC_HRDPROFCOPY, 60, 106, 47, 14, WS_DISABLED + PUSHBUTTON "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ", IDC_HRDPROFRENAME, 112, 106, 59, 14, WS_DISABLED + PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ", IDC_HRDPROFDEL, 176, 106, 47, 14, WS_DISABLED GROUPBOX "ÐÑÐ±Ð¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ", IDC_STATIC, 7, 130, 240, 75 LTEXT "ÐÑÐ¸ Ð·Ð°Ð³ÑÑÐ·ÐºÐµ ReactOS ÑÐ»ÐµÐ´ÑÐµÑ:", IDC_STATIC, 14, 142, 210, 8 @@ -103,6 +105,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -51,6 +51,7 @@ PUSHBUTTON "&Hardvérové profily...", IDC_HARDWARE_PROFILE, 130, 190, 110, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -62,6 +63,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Spresnenie" @@ -94,12 +96,12 @@ LTEXT "Pre rôzne hardvérové konfigurácie môete nastavi hardvérové profily. Pri spustení je moné vybra profil, ktorý chcete pouíva.", IDC_STATIC, 46, 11, 188, 25 LTEXT "&Dostupné hardvérové profily:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "Vl&astnosti", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopírova", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "Pr&emenova", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Odstráni", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "Vl&astnosti", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopírova", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "Pr&emenova", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Odstráni", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Výber hardvérového profilu", IDC_STATIC, 7, 130, 240, 75 LTEXT "Pri tarte systému ReactOS:", IDC_STATIC, 14, 142, 210, 8 @@ -111,6 +113,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Zrui", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -45,6 +45,7 @@ PUSHBUTTON "&Hårdvaruprofiler...", IDC_HARDWARE_PROFILE, 154, 190, 90, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -56,6 +57,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avancerat" @@ -88,12 +90,12 @@ LTEXT "Du kan ställa in hårdvaruprofiler för olika hårdvarukonfigurationer. Du kan välja vilken profil du vill använda vid start.", IDC_STATIC, 46, 11, 188, 25 LTEXT "Tillgängliga hårdvaruprofiler:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "&Egenskaper", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&Kopiera", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "&Byt namn", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "&Ta bort", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "&Egenskaper", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Kopiera", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Byt namn", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&Ta bort", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Val av hårdvaruprofiler", IDC_STATIC, 7, 130, 240, 75 LTEXT "När ReactOS startar:", IDC_STATIC, 14, 142, 210, 8 @@ -105,6 +107,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: System Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/sysdm/lang/uk-UA.rc @@ -51,6 +51,7 @@ PUSHBUTTON "&ÐÑÐ¾ÑÑÐ»Ñ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ...", IDC_HARDWARE_PROFILE, 154, 190, 90, 14 END + IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾" @@ -74,6 +75,7 @@ PUSHBUTTON "ÐÐ²ÑÑ Ð¿ÑÐ¾ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸", IDC_ERRORREPORT, 170, 192, 80, 14 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸" @@ -85,6 +87,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÑÐ¾ÑÑÐ»Ñ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ" @@ -94,12 +97,12 @@ LTEXT "ÐÐ¾Ð¶Ð½Ð° ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð´ÐµÐºÑÐ»ÑÐºÐ° Ð¿ÑÐ¾ÑÑÐ»ÑÐ² Ð´Ð»Ñ ÑÑÐ·Ð½Ð¸Ñ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÐ¹ ÑÑÑÐ°ÑÐºÑÐ²Ð°Ð½Ð½Ñ Ð¹ Ð²Ð¸Ð±Ð¸ÑÐ°ÑÐ¸ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ð¹ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð¿ÑÐ´ ÑÐ°Ñ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸.", IDC_STATIC, 46, 11, 188, 25 LTEXT "ÐÐ°ÑÐ²Ð½Ñ Ð¿ÑÐ¾ÑÑÐ»Ñ Ð¾Ð±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "Ð&Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "ÐÐµÑÐµÑ&Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸", IDC_HRDPROFRENAME, 116, 106, 54, 14 - PUSHBUTTON "Ð&Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "Ð&Ð»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "ÐÐµÑÐµÑ&Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸", IDC_HRDPROFRENAME, 116, 106, 54, 14, WS_DISABLED + PUSHBUTTON "Ð&Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "ÐÐ¸Ð±ÑÑ Ð¿ÑÐ¾ÑÑÐ»Ñ ÑÑÑÐ°ÑÐºÑÐ²Ð°Ð½Ð½Ñ", IDC_STATIC, 7, 130, 240, 75 LTEXT "ÐÑÐ´ ÑÐ°Ñ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ReactOS ÑÐ»ÑÐ´:", IDC_STATIC, 14, 142, 210, 8 @@ -111,6 +114,21 @@ DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -71,6 +71,7 @@ PUSHBUTTON "´íÎó±¨¸æ", IDC_ERRORREPORT, 170, 192, 80, 15 END + IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "System Settings" @@ -82,6 +83,7 @@ PUSHBUTTON "OK",IDOK,166,83,50,14 END + IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ó²¼þÅäÖÃÎÄ¼þ" @@ -91,12 +93,12 @@ LTEXT "¿ÉÒÔÎª²»Í¬µÄÓ²¼þÅäÖÃ´´½¨Ó²¼þÅäÖÃÎÄ¼þ¡£ÔÚÆô¶¯Ê±£¬¿ÉÒÔÑ¡ÔñÏ£ÍûÊ¹ÓÃµÄÅäÖÃÎÄ¼þ¡£", IDC_STATIC, 46, 11, 188, 25 LTEXT "¿ÉÓÃµÄÓ²¼þÅäÖÃÎÄ¼þ:", IDC_STATIC, 8, 41, 120, 8 LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY - PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON - PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON - PUSHBUTTON "ÊôÐÔ(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14 - PUSHBUTTON "¸´ÖÆ(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14 - PUSHBUTTON "ÖØÃüÃû(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14 - PUSHBUTTON "É¾³ý(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14 + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 14, BS_ICON | WS_DISABLED + PUSHBUTTON "ÊôÐÔ(&P)", IDC_HRDPROFPROP, 8, 106, 50, 14, WS_DISABLED + PUSHBUTTON "¸´ÖÆ(&C)", IDC_HRDPROFCOPY, 63, 106, 50, 14, WS_DISABLED + PUSHBUTTON "ÖØÃüÃû(&R)", IDC_HRDPROFRENAME, 118, 106, 50, 14, WS_DISABLED + PUSHBUTTON "É¾³ý(&D)", IDC_HRDPROFDEL, 173, 106, 50, 14, WS_DISABLED GROUPBOX "Ó²¼þÅäÖÃÎÄ¼þÑ¡Ôñ", IDC_STATIC, 7, 130, 240, 75 LTEXT "Æô¶¯ ReactOS Ê±:", IDC_STATIC, 14, 142, 210, 8 @@ -108,6 +110,21 @@ DEFPUSHBUTTON "È·¶¨", IDOK, 143, 213, 50, 14 PUSHBUTTON "È¡Ïû", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Copy Profile" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "From:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 + LTEXT "To:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 199, 30, 50, 14 END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Sat Nov 19 19:10:18 2011 @@ -149,10 +149,17 @@ #define IDC_HRDPROFUPDWN 1112 +/* copy profile */ +#define IDD_COPYPROFILE 1200 +#define IDC_COPYPROFILEFROM 1201 +#define IDC_COPYPROFILETO 1202 + + /* rename profile */ -#define IDD_RENAMEPROFILE 1200 -#define IDC_RENPROFEDITFROM 1201 -#define IDC_RENPROFEDITTO 1202 +#define IDD_RENAMEPROFILE 1300 +#define IDC_RENPROFEDITFROM 1301 +#define IDC_RENPROFEDITTO 1302 + /* licence */ #define IDD_LICENCE 1500

1 0

[pschweitzer] 54447: [CRT] Check for NaN and set error accordingly
by pschweitzer＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: pschweitzer Date: Sat Nov 19 19:01:58 2011 New Revision: 54447 URL: http://svn.reactos.org/svn/reactos?rev=54447&view=rev Log: [CRT] Check for NaN and set error accordingly Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c Modified: trunk/reactos/lib/sdk/crt/math/i386/ldexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ldex… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ldexp.c [iso-8859-1] Sat Nov 19 19:01:58 2011 @@ -19,11 +19,22 @@ Boston, MA 02110-1301, USA. */ +#include <precomp.h> #include <math.h> +#include <float.h> double ldexp (double value, int exp) { register double result; + + /* Check for value correctness + * and set errno if required + */ + if (_isnan(value)) + { + errno = EDOM; + } + #ifdef __GNUC__ #if defined(__clang__) asm ("fild %[exp]\n" @@ -33,20 +44,20 @@ : [value] "0" (value), [exp] "m" (exp)); #else asm ("fscale" - : "=t" (result) + : "=t" (result) : "0" (value), "u" ((double)exp) : "1"); #endif #else /* !__GNUC__ */ - register double __dy = (double)exp; - __asm - { - fld __dy - fld value - fscale - fstp result - } + register double __dy = (double)exp; + __asm + { + fld __dy + fld value + fscale + fstp result + } #endif /* !__GNUC__ */ - return result; + return result; }

1 0

[jgardou] 54446: [NTOSKRNL] - Add comment regarding r54445
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 17:54:33 2011 New Revision: 54446 URL: http://svn.reactos.org/svn/reactos?rev=54446&view=rev Log: [NTOSKRNL] - Add comment regarding r54445 Modified: trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Nov 19 17:54:33 2011 @@ -309,6 +309,7 @@ } /* Setup the flags */ + // FIXME : FILE_OPEN_FOR_BACKUP_INTENT is unimplemented and breaks 3rd stage boot IoFlags = //FILE_OPEN_FOR_BACKUP_INTENT | FILE_NO_COMPRESSION | FILE_RANDOM_ACCESS |

1 0

[jgardou] 54445: [NTOSKRNL] - Attempt to fix 3rd stage boot
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 17:32:03 2011 New Revision: 54445 URL: http://svn.reactos.org/svn/reactos?rev=54445&view=rev Log: [NTOSKRNL] - Attempt to fix 3rd stage boot Modified: trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Nov 19 17:32:03 2011 @@ -309,7 +309,7 @@ } /* Setup the flags */ - IoFlags = FILE_OPEN_FOR_BACKUP_INTENT | + IoFlags = //FILE_OPEN_FOR_BACKUP_INTENT | FILE_NO_COMPRESSION | FILE_RANDOM_ACCESS | (NoBuffering ? FILE_NO_INTERMEDIATE_BUFFERING : 0);

1 0

[jgardou] 54444: [NTOSKRNL] - add some debug prints
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 17:20:39 2011 New Revision: 54444 URL: http://svn.reactos.org/svn/reactos?rev=54444&view=rev Log: [NTOSKRNL] - add some debug prints Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat Nov 19 17:20:39 2011 @@ -1787,6 +1787,7 @@ } else { + DPRINT1("CmpLinkHiveToMaster failed, Status %lx\n", Status); /* FIXME: TODO */ ASSERT(FALSE); } Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Nov 19 17:20:39 2011 @@ -343,7 +343,19 @@ FILE_SYNCHRONOUS_IO_NONALERT | IoFlags, NULL, 0); - if ((NT_SUCCESS(Status)) && (MarkAsSystemHive)) + /* Check if anything failed until now */ + if (!NT_SUCCESS(Status)) + { + /* Close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + DPRINT1("ZwCreateFile failed : %lx.\n", Status); + *Primary = NULL; + return Status; + } + + if (MarkAsSystemHive) { /* We opened it, mark it as a system hive */ Status = ZwFsControlFile(*Primary, @@ -370,18 +382,16 @@ /* If we don't support it, ignore the failure */ if (Status == STATUS_INVALID_DEVICE_REQUEST) Status = STATUS_SUCCESS; - /* If we failed, close the handle */ - if (!NT_SUCCESS(Status)) ZwClose(*Primary); - } - - /* Check if anything failed until now */ - if (!NT_SUCCESS(Status)) - { - /* Close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); - ObDereferenceObject(Event); - ZwClose(EventHandle); - return Status; + if (!NT_SUCCESS(Status)) + { + /* Close handles and free buffers */ + if (NameBuffer) ExFreePool(NameBuffer); + ObDereferenceObject(Event); + ZwClose(EventHandle); + ZwClose(*Primary); + *Primary = NULL; + return Status; + } } /* Disable compression */

1 0

[rharabien] 54443: [INF] - Don't place Polish translation in German section
by rharabien＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: rharabien Date: Sat Nov 19 17:03:00 2011 New Revision: 54443 URL: http://svn.reactos.org/svn/reactos?rev=54443&view=rev Log: [INF] - Don't place Polish translation in German section Modified: trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5444… ============================================================================== Binary files - no diff available.

1 0

[jgardou] 54442: [WINDEF.H] - you never use enough brackets
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 16:13:31 2011 New Revision: 54442 URL: http://svn.reactos.org/svn/reactos?rev=54442&view=rev Log: [WINDEF.H] - you never use enough brackets Modified: trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Nov 19 16:13:31 2011 @@ -246,8 +246,8 @@ #endif #endif -#define MAKEWORD(a,b) ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | ((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8)) -#define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | ((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16)) +#define MAKEWORD(a,b) ((WORD)(((BYTE)((DWORD_PTR)(a) & 0xff)) | (((WORD)((BYTE)((DWORD_PTR)(b) & 0xff))) << 8))) +#define MAKELONG(a,b) ((LONG)(((WORD)((DWORD_PTR)(a) & 0xffff)) | (((DWORD)((WORD)((DWORD_PTR)(b) & 0xffff))) << 16))) #define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff)) #define HIWORD(l) ((WORD)((DWORD_PTR)(l) >> 16)) #define LOBYTE(w) ((BYTE)((DWORD_PTR)(w) & 0xff))

1 0

[jgardou] 54441: [NTOSKRNL] - add (yet another) sanity ASSERT
by jgardou＠svn.reactos.org 19 Nov '11

19 Nov '11

Author: jgardou Date: Sat Nov 19 16:08:26 2011 New Revision: 54441 URL: http://svn.reactos.org/svn/reactos?rev=54441&view=rev Log: [NTOSKRNL] - add (yet another) sanity ASSERT Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Nov 19 16:08:26 2011 @@ -2554,6 +2554,7 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + ASSERT(MemoryArea); Segment = MemoryArea->Data.SectionData.Segment; if ((Segment->WriteCopy) &&

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs