Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29364: - start implementing create shortcut wizard
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Wed Oct 3 03:34:00 2007 New Revision: 29364 URL: http://svn.reactos.org/svn/reactos?rev=29364&view=rev Log: - start implementing create shortcut wizard Added: trunk/reactos/dll/cpl/appwiz/resources/watermark.bmp - copied unchanged from r29363, trunk/reactos/dll/win32/syssetup/resources/watermark.bmp Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/appwiz.def trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc trunk/reactos/dll/cpl/appwiz/lang/en-US.rc trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Wed Oct 3 03:34:00 2007 @@ -29,7 +29,7 @@ #include <windows.h> #include <commctrl.h> #include <cpl.h> - +#include <prsht.h> #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -347,3 +347,97 @@ return TRUE; } + +INT_PTR +CALLBACK +WelcomeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + break; + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case EN_CHANGE: + if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXTLENGTH, 0, 0)) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + } + else + { + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + } + } + + } + return FALSE; +} + +INT_PTR +CALLBACK +FinishDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); + break; + } + return FALSE; +} + + +LONG CALLBACK +NewLinkHere(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +{ + PROPSHEETHEADERW psh; + HPROPSHEETPAGE ahpsp[2]; + PROPSHEETPAGE psp; + UINT nPages = 0; + + /* Create the Welcome page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.hInstance = hApplet; + psp.pfnDlgProc = WelcomeDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_LOCATION); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create the Finish page */ + psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; + psp.pfnDlgProc = FinishDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_SHORTCUT_FINISH); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + + /* Create the property sheet */ + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_WIZARD97 | PSH_WATERMARK; + psh.hInstance = hApplet; + psh.hwndParent = NULL; + psh.nPages = nPages; + psh.nStartPage = 0; + psh.phpage = ahpsp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + + /* Display the wizard */ + PropertySheet(&psh); + + return TRUE; + + + + + + + + return FALSE; +} Modified: trunk/reactos/dll/cpl/appwiz/appwiz.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.def?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.def (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.def Wed Oct 3 03:34:00 2007 @@ -2,5 +2,6 @@ EXPORTS CPlApplet +NewLinkHere ; EOF Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc Wed Oct 3 03:34:00 2007 @@ -16,5 +16,6 @@ 123 24 DISCARDABLE "manifest.xml" IDI_CPLSYSTEM ICON "resources/applet.ico" +IDB_WATERMARK BITMAP "resources/watermark.bmp" #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/bg-BG.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Äîáàâÿíå/Ïðåìàõâàíå íà ïðîãðàìè" Modified: trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/cs-CZ.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Pøidat/Odebrat aplikace" Modified: trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/da-DK.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/da-DK.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Tekst 3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Tilføjer/Fjerner Programmer" Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit\nlokalen oder vernetzten Programmen, Dateien, Ordnern,\nComputern oder Internetaddressen erstellen.", -1, 120, 15, 200, 30 + LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Klicken Sie auf ""Weiter"", um den Installationsvorgang\nfortzusetzen.", -1, 120, 100, 180, 20 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Klicken Sie auf ""Fertig stellen"", um die Verknüpfung zu erstellen.", -1, 120, 50, 150, 20 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Programme hinzufügen/entfernen" Modified: trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/el-GR.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ðñïóèáöáßñåóç ðñïãñáììÜôùí" Modified: trunk/reactos/dll/cpl/appwiz/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/en-US.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,31 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + + + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Add/Remove Programs" Modified: trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/es-ES.rc Wed Oct 3 03:34:00 2007 @@ -50,6 +50,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Añadir/Remover Programas" Modified: trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/fr-FR.rc Wed Oct 3 03:34:00 2007 @@ -46,6 +46,28 @@ LTEXT "Texte 3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ajout/Supression de programmes" Modified: trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/hu-HU.rc Wed Oct 3 03:34:00 2007 @@ -45,6 +45,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Szoftverek hozzáadása és eltávolítása" Modified: trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/id-ID.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Tambah/Hapus Program" Modified: trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/it-IT.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Testo3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Aggiungi/Rimuovi programmi" Modified: trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ja-JP.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "vOÌÇÁÆí" Modified: trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/nl-NL.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Software" Modified: trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/pl-PL.rc Wed Oct 3 03:34:00 2007 @@ -46,6 +46,28 @@ LTEXT "Tekst3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Dodaj/Usuñ programy" Modified: trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/ru-RU.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Óñòàíîâêà è óäàëåíèå ïðîãðàìì" Modified: trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/th-TH.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/th-TH.rc Wed Oct 3 03:34:00 2007 @@ -44,6 +44,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "à¾ÔèÁ/¶Í´¶Í¹ â»Ãá¡ÃÁ" Modified: trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/appwiz/lang/uk-UA.rc Wed Oct 3 03:34:00 2007 @@ -52,6 +52,28 @@ LTEXT "Text3",-1,10,55,120,20 END +IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create Shortcut" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 + LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 280, 60, 70, 15, ES_LEFT + LTEXT "Click Next to continue.", -1, 120, 100, 90, 10 +END + +IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Select a Title for the Program" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + LTEXT "Click Finish to create the shortcut.", -1, 120, 50, 150, 10 +END + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì" Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h Wed Oct 3 03:34:00 2007 @@ -14,18 +14,25 @@ /* ids */ #define IDI_CPLSYSTEM 1500 +#define IDB_WATERMARK 1501 -#define IDD_PROPPAGEINSTALL 100 -#define IDD_PROPPAGEROSSETUP 101 +#define IDD_PROPPAGEINSTALL 100 +#define IDD_PROPPAGEROSSETUP 101 +#define IDD_SHORTCUT_LOCATION 102 +#define IDD_SHORTCUT_FINISH 103 #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 /* controls */ -#define IDC_INSTALL 101 -#define IDC_SOFTWARELIST 102 -#define IDC_ADDREMOVE 103 -#define IDC_SHOWUPDATES 104 +#define IDC_INSTALL 201 +#define IDC_SOFTWARELIST 202 +#define IDC_ADDREMOVE 203 +#define IDC_SHOWUPDATES 204 +#define IDC_SHORTCUT_LOCATION 205 +#define IDC_SHORTCUT_BROWSE 206 +#define IDC_SHORTCUT_NAME 207 + #endif /* __CPL_RESOURCE_H */

1 0

[janderwald] 29363: - remove small hack - enhance debug statement - port the drive general / tools property dialog to all languages (english translation)
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Wed Oct 3 02:09:12 2007 New Revision: 29363 URL: http://svn.reactos.org/svn/reactos?rev=29363&view=rev Log: - remove small hack - enhance debug statement - port the drive general / tools property dialog to all languages (english translation) Modified: trunk/reactos/dll/win32/shell32/fprop.c trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Wed Oct 3 02:09:12 2007 @@ -200,7 +200,6 @@ WCHAR resultstr[MAX_PATH]; HWND hDlgCtrl; LARGE_INTEGER file_size; - WCHAR szFormat[] = { '%','u',' ','B','y','t','e','s',0 }; if (lpfilename == NULL) return FALSE; @@ -250,21 +249,16 @@ return FALSE; } CloseHandle(hFile); -#if 0 - if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr))) + if (!StrFormatByteSizeW(file_size.QuadPart, resultstr, sizeof(resultstr) / sizeof(WCHAR))) return FALSE; -#else - sprintfW(resultstr, szFormat, file_size.QuadPart); -#endif - - hDlgCtrl = GetDlgItem(hwndDlg, 14011); - TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); - SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); + hDlgCtrl = GetDlgItem(hwndDlg, 14011); + TRACE("result size %u resultstr %s\n", file_size.QuadPart, debugstr_w(resultstr)); + SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)resultstr); - if (lpfilesize) + if (lpfilesize) lpfilesize->QuadPart = (ULONGLONG)file_size.QuadPart; - return TRUE; + return TRUE; } /************************************************************************* @@ -573,7 +567,7 @@ UINT num_pages = 0; DWORD dwHandle = 0; - TRACE("SH_ShowPropertiesDialog entered\n"); + TRACE("SH_ShowPropertiesDialog entered filename %s\n", debugstr_w(lpf)); if (lpf== NULL) return FALSE; Modified: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Bg.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Bg.rc Wed Oct 3 02:09:12 2007 @@ -202,24 +202,61 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } @@ -295,4 +332,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ca.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ca.rc Wed Oct 3 02:09:12 2007 @@ -117,24 +117,62 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } Modified: trunk/reactos/dll/win32/shell32/shell32_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Cn.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Cn.rc Wed Oct 3 02:09:12 2007 @@ -118,24 +118,62 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } Modified: trunk/reactos/dll/win32/shell32/shell32_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Cs.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Cs.rc Wed Oct 3 02:09:12 2007 @@ -204,24 +204,62 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } Modified: trunk/reactos/dll/win32/shell32/shell32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Da.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Da.rc Wed Oct 3 02:09:12 2007 @@ -117,19 +117,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Wed Oct 3 02:09:12 2007 @@ -346,7 +346,7 @@ IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Lokaler Datenträger" - IDS_DRIVE_CDROM "CD-Laufwerk" - IDS_DRIVE_NETWORK "Netzwerklaufwerk" -} + IDS_DRIVE_FIXED "Lokaler Datenträger" + IDS_DRIVE_CDROM "CD-Laufwerk" + IDS_DRIVE_NETWORK "Netzwerklaufwerk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_En.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_En.rc Wed Oct 3 02:09:12 2007 @@ -215,24 +215,62 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { } @@ -308,4 +346,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Eo.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Eo.rc Wed Oct 3 02:09:12 2007 @@ -117,19 +117,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Es.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Es.rc Wed Oct 3 02:09:12 2007 @@ -204,19 +204,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -314,4 +352,7 @@ IDS_COMMON_PICTURES "Documentos\\Mis imágenes" IDS_COMMON_VIDEO "Documentos\\Mis vídeos" IDS_CDBURN_AREA "Configuración local\\Datos de programa\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Fi.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Fi.rc Wed Oct 3 02:09:12 2007 @@ -203,19 +203,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -296,4 +334,7 @@ IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset Asetukset\\Ohjelmien Tiedot\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Fr.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Fr.rc Wed Oct 3 02:09:12 2007 @@ -206,19 +206,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -315,4 +353,7 @@ IDS_COMMON_PICTURES "Documents\\Mes images" IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Hu.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Hu.rc Wed Oct 3 02:09:12 2007 @@ -206,18 +206,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } @@ -299,4 +336,7 @@ IDS_COMMON_PICTURES "Dokumentumok\\Képek" IDS_COMMON_VIDEO "Dokumentumok\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_It.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_It.rc Wed Oct 3 02:09:12 2007 @@ -204,18 +204,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } Modified: trunk/reactos/dll/win32/shell32/shell32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ja.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ja.rc Wed Oct 3 02:09:12 2007 @@ -203,19 +203,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -296,4 +334,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ko.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ko.rc Wed Oct 3 02:09:12 2007 @@ -117,19 +117,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Nl.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Nl.rc Wed Oct 3 02:09:12 2007 @@ -117,19 +117,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_No.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_No.rc Wed Oct 3 02:09:12 2007 @@ -203,19 +203,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -296,4 +334,7 @@ IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" IDS_CDBURN_AREA "Lokale innstillinger\\Applikasjon Data\\Microsoft\\CD Brenning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Pl.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Pl.rc Wed Oct 3 02:09:12 2007 @@ -205,18 +205,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extras" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } Modified: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Pt.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Pt.rc Wed Oct 3 02:09:12 2007 @@ -204,18 +204,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } @@ -296,4 +333,7 @@ IDS_COMMON_PICTURES "Documentos\\Minhas Imagens" IDS_COMMON_VIDEO "Documentos\\Meus Vídeos" IDS_CDBURN_AREA "Configurações locais\\Dados de aplicativos\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ru.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ru.rc Wed Oct 3 02:09:12 2007 @@ -204,19 +204,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -297,4 +335,7 @@ IDS_COMMON_PICTURES "Îáùèå äîêóìåíòû\\Ìîè ðèñóíêè" IDS_COMMON_VIDEO "Îáùèå äîêóìåíòû\\Ìîè ôèëüìû" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokal Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Si.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Si.rc Wed Oct 3 02:09:12 2007 @@ -117,18 +117,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } Modified: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Sk.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Sk.rc Wed Oct 3 02:09:12 2007 @@ -117,19 +117,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Sv.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Sv.rc Wed Oct 3 02:09:12 2007 @@ -203,18 +203,55 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } @@ -312,4 +349,7 @@ IDS_COMMON_PICTURES "Delade dokument\\Mina bilder" IDS_COMMON_VIDEO "Delade dokument\\Mina videoklipp" IDS_CDBURN_AREA "Lokala inställningar\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Uk.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Uk.rc Wed Oct 3 02:09:12 2007 @@ -204,19 +204,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} - -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -{ -} +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED +} + +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tools" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +{ + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +} + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 @@ -296,4 +334,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_CDROM "CDROM" + IDS_DRIVE_NETWORK "Network Disk" +} Modified: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Wa.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Wa.rc Wed Oct 3 02:09:12 2007 @@ -122,19 +122,57 @@ } -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 Modified: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Zh.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Zh.rc Wed Oct 3 02:09:12 2007 @@ -116,20 +116,57 @@ EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT|WS_BORDER|WS_VSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY } - -DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "General" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP + LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "", 14002, 110, 55, 100, 10 + + + LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 + + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 + LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "", 14004, 110, 90, 120, 10 + LTEXT "", 14005, 200, 90, 40, 10 + + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 + LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "", 14006, 110, 105, 120, 10 + LTEXT "", 14007, 200, 105, 40, 10 + + LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "", 14008, 110, 125, 120, 10 + LTEXT "", 14009, 200, 125, 40, 10 + + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Drive %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" +CAPTION "Tools" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { + GROUPBOX "Error-checking", -1, 5, 5, 230, 60 + LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 + PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP } + DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130

1 0

[dreimer] 29362: Bug 2716: Italian translation for Logoff (folleinvasato@yahoo.it)
by dreimer＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: dreimer Date: Wed Oct 3 01:04:32 2007 New Revision: 29362 URL: http://svn.reactos.org/svn/reactos?rev=29362&view=rev Log: Bug 2716: Italian translation for Logoff (folleinvasato(a)yahoo.it) Added: trunk/reactos/base/applications/logoff/lang/it-IT.rc Modified: trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc trunk/reactos/base/applications/logoff/rsrc.rc Modified: trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc Wed Oct 3 01:04:32 2007 @@ -14,4 +14,4 @@ IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n" -} +} Added: trunk/reactos/base/applications/logoff/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/logoff/lang/it-IT.rc Wed Oct 3 01:04:32 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Termina una sessione.\n\n\ + /v\t\tVisualizza le informazioni sulle azioni effettuate.\n\ + /?\t\tVisualizza questa guida.\n\n" + +IDS_LOGOFF_REMOTE, "Sto terminando una sessione su una macchina remota." +IDS_LOGOFF_LOCAL, "Sto terminando la sessione corrente su questa macchina." + +IDS_ILLEGAL_PARAM, "Parametri non validi\n" +} +/* EOF */ Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc Wed Oct 3 01:04:32 2007 @@ -4,6 +4,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/ru-RU.rc"

1 0

[dreimer] 29361: Bug 2708: Ukrainian translation update (temarez@yandex.ru) Bug 2712: Lithuanian translation (cman@cman.us) Bug 2713: Italian translation for FIND (folleinvasato@yahoo.it) Bug 2714: Italian translation for MORE (folleinvasato@yahoo.it)
by dreimer＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: dreimer Date: Wed Oct 3 00:50:52 2007 New Revision: 29361 URL: http://svn.reactos.org/svn/reactos?rev=29361&view=rev Log: Bug 2708: Ukrainian translation update (temarez(a)yandex.ru) Bug 2712: Lithuanian translation (cman(a)cman.us) Bug 2713: Italian translation for FIND (folleinvasato(a)yahoo.it) Bug 2714: Italian translation for MORE (folleinvasato(a)yahoo.it) Added: trunk/reactos/base/applications/charmap/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc trunk/reactos/base/applications/control/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/matrix/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc trunk/reactos/base/applications/screensavers/starfield/lang/lt-LT.rc Modified: trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/matrix/rsrc.rc trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc trunk/reactos/base/applications/screensavers/starfield/starfield.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Added: trunk/reactos/base/applications/charmap/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/charmap/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,44 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/charmap/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-23 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Simboliø lentelë" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Ðriftas:", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Pagalba", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Simboliai kopijavimui:", IDC_STATIC, 6, 188, 72, 9 + EDITTEXT IDC_TEXTBOX, 81, 186, 107, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Parinkti", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Kopijuoti", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Apie simboliø lentelæ" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Uþverti", IDOK, 83, 161, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "&Apie..." +END Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Wed Oct 3 00:50:52 2007 @@ -15,6 +15,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/lt-LT.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,17 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\ + /C Conta il numero di linee che contengono la stringa\n\ + /I Ignora maiuscole/minuscole\n\ + /N Numera le linee visualizzate a partire da 1\n\ + /V Visualizza le linee che non contengono la stringa" + +IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n" + +IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n" + +} Added: trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS find command + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/find/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-23 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ieðkomas tekstas.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\ + /C Skaièiuoti eilutes, kuriose yra ieðkomas tekstas\n\ + /I Ignoruoti raidþiø dydá\n\ + /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ + /V Spausdinti eilutes, kuriose nëra ieðkomo teksto" + +IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos nëra\n" + +IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n" + +} Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Wed Oct 3 00:50:52 2007 @@ -4,5 +4,7 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/it-IT.rc" +#include "lang/lt-LT.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,15 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Visualizza dati una schermata per volta.\n\n\ + MORE < [Drive:][Path]File\n\ + Comando | MORE \n\ + MORE [Drive:][Path]File\n\n\ + [Drive:][Path]File Il file da visualizzare.\n\ + Comando\t\t Il comando di cui l'output dev'essere visualizzato.\n\n\ + Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n" + + IDS_CONTINUE, " -- Continua (100%) -- " + IDS_FILE_ACCESS, "Impossibile accedere al file %s." +} Added: trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS more command + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/more/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-23 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Atvaizduoja duomenis puslapiais.\n\n\ + MORE < [Diskas:][Kelias iki bylos]Bylos vardas\n\ + Komanda | MORE \n\ + MORE [Diskas:][Kelias iki bylos]Bylos vardas\n\n\ + [Diskas:][Kelias iki bylos]Bylos vardas Byla, kurios turinys turi bûti\n\ + atvaizduotas.\n\ + Komanda Komanda, kurios rezultatas turi\n\ + bûti atvaizduotas.\n\n\ + Pasirodþius raginimui ""-- Toliau --"" spauskite bet kurá klaviðà, kad\n\ + pamatytumëte sekantá puslapá.\n" + + IDS_CONTINUE, " -- Toliau (100%) -- " + IDS_FILE_ACCESS, "Nepavyko atverti bylos %s." +} Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Wed Oct 3 00:50:52 2007 @@ -4,4 +4,6 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/it-IT.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" Added: trunk/reactos/base/applications/control/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/control/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,30 @@ +/* + * PROJECT: ReactOS System Control Panel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/control/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-23 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Byla" + BEGIN + MENUITEM "&Baigti", IDM_CLOSE + END + POPUP "&Rodymas" + BEGIN + MENUITEM "Didelës piktogramos", IDM_LARGEICONS + MENUITEM "Maþos piktogramos", IDM_SMALLICONS + MENUITEM "Sàraðas", IDM_LIST + MENUITEM "Detalus sàraðas", IDM_DETAILS + END + POPUP "&Pagalba" + BEGIN + MENUITEM "&Apie", IDM_ABOUT + END +END + Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc (original) +++ trunk/reactos/base/applications/control/rsrc.rc Wed Oct 3 00:50:52 2007 @@ -22,6 +22,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc (original) +++ trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc Wed Oct 3 00:50:52 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Cylinders fractal + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/cylfrac/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-24 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Cylinders fractal" + IDS_TITLE "Apie" + IDS_TEXT "Cylinders fractal sukurtas unC0Rr.\nSpecialiai ReactOS." +END Added: trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Logon ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/logon/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-24 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon ekrano uþsklanda" + IDS_TITLE "Apie" + IDS_TEXT "Nëra keièiamø parametrø." +END Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Wed Oct 3 00:50:52 2007 @@ -16,6 +16,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/matrix/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,62 @@ +/* + * PROJECT: ReactOS Matrix ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/matrix/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-24 + */ + +#include "resource.h" + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix ekrano uþsklandos nustatymai" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Dekodavimo &greitis",IDC_STATIC,7,7,128,36 + LTEXT "Lëtas",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Greitas",IDC_STATIC,104,24,29,8 + GROUPBOX "Ðifro &tankumas",IDC_STATIC,7,50,128,36 + LTEXT "Maþas",IDC_STATIC,13,67,28,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Didelis",IDC_STATIC,104,67,29,8 + GROUPBOX "&Praneðimo vaizdavimo greitis",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Lëtas",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Greitas",IDC_STATIC,104,110,27,8 + GROUPBOX "Ðrifto &dydis",IDC_STATIC,7,137,127,36 + LTEXT "Maþas",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Didelis",IDC_STATIC,104,153,25,8 + GROUPBOX "&Koduoti praneðimai",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Átraukti",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Paðalinti",IDC_REMOVE,280,66,44,18 + CONTROL "Atsitiktiniai praneðimai",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,91,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Atðaukti",IDCANCEL,283,162,50,14 + LTEXT "&Ðriftas:",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "Pus&juodis ðriftas",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,77,10 + CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix ekrano uþsklanda" +END Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Wed Oct 3 00:50:52 2007 @@ -11,6 +11,7 @@ #include "lang/en-US.rc" #include "lang/de-DE.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/th-TH.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Default ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/scrnsave/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-24 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Standartinë ekrano uþsklanda" + IDS_TITLE "Apie" + IDS_TEXT "Nëra keièiamø parametrø." +END Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc Wed Oct 3 00:50:52 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/starfield/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/lang/lt-LT.rc Wed Oct 3 00:50:52 2007 @@ -1,0 +1,17 @@ +/* + * PROJECT: ReactOS Starfield ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/starfield/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-24 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Starfield ekrano uþsklanda" + IDS_TITLE "Apie" + IDS_TEXT "Nëra keièiamø parametrø." +END Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rc (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rc Wed Oct 3 00:50:52 2007 @@ -13,6 +13,7 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Wed Oct 3 00:50:52 2007 @@ -13,19 +13,19 @@ STRINGTABLE DISCARDABLE { -STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\ -ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ +STRING_ATTRIB_HELP, "Â³äîáðàæåííÿ àáî çì³íà àòðèáóò³â ôàéëó.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] ôàéë ...\n\ [/S [/D]]\n\n\ - + Sets an attribute\n\ - - Clears an attribute\n\ - R Read-only file attribute\n\ - A Archive file attribute\n\ - S System file attribute\n\ - H Hidden file attribute\n\ - /S Processes matching files in the current directory\n\ - and all subdirectories\n\ - /D Processes directories as well\n\n\ -Type ATTRIB without a parameter to display the attributes of all files.\n" + + Óñòàíîâêà àòðèáóòó\n\ + - Çíÿòòÿ àòðèáóòó\n\ + R Àòðèáóò ôàéëó ""Ëèøå ÷èòàííÿ""\n\ + A Àòðèáóò ôàéëó ""Àðõ³âíèé""\n\ + S Àòðèáóò ôàéëó ""Ñèñòåìíèé""\n\ + H Àòðèáóò ôàéëó ""Ïðèõîâàíèé""\n\ + /S Îáðîáêà ôàéë³â ç³ âêàçàíèìè ³ìåíàìè â ïîòî÷í³é ïàïö³\n\ + ³ ó âñ³õ ¿¿ ï³äïàïêàõ\n\ + /D Îáðîáêà òàêîæ ³ ïàïîê\n\n\ +Ââåä³òü ATTRIB áåç ïàðàìåòðà, ùîá âèâåñòè àòðèáóòè âñ³õ ôàéë³â.\n" STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\ ALIAS [alias=[command]]\n\n\ Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Wed Oct 3 00:50:52 2007 @@ -107,7 +107,7 @@ CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Ðîçòàøóéòå çíà÷êè ìîí³òîð³â â³äïîâ³äíî äî ôàêòè÷íîãî ðîçòàøóâàííÿ ìîí³òîð³â.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåìàº>",IDC_SETTINGS_DEVICE,9,109,224,8 @@ -134,9 +134,9 @@ IDR_PREVIEW_MENU MENU BEGIN - MENUITEM "Çâè÷àéíà", ID_MENU_NORMAL - MENUITEM "Âèìêíåíà", ID_MENU_DISABLED - MENUITEM "Âèáðàíà", ID_MENU_SELECTED + MENUITEM "Çâè÷àéíå", ID_MENU_NORMAL + MENUITEM "Âèìêíåíå", ID_MENU_DISABLED + MENUITEM "Âèáðàíå", ID_MENU_SELECTED END STRINGTABLE

1 0

[fireball] 29360: - Temporary revert 29342. See issue #2715 for more details.
by fireball＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: fireball Date: Wed Oct 3 00:09:31 2007 New Revision: 29360 URL: http://svn.reactos.org/svn/reactos?rev=29360&view=rev Log: - Temporary revert 29342. See issue #2715 for more details. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Wed Oct 3 00:09:31 2007 @@ -17,6 +17,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* BIOS Memory Map. Not NTLDR-compliant yet */ +extern ULONG KeMemoryMapRangeCount; +extern ADDRESS_RANGE KeMemoryMap[64]; /* FUNCTIONS *****************************************************************/ @@ -532,6 +536,14 @@ /* HACK for MmUpdatePageDir */ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; + /* Initialize Kernel Memory Address Space */ + MmInit1(MmFreeLdrFirstKrnlPhysAddr, + MmFreeLdrLastKrnlPhysAddr, + MmFreeLdrLastKernelAddress, + KeMemoryMap, + KeMemoryMapRangeCount, + 4096); + /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (KeFeatureBits & KF_MMX) ? TRUE: FALSE; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Wed Oct 3 00:09:31 2007 @@ -16,10 +16,19 @@ /* GLOBALS *****************************************************************/ -BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; -extern KMUTANT MmSystemLoadLock; -extern ULONG KeMemoryMapRangeCount; -extern ADDRESS_RANGE KeMemoryMap[64]; +/* + * Compiler defined symbols + */ +#if 0 +extern unsigned int _image_base__; +extern unsigned int _text_start__; +extern unsigned int _text_end__; + +extern unsigned int _init_start__; +extern unsigned int _init_end__; + +extern unsigned int _bss_end__; +#endif static BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; @@ -413,6 +422,9 @@ MmInitializeMdlImplementation(); } +BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; +extern KMUTANT MmSystemLoadLock; + BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -421,14 +433,6 @@ ULONG Flags = 0; if (Phase == 0) { - /* Initialize Kernel Memory Address Space */ - MmInit1(MmFreeLdrFirstKrnlPhysAddr, - MmFreeLdrLastKrnlPhysAddr, - MmFreeLdrLastKernelAddress, - KeMemoryMap, - KeMemoryMapRangeCount, - 4096); - /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE);

1 0

[janderwald] 29359: - enable cleanup button - start cleanmgr process on request
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 22:03:15 2007 New Revision: 29359 URL: http://svn.reactos.org/svn/reactos?rev=29359&view=rev Log: - enable cleanup button - start cleanmgr process on request Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32_De.rc Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 22:03:15 2007 @@ -116,11 +116,13 @@ RECT rect; LONG horzsize; LARGE_INTEGER Result; + WCHAR szBuffer[20]; hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); - Result.QuadPart = GetWindowLongPtr(hwndDlg, DWLP_USER); + SendDlgItemMessageW(hwndDlg, 14007, WM_GETTEXT, 20, (LPARAM)szBuffer); + Result.QuadPart = _wtoi(szBuffer); CopyRect(&rect, &drawItem->rcItem); horzsize = rect.right - rect.left; @@ -201,8 +203,6 @@ /* set free bytes percentage */ sprintfW(szResult, L"%02d%%", Result.QuadPart); SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); - /* store free share amount */ - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)Result.QuadPart); /* store used share amount */ Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); sprintfW(szResult, L"%02d%%", Result.QuadPart); @@ -230,17 +230,20 @@ { LPPROPSHEETPAGEW ppsp; LPDRAWITEMSTRUCT drawItem; - + STARTUPINFOW si; + PROCESS_INFORMATION pi; WCHAR * lpstr; + WCHAR szPath[MAX_PATH]; + UINT length; + switch(uMsg) { case WM_INITDIALOG: ppsp = (LPPROPSHEETPAGEW)lParam; if (ppsp == NULL) break; - TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n",hwndDlg, lParam, ppsp->lParam); - lpstr = (WCHAR *)ppsp->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lpstr); InitializeGeneralDriveDialog(hwndDlg, lpstr); return TRUE; case WM_DRAWITEM: @@ -250,7 +253,27 @@ PaintStaticControls(hwndDlg, drawItem); return TRUE; } - + break; + case WM_COMMAND: + if (LOWORD(wParam) == 14011) + { + lpstr = (WCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if (!GetSystemDirectoryW(szPath, MAX_PATH)) + break; + wcscat(szPath, L"\\cleanmgr.exe /D "); + length = wcslen(szPath); + szPath[length] = lpstr[0]; + szPath[length+1] = L'\0'; + if (CreateProcessW(NULL, szPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } + break; } Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 22:03:15 2007 @@ -247,7 +247,7 @@ CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 LTEXT "Laufwerk %s", 14010, 100, 170, 40, 10 - PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_DISABLED + PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED }

1 0

[janderwald] 29358: - implement drive extra dialog
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 21:41:48 2007 New Revision: 29358 URL: http://svn.reactos.org/svn/reactos?rev=29358&view=rev Log: - implement drive extra dialog Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32_De.rc Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 21:41:48 2007 @@ -266,7 +266,60 @@ LPARAM lParam ) { - + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR szPath[MAX_PATH]; + WCHAR szArg[MAX_PATH]; + WCHAR * szDrive; + UINT length; + LPPROPSHEETPAGEW ppsp; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)ppsp->lParam); + return TRUE; + case WM_COMMAND: + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if (!GetSystemDirectoryW(szPath, MAX_PATH)) + break; + szDrive = (WCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(LOWORD(wParam)) + { + case 14000: + /// + /// FIXME + /// show checkdsk dialog + /// + break; + case 14001: + szArg[0] = L'"'; + wcscpy(&szArg[1], szPath); + wcscat(szPath, L"\\mmc.exe"); + wcscat(szArg, L"\\dfrg.msc\" "); + length = wcslen(szArg); + szArg[length] = szDrive[0]; + szArg[length+1] = L':'; + szArg[length+2] = L'\0'; + if (CreateProcessW(szPath, szArg, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + break; + case 14002: + wcscat(szPath, L"\\ntbackup.exe"); + if (CreateProcessW(szPath, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } + break; + } return FALSE; } Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 21:41:48 2007 @@ -252,15 +252,24 @@ CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { -} - - -DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 + GROUPBOX "Fehlerüberprüfung", -1, 5, 5, 230, 60 + LTEXT "Bei Wahl dieser Option wird das Volume\nauf Fehler überprüft.", -1, 40, 25, 160, 20 + PUSHBUTTON "Jetzt &prüfen", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 + LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem Volume defragmentiert.", -1, 40, 85, 160, 20 + PUSHBUTTON "Jetzt &defragmentieren", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Sicherung", -1, 5, 130, 230, 60 + LTEXT "Bei Wahl dieser Option werden die auf dem\nVolume gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 + PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP +} + + +DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0

1 0

[janderwald] 29357: - remove superflious calls to sysreg
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:10:11 2007 New Revision: 29357 URL: http://svn.reactos.org/svn/reactos?rev=29357&view=rev Log: - remove superflious calls to sysreg Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29357&r1=2935… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Oct 2 20:10:11 2007 @@ -436,8 +436,7 @@ sysregtest: $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg + .PHONY: cb cb: $(RBUILD_TARGET)

1 0

[janderwald] 29356: - perform all boot tests in one launch of sysreg - check for timeouts in windows version to see if qemu has hung
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:09:29 2007 New Revision: 29356 URL: http://svn.reactos.org/svn/reactos?rev=29356&view=rev Log: - perform all boot tests in one launch of sysreg - check for timeouts in windows version to see if qemu has hung Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Oct 2 20:09:29 2007 @@ -11,8 +11,63 @@ namespace System_ { + + OsSupport::TimeEntryVector OsSupport::s_Entries; + + void OsSupport::checkAlarms() + { + struct timeval tm; + gettimeofday(&tm, 0); + for (size_t i = 0; i < s_Entries.size(); i++) + { + long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; + if (diffsec < 0) + { + cout << "terminating process pid:" << s_Entries[i]->pid << endl; + terminateProcess(s_Entries[i]->pid, -2); + free(s_Entries[i]); + s_Entries.erase (s_Entries.begin () + i); + i = MAX(0, i-1); + } + } + +#ifdef __LINUX__ + if (s_Entries.size()) + { + long secs = Entries[i]->tm.tv_sec - tm.tv_sec; + alarm(secs); + } +#endif + } + + void OsSupport::cancelAlarms() + { + #ifndef __LINUX__ - bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + if (s_hThread) + { + TerminateThread(s_hThread, 0); + s_hThread = 0; + } +#endif + + for(size_t i = 0; i < s_Entries.size(); i++) + { + free(s_Entries[i]); + } + + s_Entries.clear(); + + + } + + +#ifndef __LINUX__ + + HANDLE OsSupport::s_hTimer = INVALID_HANDLE_VALUE; + HANDLE OsSupport::s_hThread = 0; + static HANDLE hTimer; + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!hProcess) @@ -20,7 +75,7 @@ return false; } - bool ret = TerminateProcess(hProcess, 0); + bool ret = TerminateProcess(hProcess, exitcode); CloseHandle(hProcess); return ret; } @@ -88,9 +143,50 @@ return pid; } void OsSupport::delayExecution(long value) - { - Sleep(value * 1000); - } + { + Sleep(value * 1000); + } + + DWORD WINAPI AlarmThread(LPVOID param) + { + LARGE_INTEGER liDueTime; + + hTimer = CreateWaitableTimer(NULL, TRUE, _T("SysRegTimer")); + if (!hTimer) + { + return 0; + } + liDueTime.QuadPart = -100000000LL; + while(1) + { + SetWaitableTimer(hTimer, &liDueTime, 5000, NULL, NULL, FALSE); + WaitForSingleObject(hTimer, INFINITE); + OsSupport::checkAlarms (); + } + return 0; + } + + void OsSupport::setAlarm(long secs, OsSupport::ProcessID pid) + { + + PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); + if (entry) + { + cout << "secs: " << secs << endl; + struct timeval tm; + gettimeofday(&tm, 0); + tm.tv_sec += secs; + + entry->tm = tm; + entry->pid = pid; + s_Entries.push_back(entry); + if (s_Entries.size () == 1) + { + s_hThread = CreateThread(NULL, 0, AlarmThread, 0, 0, NULL); + } + } + } + #else /********************************************************************************************************************/ OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool bWait) @@ -118,18 +214,59 @@ return pid; } - bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) { kill(pid, SIGKILL); return true; } - void OsSupport::delayExecution(long value) - { - sleep( value ); - } - - + void OsSupport::delayExecution(long value) + { + sleep( value ); + } + + void handleSignal(int sig) + { + if (sig == SIGALRM) + { + OsSupport::checkAlarms(); + } + } + void setAlarm(long secs, OsSupport::ProcessID pid) + { + sigemptyset( &sact.sa_mask ); + s_sact.sa_flags = 0; + s_sact.sa_handler = catcher; + sigaction( SIGALRM, &sact, NULL ); + + alarm(timeout); + + PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); + if (entry) + { + struct timeval tm; + gettimeofday(&tm, 0); + tm.tv_sec += secs; + + entry->tm = tm; + entry->pid = pid; + for(int i = 0; i < s_Entries.size(); i++) + { + if (tm.tv_sec < s_Entries[i]->tm.tv_sec && tm.tv_usec < s_Entries[i]->tm.tv_usec) + { + if (i == 0) + { + /* adjust alarm timer to new period */ + alarm(secs); + } + s_Entries.insert(s_Entries.begin() + i, entry); + return; + } + } + s_Entries.push_back(entry); + alarm(secs); + } + } #endif } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Oct 2 20:09:29 2007 @@ -20,6 +20,11 @@ #endif #include "user_types.h" +#include <ctime> +#include <vector> +#include <sys/time.h> + +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) namespace System_ { @@ -35,10 +40,8 @@ { public: #ifdef WIN32 - typedef DWORD ProcessID; #else - typedef pid_t ProcessID; #endif @@ -74,8 +77,9 @@ /// Note: returns true if the process with the given pid was terminated /// /// @param pid process id of the process to terminate +/// @param exitcode for the killed process - static bool terminateProcess(ProcessID pid); + static bool terminateProcess(ProcessID pid, int exitcode); //---------------------------------------------------------------------------------------- @@ -88,6 +92,32 @@ static void delayExecution(long sec); +///--------------------------------------------------------------------------------------- +/// +/// initializeTimer +/// +/// Description: this function initializes an alarm. When the alarm expires, it will terminate +/// the given process + + static void setAlarm(long sec, OsSupport::ProcessID pid); + +///--------------------------------------------------------------------------------------- +/// +/// cancelAlarms +/// +/// Description: this function cancels all available timers + + static void cancelAlarms(); + +///--------------------------------------------------------------------------------------- +/// +/// checkAlarms +/// +/// Description: this function checks for expired alarams + + static void checkAlarms(); + + protected: //--------------------------------------------------------------------------------------- /// @@ -98,6 +128,19 @@ OsSupport() {} +#ifdef __LINUX__ + static struct sigaction s_sact; +#else + static HANDLE s_hThread; +#endif + + typedef struct + { + struct timeval tm; + ProcessID pid; + }TIME_ENTRY, *PTIME_ENTRY; + typedef std::vector<PTIME_ENTRY> TimeEntryVector; + static TimeEntryVector s_Entries; }; // end of class OsSupport } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Oct 2 20:09:29 2007 @@ -68,7 +68,7 @@ #endif //--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) + RosBootTest::RosBootTest() : m_MaxTime(65), m_DelayRead(0) { } @@ -142,7 +142,6 @@ bool RosBootTest::isFileExisting(string output) { FILE * file; - file = _tfopen(output.c_str(), _T("r")); if (file) @@ -629,10 +628,21 @@ cerr << "Error: ROS_EMU_PATH is not set" << endl; return false; } - - conf_parser.getStringValue (RosBootTest::ROS_HDD_IMAGE, m_HDDImage); - conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); - conf_parser.getDoubleValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); + if (!m_HDDImage.length()) + { + /* only read image once */ + conf_parser.getStringValue (RosBootTest::ROS_HDD_IMAGE, m_HDDImage); + } + if (!m_CDImage.length()) + { + /* only read cdimage once */ + conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); + } + /* reset boot cmd */ + m_BootCmd = _T(""); + + + conf_parser.getIntValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); conf_parser.getStringValue (RosBootTest::ROS_LOG_FILE, m_DebugFile); conf_parser.getStringValue (RosBootTest::ROS_SYM_DIR, m_SymDir); conf_parser.getIntValue (RosBootTest::ROS_DELAY_READ, m_DelayRead); @@ -652,7 +662,7 @@ if (m_Pid) { - OsSupport::terminateProcess (m_Pid); + OsSupport::terminateProcess (m_Pid, 0); } delete m_DataSource; m_DataSource = NULL; @@ -741,6 +751,14 @@ m_Pid = atoi(buffer); fclose(file); #endif + OsSupport::cancelAlarms(); + OsSupport::setAlarm (m_MaxTime, m_Pid); +#ifdef __LINUX__ + OsSupport::setAlarm(m_MaxTime, _getpid()); +#else + OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); +#endif + bool ret = analyzeDebugData(); cleanup(); @@ -912,36 +930,6 @@ return state; } //--------------------------------------------------------------------------------------- - bool RosBootTest::isTimeout(double max_timeout) - { - if (max_timeout == 0) - { - // no timeout specified - return false; - } - static time_t start = 0; - - if (!start) - { - time(&start); - return false; - } - - time_t stop; - time(&stop); - - double elapsed = difftime(stop, start); - if (elapsed > max_timeout) - { - return true; - } - else - { - return false; - } - - } -//--------------------------------------------------------------------------------------- bool RosBootTest::analyzeDebugData() { vector<string> vect; @@ -959,12 +947,7 @@ write_log = file.is_open (); while(1) { - if (isTimeout(m_MaxTime)) - { - break; - } size_t prev_count = vect.size (); - if (!m_DataSource->readSource (vect)) { continue; Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Tue Oct 2 20:09:29 2007 @@ -14,8 +14,9 @@ #include "os_support.h" #include "user_types.h" #include <vector> +#ifdef __LINUX__ #include <unistd.h> - +#endif namespace Sysreg_ { @@ -132,22 +133,13 @@ DebugState checkDebugData(vector<string> & debug_data); -//--------------------------------------------------------------------------------------- -/// -/// checkTimeOut -/// -/// Description: this function checks if the ReactOS has run longer than the maximum available -/// time - - bool isTimeout(double max_timeout); - protected: string m_EmuType; string m_EmuPath; string m_HDDImage; string m_CDImage; - double m_MaxTime; + long int m_MaxTime; string m_DebugFile; string m_SymDir; long int m_DelayRead; Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Tue Oct 2 20:09:29 2007 @@ -70,15 +70,16 @@ #if 0 SymbolFile::initialize (config, envvar); #endif - if (regtest->execute (config)) - { - cout << "The regression test completed successfully" << endl; - } - else - { - cout << "The regression test failed" << endl; - return -2; - } + for(int i = 0; i < 3; i++) + { + bool ret = regtest->execute(config); + if (!ret) + { + cout << "The regression test has failed at stage: " << i << endl; + return -2; + } + } + cout << "The regression test completed successfully" << endl; return 0; } Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Oct 2 20:09:29 2007 @@ -38,7 +38,7 @@ ; ; Set this variable to value which is the maximum time the emulator lets ReactOS run ; If not set, the emulator runs as long as no exception occurs in the emulator. -; ROS_MAX_TIME=180.0 +ROS_MAX_TIME=180 ; ROS_LOG_FILE ;

1 0

[janderwald] 29355: - draw drive dialog static controls - use rtl library for calculating [free|used] diskspace - add german resource strings
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:03:48 2007 New Revision: 29355 URL: http://svn.reactos.org/svn/reactos?rev=29355&view=rev Log: - draw drive dialog static controls - use rtl library for calculating [free|used] diskspace - add german resource strings Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 20:03:48 2007 @@ -21,6 +21,11 @@ #include "config.h" #include "wine/port.h" #define YDEBUG +#define LARGEINT_PROTOS +#define LargeIntegerDivide RtlLargeIntegerDivide +#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply +#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger +#define LargeIntegerSubtract RtlLargeIntegerSubtract #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -43,6 +48,7 @@ #include <initguid.h> #include <devguid.h> #include <winioctl.h> +#include <largeint.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -61,19 +67,90 @@ #define DRIVE_PROPERTY_PAGES (3) + +static +LARGE_INTEGER +GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) +{ + LARGE_INTEGER Temp, Result, Remainder; + + Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); + if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) + { + Result = ConvertUlongToLargeInteger(1); + }else + { + Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder); + } + + return Result; +} + +static +void +PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT drawItem) +{ + HBRUSH hBrush; + + if (drawItem->CtlID == 14013) + { + hBrush = CreateSolidBrush(RGB(0, 0, 255)); + if (hBrush) + { + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + } + }else if (drawItem->CtlID == 14014) + { + hBrush = CreateSolidBrush(RGB(255, 0, 255)); + if (hBrush) + { + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + } + } + else if (drawItem->CtlID == 14015) + { + HBRUSH hBlueBrush; + HBRUSH hMagBrush; + RECT rect; + LONG horzsize; + LARGE_INTEGER Result; + + hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); + hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); + + Result.QuadPart = GetWindowLongPtr(hwndDlg, DWLP_USER); + + CopyRect(&rect, &drawItem->rcItem); + horzsize = rect.right - rect.left; + Result.QuadPart = (Result.QuadPart * horzsize) / 100; + + rect.right = rect.left + Result.QuadPart; + FillRect(drawItem->hDC, &rect, hMagBrush); + rect.left = rect.right; + rect.right = drawItem->rcItem.right; + FillRect(drawItem->hDC, &rect, hBlueBrush); + DeleteObject(hBlueBrush); + DeleteObject(hMagBrush); + } +} + static void InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive) { - WCHAR szVolumeName[MAX_PATH+1] = {0}; + WCHAR szVolumeName[MAX_PATH+1] = {0}; DWORD MaxComponentLength = 0; DWORD FileSystemFlags = 0; WCHAR FileSystemName[MAX_PATH+1] = {0}; + WCHAR szFormat[50]; + WCHAR szBuffer[128]; BOOL ret; UINT DriveType; ULARGE_INTEGER FreeBytesAvailable; - ULARGE_INTEGER TotalNumberOfBytes; - ULARGE_INTEGER TotalNumberOfFreeBytes; + LARGE_INTEGER TotalNumberOfFreeBytes; + LARGE_INTEGER TotalNumberOfBytes; ret = GetVolumeInformationW(szDrive, szVolumeName, MAX_PATH+1, NULL, &MaxComponentLength, &FileSystemFlags, FileSystemName, MAX_PATH+1); if (ret) @@ -89,24 +166,20 @@ DriveType = GetDriveTypeW(szDrive); if (DriveType == DRIVE_FIXED) { - if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) + + if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes)) { WCHAR szResult[128]; + LARGE_INTEGER Result; +#ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED HANDLE hVolume; DWORD BytesReturned = 0; - GET_LENGTH_INFORMATION LengthInformation; - if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); - - if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); -#if 0 + sprintfW(szResult, L"\\\\.\\%c:", towupper(szDrive[0])); hVolume = CreateFileW(szResult, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (hVolume != INVALID_HANDLE_VALUE) { - RtlZeroMemory(&LengthInformation, sizeof(GET_LENGTH_INFORMATION)); - ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&LengthInformation, sizeof(GET_LENGTH_INFORMATION), &BytesReturned, NULL); + ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&TotalNumberOfBytes, sizeof(ULARGE_INTEGER), &BytesReturned, NULL); if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); @@ -117,8 +190,32 @@ if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); #endif + + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + Result = GetFreeBytesShare(TotalNumberOfFreeBytes, TotalNumberOfBytes); + /* set free bytes percentage */ + sprintfW(szResult, L"%02d%%", Result.QuadPart); + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + /* store free share amount */ + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)Result.QuadPart); + /* store used share amount */ + Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); + sprintfW(szResult, L"%02d%%", Result.QuadPart); + SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14002, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + } } + /* set drive description */ + SendDlgItemMessageW(hwndDlg, 14010, WM_GETTEXT, (WPARAM)50, (LPARAM)szFormat); + sprintfW(szBuffer, szFormat, szDrive); + SendDlgItemMessageW(hwndDlg, 14010, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szBuffer); } @@ -132,6 +229,7 @@ ) { LPPROPSHEETPAGEW ppsp; + LPDRAWITEMSTRUCT drawItem; WCHAR * lpstr; switch(uMsg) @@ -144,7 +242,15 @@ lpstr = (WCHAR *)ppsp->lParam; InitializeGeneralDriveDialog(hwndDlg, lpstr); - return TRUE; + return TRUE; + case WM_DRAWITEM: + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= 14013 && drawItem->CtlID <= 14015) + { + PaintStaticControls(hwndDlg, drawItem); + return TRUE; + } + } Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Tue Oct 2 20:03:48 2007 @@ -22,6 +22,7 @@ <library>ole32</library> <library>version</library> <library>devmgr</library> + <library>rtl</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 20:03:48 2007 @@ -224,15 +224,18 @@ //ICON EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 - LTEXT "", 14002, 40, 55, 100, 10 + LTEXT "", 14002, 110, 55, 100, 10 + LTEXT "Dateisystem:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 @@ -241,10 +244,12 @@ LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 - LTEXT "", 14010, 150, 160, 40, 10 - PUSHBUTTON "Bereinigen", 14011, 190, 145, 50, 15, WS_DISABLED + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Laufwerk %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_DISABLED CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED - CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 @@ -332,4 +337,7 @@ IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokaler Datenträger" + IDS_DRIVE_CDROM "CD-Laufwerk" + IDS_DRIVE_NETWORK "Netzwerklaufwerk" +} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Tue Oct 2 20:03:48 2007 @@ -86,6 +86,9 @@ #define IDS_COMMON_PICTURES 69 #define IDS_COMMON_VIDEO 70 #define IDS_CDBURN_AREA 71 +#define IDS_DRIVE_FIXED 72 +#define IDS_DRIVE_CDROM 73 +#define IDS_DRIVE_NETWORK 74 /* browse for folder dialog box */ #define IDD_STATUS 0x3743

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