Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 31061: Updated French translations for winemine and control
by pschweitzer＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: pschweitzer Date: Fri Dec 7 23:54:03 2007 New Revision: 31061 URL: http://svn.reactos.org/svn/reactos?rev=31061&view=rev Log: Updated French translations for winemine and control Modified: trunk/reactos/base/applications/control/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Modified: trunk/reactos/base/applications/control/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/control/lang/fr-FR.rc Fri Dec 7 23:54:03 2007 @@ -28,10 +28,10 @@ STRINGTABLE BEGIN - IDS_WINDOW_TITLE "Control Panel" - IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" - IDS_ABOUT_TITLE "About the Control Panel" - IDS_NO_ITEMS "No Items in ListView" - IDS_NAME "Name" - IDS_COMMENT "Comment" + IDS_WINDOW_TITLE "Panneau de contrôle" + IDS_ABOUT "Panneau de contrôle simple (non basé sur Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rSous licence GPL" + IDS_ABOUT_TITLE "À propos du panneau de contrôle" + IDS_NO_ITEMS "Aucun élément dans la ListView" + IDS_NAME "Nom" + IDS_COMMENT "Commentaire" END Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc Fri Dec 7 23:54:03 2007 @@ -10,12 +10,12 @@ STRINGTABLE { IDS_APPNAME, "WineMine" - IDS_SECONDS, "seconds" + IDS_SECONDS, "secondes" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Game" { + POPUP "&Jeu" { MENUITEM "&Nouveau", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Marqueur ?", IDM_MARKQ @@ -29,7 +29,7 @@ MENUITEM SEPARATOR MENUITEM "&Quitter", IDM_EXIT } - POPUP "&Info" { + POPUP "&Informations" { MENUITEM "&Temps accéléré", IDM_TIMES MENUITEM "&À propos", IDM_ABOUT } @@ -51,7 +51,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Réinitialiser les scores", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60

1 0

[cfinck] 31060: Added and updated greek translations by Apostolos Alexiadis (djapal AT gmail DOT com) See issue #2853 for more details.
by cfinck＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: cfinck Date: Fri Dec 7 22:30:01 2007 New Revision: 31060 URL: http://svn.reactos.org/svn/reactos?rev=31060&view=rev Log: Added and updated greek translations by Apostolos Alexiadis (djapal AT gmail DOT com) See issue #2853 for more details. Added: trunk/reactos/dll/cpl/main/lang/el-GR.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc (with props) Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc Fri Dec 7 22:30:01 2007 @@ -36,11 +36,11 @@ END POPUP "&ÅìöÜíéóç" BEGIN - MENUITEM "&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR - MENUITEM "&ÅðéðëÝïí ãñáììÞ", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&ÃñáììÞ êáôáóôáóçò", ID_VIEW_STATUSBAR + MENUITEM "Ã&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR + MENUITEM "&ÅðéðëÝïí ãñáììÞ", ID_VIEW_EXTRA_BAR + MENUITEM "&ÃñáììÞ äßóêùí", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Á&ãáðçìÝíá", ID_VIEW_SIDE_BAR + MENUITEM "&ÃñáììÞ êáôÜóôáóçò", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&ÁíáíÝùóç\tF5", ID_REFRESH MENUITEM "Ð&ëÞñçò Ïèüíç\tCtrl+Shift+S", ID_VIEW_FULLSCREEN @@ -49,11 +49,11 @@ POPUP "&ÐáñÜèõñï" BEGIN MENUITEM "ÍÝï &ÐáñÜèõñï", ID_WINDOW_NEW - MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + MENUITEM "Ôáêôïðïßçóç\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Ôáêôïðïßçóç Êá&ôáêüñõöá", ID_WINDOW_TILE_HORZ + MENUITEM "Ôáêôïðïßçóç ÊÜ&èåôá\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Áõôüìáôç Ôáêôïðïßçóç", ID_WINDOW_AUTOSORT + MENUITEM "Ôáêôïðïßçóç &åéêïíéäßùí", ID_WINDOW_ARRANGE END POPUP "&Åñãáëåßá" BEGIN @@ -62,8 +62,8 @@ POPUP "&ÂïÞèåéá" BEGIN MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER - MENUITEM "Ó÷åôéêÜ ìå ôï &OS...", ID_ABOUT_WINDOWS + MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER + MENUITEM "&Ó÷åôéêÜ ìå ôï Reactos", ID_ABOUT_WINDOWS END END @@ -72,9 +72,9 @@ POPUP "" BEGIN MENUITEM "&Ñõèìßóåéò...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Task Manager...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER + MENUITEM "&Äéá÷åßñçóç Åñãáóéþí", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER END END @@ -82,8 +82,8 @@ BEGIN POPUP "" BEGIN - MENUITEM "Open Volume Control", ID_TRAY_VOLUME - MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES + MENUITEM "¢íïéãìá ôçò ñýèìéóçò Ýíôáóçò Þ÷ïõ", ID_TRAY_VOLUME + MENUITEM "Äéüñèùóç éäéïôÞôùí Þ÷ïõ", ID_VOLUME_PROPERTIES END END @@ -91,12 +91,12 @@ BEGIN POPUP "" BEGIN - MENUITEM "&ÅìöÜíéóç êñõììÝíí åéêïíéäßùí", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Ñýèìéóç Çìåñïìçíßáò/&¿ñáò...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&Ó÷åôêÜ ìå ôçí Åîåñåýíçóç", ID_ABOUT_EXPLORER + MENUITEM "&ÅìöÜíçóç êñõììÝíùí åéêïíéäßùí", ID_SHOW_HIDDEN_ICONS + MENUITEM "ÐëÞêôñï åìöÜíçóçò åéêïíéäßùí", ID_SHOW_ICON_BUTTON + MENUITEM "Ñõèìßóåéò åéäïðïéÞóåùí", ID_CONFIG_NOTIFYAREA + MENUITEM "Ñýèìéóç çìåñïìçíßáò/&þñáò", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Ó÷åôéêÜ ìå ôï åîåñåõíçôÞ", ID_ABOUT_EXPLORER END END @@ -106,29 +106,27 @@ BEGIN MENUITEM "&ÅêôÝëåóç...", ID_EXECUTE MENUITEM SEPARATOR - MENUITEM "&Êëåßóéìï", ID_FILE_EXIT + MENUITEM "¸&îïäïò", ID_FILE_EXIT END POPUP "&ÅìöÜíéóç" BEGIN - MENUITEM "&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR - MENUITEM "&ÅðéðëÝïí ãñáììÞ", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&ÃñáììÞ êáôáóôáóçò", ID_VIEW_STATUSBAR + MENUITEM "Ã&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR + MENUITEM "Á&ãáðçìÝíá", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&ÃñáììÞ êáôÜóôáóçò", ID_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&ÁíáíÝùóç\tF5", ID_REFRESH - MENUITEM "Ð&ëÞñçò Ïèüíç\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "Ð&ëÞñçò ïèüíç", ID_VIEW_FULLSCREEN MENUITEM "MDI", ID_VIEW_MDI END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Help" - BEGIN - MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Ó÷åôéêÜìå ôçí Åîåñåýíçóç...", ID_ABOUT_EXPLORER - MENUITEM "Ó÷åôéêÜ ìå ôï &OS...", ID_ABOUT_WINDOWS + POPUP "&Åñãáëåßá" + BEGIN + MENUITEM "&ÅðéëïãÝò", ID_TOOLS_OPTIONS + END + POPUP "ÂïÞèåéá" + BEGIN + MENUITEM "Åîåñåýíçóç &FAQ", ID_EXPLORER_FAQ + MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER + MENUITEM "&Ó÷åôéêÜ ìå ôï Reactos", ID_ABOUT_WINDOWS END END @@ -144,13 +142,13 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 - CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 + CONTROL "¢íïéãìá:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3,18, + 58,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + CONTROL "¿ò óýìâïëï",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, 45,71,12 DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Áêýñùóç",2,158,23,47,14 + PUSHBUTTON "&Áêýñùóç",2,158,24,47,14 PUSHBUTTON "&ÂïÞèåéá",254,158,43,47,14 END @@ -158,15 +156,15 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "ÁíáæÞôçóç ðñïãñÜììáôïò ôï ìåíïý 'Ýíáñîç'" +CAPTION "ÁíáæÞôçóç óôï ìåíïý ""Ýíáñîç""" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "&Ößëôñï:",IDC_STATIC,7,9,18,8 + LTEXT "&Ößëôñï:",IDC_STATIC,4,9,27,8 EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 + PUSHBUTTON "&ÁíáæÞôçóç",IDC_CHECK_ENTRIES,143,7,50,14 END IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 @@ -174,31 +172,31 @@ CAPTION "Éäéüôçôåò åðéöÜíåéáò åñãáóßáò" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Please select your prefered icon alignment algorithm:", - IDC_STATIC,7,7,166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + LTEXT "ÅðéëÝîôå ôïí ôñüðï ôáêôïðïßçóç ôùí åéêïíéäßùí:", + IDC_STATIC,7,7,198,8 + CONTROL "êÜôù",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "äåîéÜ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "áñéóôåñÜ",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "êÜôù",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "ðÜíù",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "äåîéÜ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "áñéóôåñÜ",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "ðÜíù",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "êÜôùí",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "ðëáßóéï",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "ãýñù ãýñù",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 // CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", // BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 @@ -206,85 +204,84 @@ IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Taskbar Properties" +CAPTION "Éäéüôçôåò ãñáììÞò åñãáóéþí" FONT 8, "MS Sans Serif" BEGIN - CONTROL "show &clock",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&hide inactive notification icons", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 + CONTROL "ÅìöÜíçóç ôïõ &ñïëïãéïý",ID_SHOW_CLOCK,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,152,96,10 + CONTROL "&Áðüêñõøç áåíåñãþí åéêïíéäßùí",ID_HIDE_INACTIVE_ICONS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,122,10 + PUSHBUTTON "&ÐñïóáñìïãÞ...",ID_CONFIG_NOTIFYAREA,147,173,56,14 END IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Éäéüôçôåò ìåíïý 'Ýíáñîç'" +CAPTION "Éäéüôçôåò ôïõ ìåíïý ""Ýíáñîç""" FONT 8, "MS Sans Serif" BEGIN END -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | +IDD_NOTIFYAREA DIALOGEX 0, 0, 218, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Configure Notification Icons" +CAPTION "Ñõèìßóåéò ãéá ôïí ÷þñï åéäïðïéÞóåùí" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 - CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 - CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,202,31 + LTEXT "&Âïçèçôéêü êåßìåíï :",IDC_LABEL1,7,44,66,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,76,42,133,14,ES_AUTOHSCROLL + LTEXT "&¼íïìá ðáñáèýñïõ :",IDC_LABEL2,7,63,67,8 + EDITTEXT IDC_NOTIFY_TITLE,76,60,133,14,ES_AUTOHSCROLL + LTEXT "&ÄéáäñïìÞ áñ÷åßïõ :",IDC_LABEL3,7,81,65,8 + EDITTEXT IDC_NOTIFY_MODULE,76,78,133,14,ES_AUTOHSCROLL + GROUPBOX "Ôñüðïò åìöÜíçóçò",IDC_LABEL4,7,96,169,31 + CONTROL "&åìöÜíçóç",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,14,108,51,10 + CONTROL "&áðüêñéøç",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, + 67,108,47,10 + CONTROL "á&õôüìáôç áðüêñéøç",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON | BS_MULTILINE,118,104,56,19 + ICON "",IDC_PICTURE,184,103,20,20 + LTEXT "Ôåëåõôáßá áëáãÞ :",IDC_LABEL6,7,134,62,8 + EDITTEXT IDC_LAST_CHANGE,71,132,105,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + CONTROL "åìöÜíçóç êñõöþí",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,155,79,10 DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 + PUSHBUTTON "&¢êõñï",IDCANCEL,151,153,50,14 END IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Choose Explorer window mode" +CAPTION "ÌïñöÞ ôïõ åîåñåõíçôÞ" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Please select your prefered explorer user interface:", - IDC_STATIC,7,7,160,8 - CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 - CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + LTEXT "ÅðéëÝîôå ôçí ìïñöÞ ôïõ åîåñåõíçôÞ ðïõ èÝëåôå :", + IDC_STATIC,7,7,166,8 + CONTROL "&MDI (ÌïñöÞ ðïëëáðëþí ðáñáèýñùí)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,137,10 + CONTROL "&SDI (ÌïñöÞ ìïíïý ðáñáèýñïõ)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,118,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 - CONTROL "Open Subfolders in s&eparate windows", - IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 - LTEXT "This setting will be used as default for all explorer windows in the future.", - IDC_STATIC,7,111,174,22 + CONTROL "¢íïéãìá õðïöáêÝëùí óå îå÷ùñéóôÜ ðáñÜèõñá", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,172,10 + LTEXT "ÁõôÝò ïé ñõèìßóåéò èá ÷ñçóéìïðïéïýíôáé áõôüìáôá ãéá üëá ôá ðáñÜèõñá ôïõ åîåñåõíçôÞ óôï ìÝëëïí", + IDC_STATIC,5,108,174,22 DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,106,136,50,14 + PUSHBUTTON "&¢êõñï",IDCANCEL,106,136,50,14 END IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ó÷åôéêÜìå ôçí Åîåñåýíçóç ôïõ ReactOS" +CAPTION "Ó÷åôéêÜ ìå ôïí åîñåõíçôÞ ôïõ ReactOS" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Åîåñåýíçóç ReactOS",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "ÅîåñåõíçôÞò ôïõ ReactOS",IDC_ROS_EXPLORER,91,13,104,11 LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 LTEXT "",IDC_WIN_VERSION,91,58,98,22 @@ -328,11 +325,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "ReactOS Explorer" + IDS_TITLE "ÅîåñåõíçôÞò ôïõ ReactOS" IDS_START "Ýíáñîç" IDS_LOGOFF "Áðïóýíäåóç..." IDS_SHUTDOWN "Ôåñìáôéóìüò..." - IDS_RESTART "Restart..." + IDS_RESTART "Åðáíåêêßíçóç..." IDS_LAUNCH "ÅêôÝëåóç..." IDS_START_HELP "ÂïÞèåéá" IDS_SEARCH_FILES "ÁíáæÞôçóç..." @@ -341,25 +338,25 @@ IDS_PROGRAMS "ÐñïãñÜììáôá" IDS_SETTINGS "Ñõèìßóåéò" IDS_EXPLORE "Åîåñåýíçóç" - IDS_EMPTY "(¢äåéï)" + IDS_EMPTY "(Êåíü)" IDS_RECENT "Ðñüóöáôá Ýããñáöá" - IDS_ADMIN "Äéá÷åßñéóç" + IDS_ADMIN "Äéá÷åßñçóç" END STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "Åëá÷éóôïðïßçóç üëùí ôùí ðáñáèõñùí" + IDS_STARTMENU "Ìåíïý Ýíáñîç" + IDS_MINIMIZE_ALL "Åëá÷éóôïðïßçóç üëùí ôùí ðáñáèýñùí" IDS_DESKTOP_NUM "ÅðéöÜíåéá åñãáóßáò %d" - IDS_VOLUME "´¸íôáóç Þ÷ïõ" + IDS_VOLUME "¸íôáóç Þ÷ïõ" IDS_ITEMS_CUR "current items" IDS_ITEMS_CONFIGURED "configuration" IDS_ITEMS_VISIBLE "ïñáôü" IDS_ITEMS_HIDDEN "êñõììÝíï" - IDS_NOTIFY_SHOW "åìöÜíéóç" + IDS_NOTIFY_SHOW "åìöÜíçóç" IDS_NOTIFY_HIDE "áðüêñõøç" - IDS_NOTIFY_AUTOHIDE "autohide" - IDS_SHOW_HIDDEN_ICONS "ÅìöÜùéóç êñõììÝíùí åéêïíéäßùí" + IDS_NOTIFY_AUTOHIDE "áõôüìáôç áðüêñõøç" + IDS_SHOW_HIDDEN_ICONS "ÅìöÜíçóç êñõììÝíùí åéêïíéäßùí" IDS_HIDE_ICONS "Áðüêñõøç åéêïíéäßùí" IDS_TERMINATE "Ôåñìáôéóìüò ôçò Åîåñåýíçóçò ôïõ ROS" END @@ -367,25 +364,25 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NETWORK "Äßêôõï" - IDS_CONNECTIONS "ÓõíäÝóåéò Äêôýïõ" - IDS_DRIVES "Drives" + IDS_CONNECTIONS "ÓõíäÝóåéò äéêôßïõ" + IDS_DRIVES "Ï õðïëïãéóôÞò ìïõ" IDS_SEARCH_COMPUTER "ÁíáæÞôçóç ÕðïëïãéóôÞ..." - IDS_SETTINGS_MENU "Settings Menu" - IDS_CONTROL_PANEL "ÊÝíôñï ÅëÝã÷ïõ" + IDS_SETTINGS_MENU "Ñõèìßóåéò" + IDS_CONTROL_PANEL "Ðßíáêáò åëÝã÷ïõ" IDS_PRINTERS "ÅêôõðùôÝò" - IDS_BROWSE "Browse Files" + IDS_BROWSE "Åîåñåýíçóç áñ÷åßùí" IDS_SEARCH_PRG "ÁíáæÞôçóç ÐñïãñÜììáôïò..." IDS_ALL_USERS "All Users\\" IDS_SEARCH "ÁíáæÞôçóç" - IDS_ABOUT_EXPLORER "&Ó÷åôéêÜ ìå ôçí Åîåñåýíçóç..." - IDS_LAUNCH_MANY_PROGRAMS - "¸÷åôå åðéëÝîåé ðáñáðÜíù ôïõ åíüò ðñïãñÜììáôá.\nÅßóôå óßãïõñïé üôé èÝëåôå íá åêôåëåóôïýí üëá;" + IDS_ABOUT_EXPLORER "Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ" + IDS_LAUNCH_MANY_PROGRAMS + "¸÷åôå åðéëÝîåé ðáñáðÜíù ôïõ åíüò ðñïãñÜììáôá.\nÅßóôå óßãïõñïé ïôé èÝëåôå íá åêôåëåóôïýí üëá;" IDS_DESKTOPBAR_SETTINGS "Ñõèìßóåéò ÅðéöÜíåéáò Åñãáóßáò" IDS_DESKTOP "ÅðéöÜíåéá Åñãáóßáò" - IDS_TASKBAR "Taskbar" -END - -#endif // English (U.S.) resources + IDS_TASKBAR "ÃñáììÞ åñãáóéþí" +END + +#endif // Greek resources ///////////////////////////////////////////////////////////////////////////// Added: trunk/reactos/dll/cpl/main/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/main/lang/el-GR.rc Fri Dec 7 22:30:01 2007 @@ -1,0 +1,171 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ôá÷ýôçôá" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÅðáíÜëçøç ÷áñáêôÞñá", -1, 5, 5, 230, 130 + ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 + LTEXT "&ÊáèõóôÝñçóç åðáíÜëøçò:", -1, 36, 15, 100, 10 + LTEXT "ÌåãÜëç", -1, 36, 30, 25, 10 + LTEXT "ÌéêñÞ", -1, 197, 30, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 + ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 + LTEXT "&Ñõèìüò åðåíÜëçøçò:", -1, 36, 60, 70, 10 + LTEXT "Ìéêñüò", -1, 36, 75, 23, 10 + LTEXT "ÌåãÜëïò", -1, 197, 75, 28, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 75, 130, 17 + LTEXT "ÐáôÞóôå åäþ êáé êñáôÞóôå ðáôçìÝíï Ýíá êïõìðß ãéá íá äïêéìÜóåôå ôïí ñõèìü åðáíÜëçøçò:", -1, 15, 97, 150, 15 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "&Ñõèìüò åðáíåìöÜíçóçò äñïìÝá:", -1, 5, 145, 230, 50 + LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 + LTEXT "Ìéêñüò", -1, 40, 165, 30, 10 + LTEXT "ÌåãÜëïò", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 +END + +IDD_HARDWARE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Õëéêü" +FONT 8, "MS Shell Dlg" +BEGIN +END + +IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "Êëåßäùìá êëßê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìéêñü", -1, 35, 50, 30, 10 + LTEXT "ÌåãÜëï", -1, 140, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 + PUSHBUTTON "&Ok", IDOK, 120, 75, 50, 15 + PUSHBUTTON "¢&êõñï", IDCANCEL, 175, 75, 50, 15 + LTEXT "&ÅðéëÝîôå ðüóï ðñÝðåé íá êñáôÞóåôå ðáôçìÝíï ôï êïõìðß ôïõ ðïíôéêéïý ìÝ÷ñé íá êëåéäùèåß",-1,60,15,170,30 + ICON -1, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 +END + +IDD_PAGE_BUTTON DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Êïõìðß" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñõèìßóåéò êïõìðéþí", -1, 5, 5, 230, 70 + CHECKBOX "&ÅíáëëáãÞ áñéóôåñïý êáé äåîéïý êïõìðéïý", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 155, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + LTEXT "ÐáôÞóôå åäþ ãéá íá ïñßóåôå ôï áñéóôåñü êïõìðß ùò ôï êïõìðß ìå ôï ïðïßï èá åêôåëåßôå âáóéêÝò åñãáóßåò üðùò ç åðéëïãÞ êáé ôï óýñóéìï.", -1, 10, 30, 150, 40 + GROUPBOX "Ôá÷ýôçôá äéðëïý êëéê", -1, 5, 75, 230, 70 + LTEXT "ÊÜíôå äéðëü êëéê óôïí öÜêåëï ãéá íá åëÝíîåôå ôéò ñõèìßóåéò óáò. Áí ï öáêåëïò äåí áëëÜæåé, äïêéìÜóôå ìéá ðéï áñãÞ ñýèìéóç.", -1, 10, 85, 150, 30 + LTEXT "&Ôá÷ýôçôá: ÌéêñÞ", -1, 10, 120, 95, 8 + LTEXT "ÌåãÜëç", -1, 136, 120, 30, 8 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 66, 120, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + GROUPBOX "Êëåßäùìá êëéê", -1, 5, 150, 230, 70 + CHECKBOX "&Åíåñãïðïßçóç", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + PUSHBUTTON "&Ñõèìßóåéò...", IDC_BUTTON_CLICK_LOCK, 170, 162, 50, 13 + LTEXT "Óáò äßíåé ôçí äõíáôüôçôá íá åðéëÝîåôå Þ íá óýñåôå ÷ùñßò íá êáñáôÜôå ðáôçìÝíï ôï êïõëðß ôïõ ðïíôéêéïý. Ãéá íá ôï åíåñãïðïéÞóåôå Þ íá ôï áðåíåñãïðïéÞóåôå, êñáôÞóôå ðáôçìÝíï ôï êïõìðß ôïõ ðïíôéêéïý.", -1, 10, 180, 190, 33 +END + +IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Äåßêôçò" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óõíäéáóìüò", -1, 5, 5, 170, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 155, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&ÁðïèÞêåõóç ¿ò...", IDC_BUTTON_SAVEAS_SCHEME, 50, 30, 70, 15 + PUSHBUTTON "&ÄéáãñáöÞ", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE + LTEXT "&Åðåîåñãóßá", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY + CHECKBOX "Å&íåñãïðïßçóç óêéÜò äåßêôç", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + PUSHBUTTON "&×ñÞóç ðñïåðéëïãÞò", IDC_BUTTON_USE_DEFAULT_CURSOR, 110, 200, 70, 15 + PUSHBUTTON "&ÁíáæÞôçóç", IDC_BUTTON_BROWSE_CURSOR, 185, 200, 50, 15 +END + +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CAPTION | WS_SYSMENU +CAPTION "ÁðïèÞêåõóç óõíäéáóìïý" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÁðïèÞêåõóç ôïõ ôñÝ÷ïíôïò óõíäéáóìïý ìå ôï üíïìá:", -1, 5, 5, 100, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Ok", IDOK, 60, 45, 50, 15 + PUSHBUTTON "&¢êõñï", IDCANCEL, 115, 45, 50, 15 +END + + +IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Éäéüôçôåò äåßêôç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Êßíçóç", -1, 5, 5, 230, 60 + LTEXT "&ÅðéëÝîôå ôçí ôá÷ýôçôá ôïõ äåßêôç:", -1, 60, 15, 130, 10 + LTEXT "ÌéêñÞ", -1, 60, 30, 20, 10 + CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 + LTEXT "ÌåãÜëç", -1, 170, 30, 25, 10 + ICON -1, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 + CHECKBOX "&Âåëôßùóç ôçò áêñßâåéáò ôïõ äåßêôç", IDC_CHECK_POINTER_PRECISION, 60, 50, 130, 10 + GROUPBOX "ÓõãêñÜôçóç", -1, 5, 65, 230, 40 + CHECKBOX "Áõôüìáôç ìåôáêßíçóç ôïõ äåßêôç óôï åðéëåãìÝíï êïõìðß åíüò ðáñáèýñïõ äéáëüãïõ", + IDC_CHECK_SNAP_TO, 60, 78, 170, 20, BS_MULTILINE | BS_TOP + ICON -1, IDC_ICON_SNAP_TO, 15, 75, 15, 15 + GROUPBOX "ÏñáôÞôá", -1, 5, 105, 230, 95 + CHECKBOX "&ÅìöÜíéóç ôïõ ß÷íïõò ôïõ äåßêôç", IDC_CHECK_POINTER_TRAIL, 60, 115, 130, 10 + LTEXT "Ìéêñü", IDC_TEXT_TRAIL_SHORT, 60, 130, 30, 10 + LTEXT "ÌåãÜëï", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 + ICON -1, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 + CHECKBOX "&Áðüêñõøç ôïõ äåßêôç êáôÜ ôçí ðëçêôñïëüãçóç", IDC_CHECK_HIDE_POINTER, 60, 150, 170, 10 + ICON -1, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + CHECKBOX "&ÅìöÜíçóç ôçò èÝóçò ôïõ äåßêôç üôáí ðáôÜù CTRL", + IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP + ICON -1, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 +END + +IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION +CAPTION "Ôñï÷üò" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ìåôáêßíçóç", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + LTEXT "Ìåôáêßíçóç êáôá ôçí êýëéóç ôïõ ôñï÷ïý êáôá ìéá èÝóç:", -1, 60, 15, 150, 20 + RADIOBUTTON "&Áñéèìüò ãñáììþí ôçí öïñÜ", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "&Ïëüêëçñç óåëßäá", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Ðïíôßêé" + IDS_CPLDESCRIPTION_1 "ÁëëÜîôå ôéò ñõèìßóåéò ôïõ ðïíéôêéïý." + IDS_CPLNAME_2 "Ðëçêñïëüãéï" + IDS_CPLDESCRIPTION_2 "ÁëëÜîôå ôéò ñõèìßóåéò ôïõ ðëçêñïëïãßïõ." + IDS_ARROW "Êáíïíéêüò äåßêôçò" + IDS_HELP "Äåßêôçò âïÞèåéáò" + IDS_APPSTARTING "Åñãáóßá óôï ðáñáóêÞíéï" + IDS_WAIT "Áðáó÷ïëçìÝíï" + IDS_CROSSHAIR "ÅðéëïãÞ áêñéâåßáò" + IDS_IBEAM "ÅðéëïãÞ êåéìÝíïõ" + IDS_NWPEN "×åéñüãñáöï" + IDS_NO "Ìç äéáèÝóéìï" + IDS_SIZENS "Êáôáêüñõöç áëëáãÞ ìåãÝèïõò" + IDS_SIZEWE "Ïñéæüíôéá áëëáãÞ ìåãÝèïõò" + IDS_SIZENWSE "Äéáãþíéá áëëáãÞ ìåãÝèïõò 1" + IDS_SIZENESW "Äéáãþíéá áëëáãÞ ìåãÝèïõò 2" + IDS_SIZEALL "Ìåôáêßíçóç" + IDS_UPARROW "ÅíáëëáêôéêÞ åðéëïãÞ" + IDS_HAND "ÅðéëïãÞ óõíäÝóìïõ" + IDS_NONE "(×ùñßò åðéëïãÞ)" + IDS_SYSTEM_SCHEME "(Óõíäéáóìüò óõóôÞìáôïò)" + IDS_BROWSE_FILTER "Äåßêôåò (*.ani, *.cur)\0*.ani;*.cur\0Êéíïýìåíïé äåßêôåò (*.ani)\0*.ani\0Áêßíçôïé äåßêôåò (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "ÁíáæÞôçóç" + IDS_REMOVE_TITLE "ÅðéâáéâÝùóç äéáãñáöÞò ôïõ óõíäéáóìïý" + IDS_REMOVE_TEXT "Åßóôå óßãïõñïé ïôé èÝëåôå íá äéáãñÜøåôå ôïí óõíäéáóìü äåéêôþí '%s';" + IDS_OVERWRITE_TITLE "ÅðéâáéâÝùóç áíôéêáôÜóôáóçò ôïõ óõíäéáóìïý" + IDS_OVERWRITE_TEXT "Ôï üíïìá ôïõ óõíäéáóìïý äåéêôþí ðïõ åðéëÝîáôå õðÜñ÷åé Þäç. Åßóôå óßãïõñïé ïôé èÝëåôå íá áíôéêáôáóôÞóåôå ôïí óõíäéáóìü äåéêôþí;" +END Propchange: trunk/reactos/dll/cpl/main/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/main/rsrc.rc (original) +++ trunk/reactos/dll/cpl/main/rsrc.rc Fri Dec 7 22:30:01 2007 @@ -4,6 +4,7 @@ #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc Fri Dec 7 22:30:01 2007 @@ -1,0 +1,273 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Óýóôçìá:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "¸êäïóç ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 60, 9 + LTEXT "ÕðïëïãéóôÞò:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "Åðéóêåõôåßôå ôçí <A HREF=""http://www.reactos.org/"">Éóôïóåëßäá ôïõ ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + PUSHBUTTON "&ÐñïâïëÞ Üäåéáò...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Õëéêü" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Äéá÷åßñéóç Óõóêåõþí", IDC_STATIC, 6, 7, 244, 63 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Ç Äéá÷åßñéóç Óõóêåõþí ðñïâÜëëåé ìéá ëßóôá ìå üëåò ôéò óõóêåõÝò ðïõ åßíáé åãêáôåóôçìÝíåò óôïí õðïëïãéóôÞ óáò. Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôç Äéá÷åßñéóç Óõóêåõþí ãéá íá áëëÜîåôå ôéò éäéüôçôåò ãéá êÜèå óõóêåõÞ.", IDC_STATIC, 42, 16, 204, 33 + PUSHBUTTON "&Äéá÷åßñéóç Óõóêåõþí...", IDC_HARDWARE_DEVICE_MANAGER, 148, 51, 98, 15 + + GROUPBOX "Ïäçãüò ðñïóèÞêçò õëéêïý", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "Ï Ïäçãüò ðñïóèÞêçò õëéêïý óáò âïçèÜ íá åãêáôáóôÞóåôå, áðåãêáôáóôÞóåôå, åðéäéþñèþóåôå êáé íá ñõèìßóåôå õëéêü.", IDC_STATIC, 42, 92, 204, 24 + PUSHBUTTON "&Ïäçãüò ðñïóèÞêçò õëéêïý...", IDC_HARDWARE_WIZARD, 148, 120, 98, 15 + + GROUPBOX "Ðñïößë õëéêïý", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Ôá ðñïößë õëéêïý óÜò äßíïõí ôç äõíáôüôçôá íá åãêáôáóôÞóåôå êáé íá áðïèçêåýóåôå ñõèìßóåéò ãéá äéáöïñåôéêÝò óõóêåõÝò.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "&Ðñïößë õëéêïý...", IDC_HARDWARE_PROFILE, 148, 190, 98, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÅéäéêÝò ñõèìßóåéò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÐñÝðåé íá Ý÷åôå óõíäåèåß ùò äéá÷åéñéóôÞò ãéá ôçí ðñáãìáôïðïßçóç ôùí ðåñéóóüôåñùí áðü áõôÝò ôéò áëëáãÝò.", IDC_STATIC, 12, 3, 236, 16 + GROUPBOX "Åðéäüóåéò", IDC_STATIC, 6, 20, 244, 50 + LTEXT "Ïé åðéëïãÝò åðéäüóåùí åëÝã÷ïõí ôïí ôñüðï ÷ñÞóçò ôçò ìíÞìçò áðü ôéò åöáñìïãÝò åðçñåÜæïíôáò ôçí ôá÷ýôçôá ôïõ õðïëïãéóôÞ.", IDC_STATIC, 16, 29, 210, 24 + PUSHBUTTON "Ñõ&èìßóåéò", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Ðñïößë ÷ñçóôþí", IDC_STATIC, 6,75,244,48 + LTEXT "Ñõèìßóåéò åðéöÜíåéáò åñãáóßáò ó÷åôéêÝò ìå ôïí ÷ñÞóôç óáò.", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Ñõèìß&óåéò", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Åêêßíçóç êáé áðïêáôÜóôáóç", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Ç Åêêßíçóç êáé áðïêáôÜóôáóç ñõèìßæåé ôï ðþò èá îåêéíÜ ï õðïëïãéóôÞò áëëÜ êáé ôïí ôñüðï áíôéìåôüðçóçò óöáëìÜôùí ðïõ èá ôïí êÜíïõí íá óôáìáôÞóåé.", IDC_STATIC, 16, 144, 210, 24 + PUSHBUTTON "Ñ&õèìßóåéò", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "&ÌåôáâëçôÝò ðåñéâÜëëïíôïò", IDC_ENVVAR, 70, 192, 96, 15 + PUSHBUTTON "Áíáöï&ñÜ óöáëìÜôùí", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ðñïößë õëéêïý" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "Ìðïñåßôå íá åãêáôáóôÞóåôå ðñïößë ãéá äéáöïñåôéêÝò ðáñáìÝôñïõò õëéêïý. ÊáôÜ ôçí åêêßíçóç, ìðïñåßôå íá åðéëÝîåôå ôï ðñïößë ôï ïðïßï èÝëåôå íá ÷ñçóéìïðïéÞóåôå.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "ÄéáèÝóéìá ðñïößë &õëéêïý:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "É&äéüôçôåò", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "Áíôé&ãñáöÞ", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "&Ìåôïíïìáóßá", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "Äéáãñá&öÞ", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "ÅðéëïãÞ ðñïößë õëéêïý", IDC_STATIC, 7, 130, 240, 75 + LTEXT "¼ôáí îåêéíÜ ôï ReactOS:", IDC_STATIC, 14, 142, 210, 8 + //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 + //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 + CONTROL "Á&íáìïíÞ üóðïõ íá åðéëÝîù ðñïößë õëéêïý", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 200, 8 + CONTROL "ÅðéëïãÞ ôïõ ðñþôïõ ðñïößë óôç ëßóôá åÜí äåí åðé&ëÝîù Ýíá óå", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 200, 8 + LTEXT "äåõôåñüëåðôá", IDC_STATIC, 65, 187, 45, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ìåôïíïìáóßá ôïõ ðñïößë" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Áðü:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "Ðñïò:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 196, 24, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ðñïößë ÷ñçóôþí" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Óôá ðñïößë ÷ñÞóôç áðïèçêåýïíôáé ñõèìßóåéò ãéá ôçí åðéöÜíåéá åñãáóßáò êáé Üëëåò ðëçñïöïñßåò ó÷åôéêÝò ìå ôï ëïãáñéáóìü ÷ñÞóôç óáò. Ìðïñåßôå íá äçìéïõñãÞóåôå Ýíá äéáöïñåôéêü ðñïößë ãéá êÜèå õðïëïãéóôÞ ðïõ ÷ñçóéìïðïéåßôå Þ ìðïñåßôå íá åðéëÝîåôå Ýíá ðñïößë ðåñéáãùãÞò ôï ïðïßï åßíáé ôï ßäéï óå êÜèå õðïëïãéóôÞ ðïõ ÷ñçóéìïðïéåßôå.", + IDC_STATIC, 40, 3, 204, 40 + LTEXT "Áðï&èçêåõìÝíá ðñïößë óå áõôüí ôïí õðïëïãéóôÞ:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "Á&ëëáãÞ ôýðïõ", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "Äéáãñá&öÞ", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "&ÁíôéãñáöÞ óå", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "Ãéá ôç äçìéïõñãßá íÝùí ëïãáñéáóìþí ÷ñçóôþí, áíïßîôå ôï åéêïíßäéï <A>Ëïãáñéáóìïß ÷ñçóôþí</A> ôïõ Ðßíáêá ÅëÝã÷ïõ", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 228, 16 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "¢êõñï", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Åêêßíçóç êáé áðïêáôÜóôáóç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Åêêßíçóç óõóôÞìáôïò", IDC_STATIC, 7, 12, 238, 95 + LTEXT "ÐñïåðéëåãìÝíï ëåéôïõñãéêü &óýóôçìá:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "ÄéÜñêåéá ðñïâï&ëÞò ëßóôáò :", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "äåõô.", IDC_STATIC, 215, 56, 25, 8 + CONTROL "ÄéÜñêåéá ðñï&âïëÞò åðéëïãþí áðïêáôÜóôáóçò:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "äåõô.", IDC_STATIC, 215, 70, 25, 8 + LTEXT "Ãéá ìç áõôüìáôç åðåîåñãáóßá ôùí åðéëïãþí åêêßíçóçò, êÜíôå êëéê óôï êïõìðß Åðåîåñãáóßá.", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "Åðå&îåñãáóßá", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "Áðïôõ÷ßá óõóôÞìáôïò", IDC_STATIC, 7, 111, 238, 140 + CONTROL "ÅããñáöÞ ôïõ óõìâÜíôïò óôï áñ÷åßï &êáôáãñáöÞò óõóôÞìáôïò", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 + CONTROL "&ÁðïóôïëÞ åéäïðïßçóçò äéá÷åéñéóôÞ", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 + CONTROL "Á&õôüìáôç åðáíåêêßíçóç", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 + + GROUPBOX "ÅããñáöÞ ðëçñïöïñéþí åíôïðéóìïý óöáëìÜôùí", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "Áñ÷åßï Ýí&äåéîçò óöáëìÜôùí:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + CONTROL "Á&íôéêáôÜóôáóç êÜèå áñ÷åßïõ", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÅéêïíéêÞ ìíÞìç" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "ÌïíÜäá [ÅôéêÝôá ôüìïõ]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "ÌÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò (óå MB)", IDC_STATIC, 115, 5, 96, 9 + CONTROL "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP, 10, 16, 204, 52, WS_EX_CLIENTEDGE + GROUPBOX "ÌÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò ìíÞìçò", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "ÌïíÜäá äßóêïõ:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "ÄéáèÝóéìïò ÷þñïò:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "&Áñ÷éêü ìÝãåèïò (MB):", -1, 22, 118, 54, 9 + LTEXT "ÌÝãéóôï ìÝ&ãåèïò (MB):", -1, 22, 131, 64, 9 + CONTROL "&ÐñïóáñìïãÞ ìåãÝ&èïõò", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 + CONTROL "Äéá&÷åßñéóç ìåãÝèïõò áðü ôï óýóôçìá", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 100, 9 + CONTROL "×ùñßò áñ÷åßï óå&ëéäïðïßçóçò", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 86,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "&Ïñéóìüò", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Óõíïëéêü ìÝãåèïò áñ÷åßïõ óåëéäïðïßçóçò", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "ÅëÜ÷éóôï åðéôñåðüìåíï:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Ðñïôåßíåôáé:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "ÔñÝ÷ïí ìÝãåèïò:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "¢êõñï", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÌåôáâëçôÝò ðåñéâÜëëïíôïò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "ÌåôáâëçôÝò ÷ñÞóôç", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&Äçìéïõñãßá...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "Åðå&îåñãáóßá...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "Äéáãñá&öÞ", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "&ÌåôáâëçôÝò óõóôÞìáôïò", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "Ä&çìéïõñãßá...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "&Åðåîåñãáóßá...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "Äéáã&ñáöÞ", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "¢êõñï", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Åðåîåñãáóßá ìåôáâëçôÞò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¼íïìá ìåôáâëçôÞò:", IDC_STATIC, 7, 14, 50, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "ÔéìÞ ìåôáâëçôÞò:", IDC_STATIC, 7, 32, 50, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "¢êôñï", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "¢äåéá" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Óýóôçìá" + IDS_CPLSYSTEMDESCRIPTION "Äåßôå ðëçñïöïñßåò ãéá ôï óýóôçìá ôïõ õðïëïãéóôÞ óáò êáé áëëÜîôå ñõèìßóåéò õëéêïý, åðéäüóåùí êáé áõôüìáôçò åíçìÝñùóçò." + IDS_MEGABYTE "MB ìíÞìçò RAM" + IDS_GIGABYTE "GB ìíÞìçò RAM" + IDS_TERABYTE "TB ìíÞìçò RAM" + IDS_PETABYTE "PB ìíÞìçò RAM" + IDS_VARIABLE "ÌåôáâëçôÞ" + IDS_VALUE "ÔéìÞ" + IDS_NO_DUMP "(ÊáíÝíá)" + IDS_MINI_DUMP "¸íäåéîç ìåéùìÝíçò ìíÞìçò(64KB)" + IDS_KERNEL_DUMP "¸íäåéîç ìíÞìçò ðõñßíá" + IDS_FULL_DUMP "¸íäåéîç ðëÞñïõò ìíÞìçò" +END Propchange: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc (original) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc Fri Dec 7 22:30:01 2007 @@ -2,6 +2,7 @@ #include "resource.h" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc Fri Dec 7 22:30:01 2007 @@ -20,10 +20,10 @@ MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "ÌåãÜëá åéêïíßäéá", FCIDM_SHVIEW_BIGICON - MENUITEM "ÌéêñÜ åéêïíßäéá", FCIDM_SHVIEW_SMALLICON - MENUITEM "Ëßóôá", FCIDM_SHVIEW_LISTVIEW - MENUITEM "ËåðôïìÝñåéåò", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&ÌåãÜëá åéêïíßäéá", FCIDM_SHVIEW_BIGICON + MENUITEM "Ì&éêñÜ åéêïíßäéá", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ëßóôá", FCIDM_SHVIEW_LISTVIEW + MENUITEM "Ë&åðôïìÝñåéåò", FCIDM_SHVIEW_REPORTVIEW END /* shellview background menu */ @@ -31,31 +31,31 @@ BEGIN POPUP "" BEGIN - POPUP "&ÅìöÜíéóç" + POPUP "&ÐñïâïëÞ" BEGIN - MENUITEM "ÌåãÜëá åéêïíßäéá", FCIDM_SHVIEW_BIGICON - MENUITEM "ÌéêñÜ åéêïíßäéá", FCIDM_SHVIEW_SMALLICON - MENUITEM "Ëßóôá", FCIDM_SHVIEW_LISTVIEW - MENUITEM "ËåðôïìÝñåéåò", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "&ÌåãÜëá åéêïíßäéá", FCIDM_SHVIEW_BIGICON + MENUITEM "Ì&éêñÜ åéêïíßäéá", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Ëßóôá", FCIDM_SHVIEW_LISTVIEW + MENUITEM "Ë&åðôïìÝñåéåò", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Ôáêôïðïßçóç åéêïíéäßùí êáôÜ" + POPUP "&Ôáêôïðïßçóç åéêïíéäßùí" BEGIN - MENUITEM "¼íïìá", 0x30 /* column 0 */ - MENUITEM "Ôýðï", 0x32 /* column 2 */ - MENUITEM "ìÝãåèïò", 0x31 /* ... */ - MENUITEM "Çìåñïìçíßá", 0x33 + MENUITEM "ÊáôÜ ü&íïìá", 0x30 /* column 0 */ + MENUITEM "ÊáôÜ &ôýðï", 0x32 /* column 2 */ + MENUITEM "ÊáôÜ &ìÝãåèïò", 0x31 /* ... */ + MENUITEM "ÊáôÜ &çìåñïìçíßá", 0x33 MENUITEM SEPARATOR MENUITEM "Áõôüìáôç ôáêôïðïßçóç", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR - MENUITEM "ÁíáíÝùóç", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR - MENUITEM "Åðéêüëëçóç", FCIDM_SHVIEW_INSERT - MENUITEM "Åðéêüëëçóç ùò óýíäåóìï", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - MENUITEM "Éäéüôçôåò", FCIDM_SHVIEW_PROPERTIES + MENUITEM "ÅõèõãñÜììéóç åéêïíéäßùí", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "ÁíáíÝùóç", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Åðéêüëçóç", FCIDM_SHVIEW_INSERT + MENUITEM "Åðéêüëçóç óõíôüìåõóçò", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Éäéüôçôåò", FCIDM_SHVIEW_PROPERTIES END END @@ -64,17 +64,17 @@ BEGIN POPUP "" BEGIN - MENUITEM "Åîåñåýíçóç", FCIDM_SHVIEW_EXPLORE - MENUITEM "¢íïéãìá", FCIDM_SHVIEW_OPEN - MENUITEM SEPARATOR - MENUITEM "ÁðïêïðÞ", FCIDM_SHVIEW_CUT - MENUITEM "ÁíôéãñáöÞ", FCIDM_SHVIEW_COPY - MENUITEM SEPARATOR - MENUITEM "Äçìéïõñãßá óõíäÝóìïõ", FCIDM_SHVIEW_CREATELINK - MENUITEM "ÄéáãñáöÞ", FCIDM_SHVIEW_DELETE - MENUITEM "Ìåôïíïìáóßá", FCIDM_SHVIEW_RENAME - MENUITEM SEPARATOR - MENUITEM "Éäéüôçôåò", FCIDM_SHVIEW_PROPERTIES + MENUITEM "&Åîåñåýíçóç", FCIDM_SHVIEW_EXPLORE + MENUITEM "&¢íïéãìá", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "Á&ðïêïðÞ", FCIDM_SHVIEW_CUT + MENUITEM "Á&íôéãñáöÞ", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Äçìéïõñãßá &óõíôüìåõóçò", FCIDM_SHVIEW_CREATELINK + MENUITEM "&ÄéáãñáöÞ", FCIDM_SHVIEW_DELETE + MENUITEM "&Ìåôïíïìáóßá", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Éäéüôçôåò", FCIDM_SHVIEW_PROPERTIES END END @@ -97,42 +97,42 @@ BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "ÖÜêåëïò:", IDD_FOLDER, 10, 152, 40, 12 + LTEXT "ÖÜêåëïò:", IDD_FOLDER, 10, 156, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Äçìéïõñãßá íÝïõ öáêÝëïõ", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Äçìéïõñãßá öáêÝëïõ", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "¢êõñï", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÌÞíõìá" +CAPTION "Ìýíçìá" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Íáé", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Íáé óå &üëá", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¼÷é", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¢êõñï", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Íáé óå ü&ëá", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¼&÷é", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "¢&êõñï", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END -IDD_SHELL_ABOUT DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 275, 198 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ó÷åôéêÜ ìå %s" +CAPTION "Ðëçñïöïñßåò: %s" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_SHELL_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_SHELL_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 + LTEXT "¸êäïóç " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "ÁõôÞ ç Ýêäïóç ôïõ ReactOS åßíáé registered óôïí/çí:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "ÁõôÞ ç Ýêäïóç ôïõ ReactOS åßíáé êáôá÷ùñçìÝíç óôïí :", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "ÅãêáôåóôçìÝíç öõóéêÞ ìíÞìç:", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 @@ -143,7 +143,7 @@ STYLE DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ôï ReactOS Þñèå óå åóÜò ÷Üñç óôïõò:", IDC_STATIC, 0, 0, 180, 10 + LTEXT "Ôï ReactOS óáò äüèçêå áðü:", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_SHELL_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -153,95 +153,95 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and ReactOS will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 + LTEXT "ÐëçêôñïëïãÞóôå ôï üíïìá åíüò ðñïãñÜììáôïò, öáêÝëïõ, åããñÜöïõ, Þ ðüñïõ ôïõ äéáäõêôßïõ, êáé ôï ReactOS èá ôï áíïßîåé.", 12289, 36, 4, 182, 25 + LTEXT "¢&íïéãìá:", 12305, 5, 39, 31, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 36, 63, 59, 14, WS_TABSTOP PUSHBUTTON "¢êõñï", IDCANCEL, 98, 63, 59, 14, WS_TABSTOP PUSHBUTTON "&ÁíáæÞôçóç...", 12288, 160, 63, 59, 14, WS_TABSTOP END -SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 235, 215 +SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Óõíôüìåõóç" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 64, 10 - LTEXT "", 14005, 78, 38, 142, 10 - LTEXT "Target location:", 14006, 8, 58, 64, 10 - LTEXT "", 14007, 79, 58, 141, 10 - LTEXT "Target:", 14008, 8, 77, 45, 10 - EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL - LTEXT "&Start in:", 14010, 8, 96, 57, 10 - EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 115, 57, 10 - EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT - LTEXT "Run:", 14016, 8, 134, 57, 10 - EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL - LTEXT "C&omment:", 14018, 8, 152, 57, 10 - EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&ÁëëáãÞ åéêïíßäßïõ...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE + LTEXT "Ôýðïò ðñïïñéóìïý:", 14004, 10, 25, 50, 15 + LTEXT "", 14005, 70, 30, 150, 10 + LTEXT "ÈÝóç ðñïïñéóìïý:", 14006, 10, 40, 70, 10 + LTEXT "", 14007, 70, 40, 150, 10 + LTEXT "Ðñïïñéóìüò:", 14008, 10, 55, 45, 10 + EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL + LTEXT "&Åêêßíçóç óôï:",14010, 10, 65, 57, 10 + EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL + LTEXT "ÐëÞêôñï óõíôüìåõóçò:", 14014, 10, 75, 60, 15 + EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT + LTEXT "ÅêôÝëåóç:", 14016, 10, 90, 57, 10 + EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL + LTEXT "&Ó÷üëéá:", 14018, 10, 100, 57, 10 + EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL + PUSHBUTTON "&Åýñåóç ðñïïñéóìïý...", 14020, 10, 115, 71, 14, ES_LEFT + PUSHBUTTON "&ÁëëáãÞ åéêïíéäßïõ...", 14021, 83, 115, 71, 14, ES_LEFT + PUSHBUTTON "&Ãéá ðñï÷ùñçìÝíïõò...", 14022, 156, 115, 71, 14, ES_LEFT END SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE -END - -SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE - EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Ôýðïò áñ÷åßïõ:", 14004, 8, 35, 50, 10 - LTEXT "Áñ÷åßï", 14005, 68, 35, 160, 10 - LTEXT "Áíïßãåé ìå åöáñìïãÞ:", 14006, 8, 53, 50, 10 - LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "ÈÝóç:", 14008, 8, 72, 45, 10 - LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "ÌÝãåèïò:", 14010, 8, 93, 45, 10 - LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "ÄçìéïõñãÞèçêå:", 14014, 8, 118, 45, 10 - LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "ÔñïðïðïéÞèçêå:", 14016, 8, 140, 45, 10 - LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "ÐñïóðåëÜóôçêå:", 14018, 8, 160, 45, 10 - LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "×áñáêôçñéóôéêÜ:", 14020, 8, 189, 45, 10 - CHECKBOX "Ìüíï ãéá áíÜãíùóç", 14021, 58, 189, 67, 10 - CHECKBOX "Êñõöü", 14022, 126, 189, 50, 10 - CHECKBOX "Ðñïò öýëáîç", 14023, 181, 189, 49, 10 -END - -SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 235, 215 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Version" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "¸êäïóç áñ÷åßïõ: ", 14000, 10, 10, 55, 10 - LTEXT "", 14001, 77, 10, 152, 10 - LTEXT "ÐåñéãñáöÞ: ", 14002, 10, 27, 45, 10 - LTEXT "", 14003, 77, 27, 152, 10 - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 - LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 - LTEXT "Item name: ", 14007, 13, 82, 50, 10 - LTEXT "ÔéìÞ: ", 14008, 112, 82, 45, 10 - LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY - EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY +CAPTION "Ðñüóèåôåò éäéüôçôåò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÅðéëÝîôå ôéò ðñüóèåôåò éäéüôçôåò ðïõ èÝëåôå ãéá áõôÞí ôçí óõíôüìåõóç.", -1, 5, 30, 210, 20 + CHECKBOX "ÅêôÝëåóç ìå äéáöïñåôéêÜ ðéóôïðïéçôéêÜ", 14000, 25, 50, 150, 10 + LTEXT "ÁõôÞ ç åðéëïãÞ èá óáò åðéôñÝøåé íá åêôåëÝóåôå ôçí óõíôüìåõóç ùò äéáöïñåôéêüò ÷ñÞóôçò Þ ùò åóåßò ï ßäéïò ðñïóôáôåýïíôáò ôïí õðïëïãéóôÞ óáò áðü ìç åîïõóéïäïôçìÝíåò åíÝñãåéåò ðñïãñáììÜôùí.", -1, 50, 60, 175, 40 + CHECKBOX "ÅêôÝëåóç óå äéáöïñåôéêÞ ðåñéï÷Þ ìíÞìçò", 14001, 25, 100, 150, 10, WS_DISABLED + PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE + PUSHBUTTON "¢êõñï", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE +END + +SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 5, 100, 10, ES_LEFT | ES_READONLY + LTEXT "Ôýðïò áñ÷åßïõ:", 14004, 10, 30, 50, 10 + LTEXT "Áñ÷åßï", 14005, 70, 30, 150, 10 + LTEXT "Áíïßãåé ìå:", 14006, 10, 40, 50, 10 + LTEXT "", 14007, 70, 40, 150, 10 + LTEXT "ÈÝóç:", 14008, 10, 55, 45, 10 + LTEXT "", 14009, 70, 55, 200, 10 + LTEXT "ÌÝãåèïò:",14010, 10, 65, 45, 10 + LTEXT "", 14011, 70, 65, 150, 10 + LTEXT "ÄçìéïõñãÞèçêå:", 14014, 10, 80, 65, 10 + LTEXT "", 14015, 70, 80, 150, 10 + LTEXT "ÔñïðïðïéÞèçêå:", 14016, 10, 90, 65, 10 + LTEXT "", 14017, 70, 90, 150, 10 + LTEXT "ÐñïóðåëÜóôçêå:", 14018, 10, 100, 65, 10 + LTEXT "", 14019, 70, 100, 150, 10 + LTEXT "×áñáêôçñéóôéêÜ:", 14020, 10, 115, 70, 10 + CHECKBOX "&Ìüíï ãéá áíÜãíùóç", 14021, 70, 115, 75, 10 + CHECKBOX "&Êñõöü", 14022, 150, 115, 50, 10 + CHECKBOX "&Archive", 14023, 190, 115, 45, 10 +END + +SHELL_FILE_VERSION_DLG DIALOGEX 0, 0, 240, 130 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¸êäïóç" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¸êäïóç áñ÷åßïõ: ", 14000, 10, 10, 60, 10 + LTEXT "", 14001, 80, 10, 160, 10 + LTEXT "ÐåñéãñáöÞ: ", 14002, 10, 20, 60, 10 + LTEXT "", 14003, 80, 20, 160, 10 + LTEXT "ÐíåõìáôéêÜ äéêáéþìáôá: ", 14004, 10, 30, 70, 10 + LTEXT "", 14005, 80, 30, 160, 10 + GROUPBOX "¢ëëåò ðëçñïöïñßåò: ", 14006, 10, 45, 220, 90 + LTEXT "¼íïìá óôïé÷åßïõ: ", 14007, 20, 55, 60, 10 + LTEXT "ÔéìÞ: ", 14008, 130, 55, 45, 10 + LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY + EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 @@ -249,15 +249,15 @@ CAPTION "ÃåíéêÜ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP + EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Ôýðïò:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "Óýóôçìá áñ÷åßùí:", -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 "×þñïò ðïõ ÷ñçóéìïðïéåßôáé:", -1, 25, 90, 120, 10 + LTEXT "ÄåóìåõìÝíïò ÷þñïò:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 @@ -272,26 +272,26 @@ 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, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED + LTEXT "Äßóêïò %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "ÅêêáèÜñéóç äßóêïõ", 14011, 160, 175, 70, 15, WS_TABSTOP + CHECKBOX "Óõìðßåóç äßóêïõ ãéá åîïéêïíüìçóç ÷þñïõ", 14012, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Äçìéïõñãßá åõñåôçñßïõ ãéá ãñçãïñüôåñç áíáæÞôçóç", 14012, 15, 220, 200, 10, WS_DISABLED END 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 -BEGIN - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "¸ëåã÷ïò ôþñá...", 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 +CAPTION "Åñãáëåßá" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "¸ëåã÷ïò óöáëìÜôùí", -1, 5, 5, 230, 60 + LTEXT "ÁõôÞ ç åðéëïãÞ èá åëÝãîåé ôïí\nôüìï ãéá óöÜëìáôá.", -1, 40, 25, 160, 20 + PUSHBUTTON "¸&ëåã÷ïò...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Áíáóõãêñüôçóç", -1, 5, 65, 230, 60 + LTEXT "ÁõôÞ ç åðéëïãÞ èá áíáóõãêñïôÞóåé ôá\náñ÷åßá óå áõôüí ôïí ôüìï", -1, 40, 85, 160, 20 + PUSHBUTTON "&Áíáóõãêñüôçóç...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Áíôßãñáöá áóöáëåßáò", -1, 5, 130, 230, 60 + LTEXT "ÁõôÞ ç åðéëïãÞ èá äçìéïõñãÞóåé áíôßãñáöá\nóöáëåßáò ãéá ôá áñ÷åßá áõôïý ôïõ ôüìïõ.", -1, 40, 150, 160, 20 + PUSHBUTTON "Áíôßãñáöá áóöáëåßáò...", 14002, 130, 170, 90, 15, WS_TABSTOP END DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 @@ -303,37 +303,37 @@ RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÅêôÝëåóç ùò" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 - CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 - LTEXT "User name:", -1, 20, 118, 54, 10 - COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Óõíèçìáôéêü:", -1, 20, 143, 53, 10 - EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP - PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP - PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP - PUSHBUTTON "¢êõñï", 14008, 122, 170, 60, 14, WS_TABSTOP +CAPTION "ÅêôÝëåóç þò" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "ÅðéëÝîôå ðïéüò ëïãáñéáóìüò ÷ñÞóôç èÝëåôå íá ôñÝîåé áõôü ôï ðñüãñáììá", -1, 10, 20, 220, 20 + CHECKBOX "ÔñÝ÷ïí ÷ñÞóôçò %s", 14000, 10, 45, 150, 10 + LTEXT "Ðñïóôáóßá ôïõ õðïëïãéóôÞ áðï ìç åîïõóéïäïôçìÝíåò åíÝñãåéåò ðñïãñáììÜôùí", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "ÁõôÞ ç åðéëïãÞ ìðïñåß íá áðïôñÝøåé éïýò íá âëÜøïõí ôïí õðïëïãéóôÞ óáò áëëÜ åðéëÝãïíôÜò ôï ìðïñåß íá êÜíåé êÜðïéá ðñïãñÜììáôá íá ìçí ëåéôïõñãïýí óùóôÜ.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Ï ðáñáêÜôù ÷ñÞóôçò:", 14002, 10, 100, 90, 10 + LTEXT "¼íïìá ÷ñÞóôç:", -1, 20, 115, 60, 10 + COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP + LTEXT "Êùäéêüò ðñüóâáóçò:", -1, 20, 140, 60, 10 + EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP + PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP + PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "¢êõñï", 14008, 140, 170, 60, 15, WS_TABSTOP END BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Éäéüôçôåò ôïõ êÜäïõ áíáêýêëùóçò" +CAPTION "Éäéüôçôåò êÜäïõ áíáêýêëùóçò" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP - EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + GROUPBOX "Ñõèìßóåéò ãéá ôïí åðéëåãìÝíï ðñïïñéóìü", -1, 10, 80, 220, 70 + RADIOBUTTON "&ÐñïóáñìïóìÝíï ìÝãåèïò:", 14001, 20, 90, 90, 10 + EDITTEXT 14002, 110, 90, 50, 10, WS_TABSTOP | ES_NUMBER + LTEXT "ÌÝãéóôï ìÝãåèïò (MB):", -1, 20, 100, 100, 10 + RADIOBUTTON "Íá ìçí ìåôáêéíïýíôáé ôá áñ÷åßá óôïí êÜäï áíáêõêëùóçò. Íá êáôáñãïýíôáé ôá áñ÷åßá ìüëéò äéáãñÜöïíôáé.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "&ÅìöÜíéóç ðáñáèýñïõ ãéá åðéâåâáßùóç äéáãñáöþí", 14004, 20, 155, 155, 10, WS_TABSTOP END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -342,11 +342,11 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: %s", 14001, 44, 25, 188, 10 + LTEXT "ÅðéëÝîôå ôï ðñüãñáììá ìå ôï ïðïßï èÝëåôå íá áíïßîåôå áõôü ôï áñ÷åßï:", -1, 44, 12, 211, 10 + LTEXT "Áñ÷åßï: %s", 14001, 44, 25, 188, 10 GROUPBOX "ÐñïãñÜììáôá", -1, 7, 42, 249, 187 CONTROL "", 14002, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 16, 57, 230, 130 - CHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 + CHECKBOX "&¢íïéãìá áõôïý ôïõ åßäïõò áñ÷åßïõ, ðÜíôá ìå ôï åðéëåãìÝíï ðñüãñáììá", 14003, 20, 193, 225, 10 PUSHBUTTON "&ÁíáæÞôçóç...", 14004, 198, 207, 50, 14 PUSHBUTTON "OK", 14005, 150, 236, 50, 14 PUSHBUTTON "¢êõñï", 14006, 206, 236, 50, 14 @@ -358,65 +358,65 @@ IDS_SHV_COLUMN1 "Áñ÷åßï" IDS_SHV_COLUMN2 "ÌÝãåèïò" IDS_SHV_COLUMN3 "Ôýðïò" - IDS_SHV_COLUMN4 "ÔñïðïðïéÞèçêå" + IDS_SHV_COLUMN4 "Ôñïðïðïßçóç" IDS_SHV_COLUMN5 "×áñáêôçñéóôéêÜ" IDS_SHV_COLUMN6 "ÌÝãåèïò" - IDS_SHV_COLUMN7 "ÌÝãåèïò äéáèÝóéìï" + IDS_SHV_COLUMN7 "Åëåýèåñïò ÷þñïò" IDS_SHV_COLUMN8 "¼íïìá" IDS_SHV_COLUMN9 "Ó÷üëéá" - IDS_SHV_COLUMN10 "ÉäéïêôÞôçò" - IDS_SHV_COLUMN11 "Ãêñïõð" - IDS_SHV_COLUMN_DELFROM "Áñ÷éêÞ ôïðïèåóßá" + IDS_SHV_COLUMN10 "ÊÜôï÷ïò" + IDS_SHV_COLUMN11 "ÏìÜäá" + IDS_SHV_COLUMN_DELFROM "Áñ÷éêÞ èÝóç" IDS_SHV_COLUMN_DELDATE "Çìåñïìçíßá äéáãñáöÞò" /* special folders */ IDS_DESKTOP "ÅðéöÜíåéá åñãáóßáò" - IDS_MYCOMPUTER "Ï ÕðïëïãéóôÞò ìïõ" - IDS_RECYCLEBIN_FOLDER_NAME "ÊÜäïò Áíáêýêëùóçò" - IDS_CONTROLPANEL "Ðßíáêáò ÅëÝã÷ïõ" + IDS_MYCOMPUTER "Ï õðïëïãéóôÞò ìïõ" + IDS_RECYCLEBIN_FOLDER_NAME "ÊÜäïò áíáêýêëùóçò" + IDS_CONTROLPANEL "Ðßíáêáò åëÝã÷ïõ" /* context menus */ - IDS_VIEW_LARGE "ÌåãÜëá åéêïíßäéá" - IDS_VIEW_SMALL "ÌéêñÜ åéêïíßäéá" - IDS_VIEW_LIST "Ëßóôá" - IDS_VIEW_DETAILS "ËåðôïìÝñåéåò" + IDS_VIEW_LARGE "&ÌåãÜëá åéêïíßäéá" + IDS_VIEW_SMALL "Ì&éêñÜ åéêïíßäéá" + IDS_VIEW_LIST "&Ëßóôá" + IDS_VIEW_DETAILS "Ë&åðôïìÝñåéåò" IDS_SELECT "ÅðéëïãÞ" IDS_OPEN "¢íïéãìá" - IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" + IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." + IDS_CREATEFOLDER_CAPTION "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá íÝïõ öáêÝëïõ" IDS_DELETEITEM_CAPTION "Åðéâåâáßùóç äéáãñáöÞò áñ÷åßïõ" IDS_DELETEFOLDER_CAPTION "Åðéâåâáßùóç äéáãñáöÞò öáêÝëïõ" - IDS_DELETEITEM_TEXT "Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôï '%1'?" - IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ + IDS_DELETEITEM_TEXT "Åßóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå ôï óôïé÷åßï '%1';" + IDS_DELETEMULTIPLE_TEXT "Åúóôå âÝâáéïé üôé èÝëåôå íá äéáãñÜøåôå áõôÜ ôá %1 óôïé÷åß´;" + IDS_DELETESELECTED_TEXT "Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôá åðéëåãìÝíá óôïé÷åßá;" + IDS_TRASHITEM_TEXT "Åßóôå óßãïõñïé üôé èÝëåôå íá óôåßëåôå óôïí êÜäï áíáêýêëùóçò ôï '%1' ;" + IDS_TRASHFOLDER_TEXT "Åßóôå óßãïõñïé üôé èÝëåôå íá óôåßëåôå ôï '%1' êáé üëá ôá ðåñéå÷üìåíÜ ôïõ óôïí êÜäï áíáêýêëùóçò;" + IDS_TRASHMULTIPLE_TEXT "Åßóôå óßãïõñïé üôé èÝëåôå íá óôåßëåôå áõôÜ ôá %1 óôïé÷åßá óôïí êÜäï áíáêýêëùóçò;" + IDS_CANTTRASH_TEXT "Ôï óôïé÷åßï '%1' äåí ìðïñåß íá ìåôáöåñèåß óôïí êÜäï áíáêýêëùóçò. ÈÝëåôå íá ôï äéáãñÜøåôå;" + IDS_OVERWRITEFILE_TEXT "Áõôüò ï öÜêåëïò ðåñéÝ÷åé Þäç Ýíá áñ÷åßï ìå ôï üíïìá '%1'.\n\nÈÝëåôå íá ôï áíôéêáôáóôÞóåôå;" + IDS_OVERWRITEFILE_CAPTION "Åðéâåâáßùóç äéáãñáöÞò áñ÷åßïõ" + IDS_OVERWRITEFOLDER_TEXT "Áõôüò ï öÜêåëïò ðåñéÝ÷åé Þäç Ýíáí öÜêåëï ed '%1'.\n\n"\ + "Áí ôá áñ÷åßá óôïí öÜêåëï ðñïïñéóìïý Ý÷ïõí ßäéá ïíüìáôá ìå ôá áñ÷åßá óôïí\n"\ + "åðéëåãìÝíï öÜêåëï èá áíôéêáôáóôáèïýí. Åßóôå óßãïõñïé üôé èÝëåôå íá óõíå÷ßóåôå;\n"\ "the folder?" /* message box strings */ IDS_RESTART_TITLE "Åðáíåêêßíçóç" - IDS_RESTART_PROMPT "ÈÝëåôå íá åðáíåêêéíÞóåôå ôï óýóôçìá;" - IDS_SHUTDOWN_TITLE "ÓâÞóéìï õðïëïãéóôÞ" - IDS_SHUTDOWN_PROMPT "ÈÝëåôå íá ôåñìáôßóåôå ôç ëåéôïõñãßá ôïõ óõóôÞìáôïò;" + IDS_RESTART_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò;" + IDS_SHUTDOWN_TITLE "Áðåíåñãïðïßçóç" + IDS_SHUTDOWN_PROMPT "Åßóôå óßãïõñïé üôé èÝëåôå íá áðåíåñãïðïéÞóåôå ôïí õðïëïãéóôÞ óáò;" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" IDS_PERSONAL "Ôá ÝããñáöÜ ìïõ" - IDS_FAVORITES "ÁãáðçìÝíá" + IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" - IDS_RECENT "Ðñüóöáôá" + IDS_RECENT "Recent" IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" - IDS_MYMUSIC "Ç ìïõóéêÞ ìïõ" - IDS_MYVIDEO "Ôá âßíôåü ìïõ" + IDS_MYMUSIC "My Music" + IDS_MYVIDEO "My Video" IDS_DESKTOPDIRECTORY "Desktop" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -436,16 +436,16 @@ 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" + IDS_DRIVE_FIXED "Ôïðéêüò äßóêïò" + IDS_DRIVE_CDROM "ÌïíÜäá CD" + IDS_DRIVE_NETWORK "Äßóêïò äéêôýïõ" IDS_OPEN_WITH "¢íïéãìá ìå" IDS_OPEN_WITH_CHOOSE "ÅðéëïãÞ ðñïãñÜììáôïò..." - IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "ÍÝï" - FCIDM_SHVIEW_NEWFOLDER "ÍÝïò öÜêåëïò" - FCIDM_SHVIEW_NEWLINK "ÍÝïò óýíäåóìïò" -END + IDS_SHELL_ABOUT_AUTHORS "&ÐñïãñáììáôéóôÝò" + IDS_SHELL_ABOUT_BACK "< &ÅðéóôñïöÞ" + FCIDM_SHVIEW_NEW "Äçìéïõñãßá" + FCIDM_SHVIEW_NEWFOLDER "ÍÝïò &ÖÜêåëïò" + FCIDM_SHVIEW_NEWLINK "ÍÝá &Óõíôüìåõóç" +END

1 0

[fireball] 31059: - Fix a bug in delay dereferencing which could lead to an ASSERT. - Try to work around the ReactOS hack of saving user-mode registry flags in the keynode, by at least masking out the REG_OPTION_CREATE_LINK flag which interferes with HIVE_EXIT. - Implement symbolic link parsing and resolution in the new parse routine (with CmpGetSymbolicLink).
by fireball＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: fireball Date: Fri Dec 7 20:38:03 2007 New Revision: 31059 URL: http://svn.reactos.org/svn/reactos?rev=31059&view=rev Log: - Fix a bug in delay dereferencing which could lead to an ASSERT. - Try to work around the ReactOS hack of saving user-mode registry flags in the keynode, by at least masking out the REG_OPTION_CREATE_LINK flag which interferes with HIVE_EXIT. - Implement symbolic link parsing and resolution in the new parse routine (with CmpGetSymbolicLink). Modified: trunk/reactos/ntoskrnl/config/cmdelay.c trunk/reactos/ntoskrnl/config/cmparse.c Modified: trunk/reactos/ntoskrnl/config/cmdelay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdelay.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdelay.c (original) +++ trunk/reactos/ntoskrnl/config/cmdelay.c Fri Dec 7 20:38:03 2007 @@ -163,6 +163,7 @@ if (!CmpDelayDerefKCBWorkItemActive) { /* Yes, we have no work item, setup the interval */ + CmpDelayDerefKCBWorkItemActive = TRUE; Timeout.QuadPart = CmpDelayDerefKCBIntervalInSeconds * -10000000; KeSetTimer(&CmpDelayDerefKCBTimer, Timeout, &CmpDelayDerefKCBDpc); } @@ -305,3 +306,4 @@ Kcb->DelayedCloseIndex = CmpDelayedCloseSize; } + Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Dec 7 20:38:03 2007 @@ -72,6 +72,135 @@ /* If there's nothing left, we're last */ *LastName = !RemainingName->Length; return NameValid; +} + +BOOLEAN +NTAPI +CmpGetSymbolicLink(IN PHHIVE Hive, + IN OUT PUNICODE_STRING ObjectName, + IN OUT PCM_KEY_CONTROL_BLOCK SymbolicKcb, + IN PUNICODE_STRING RemainingName OPTIONAL) +{ + HCELL_INDEX LinkCell = HCELL_NIL; + PCM_KEY_VALUE LinkValue = NULL; + PWSTR LinkName = NULL; + BOOLEAN LinkNameAllocated = FALSE; + PWSTR NewBuffer; + ULONG Length = 0; + ULONG ValueLength = 0; + BOOLEAN Result = FALSE; + HCELL_INDEX CellToRelease = HCELL_NIL; + PCM_KEY_NODE Node; + UNICODE_STRING NewObjectName; + + /* Make sure we're not being deleted */ + if (SymbolicKcb->Delete) return FALSE; + + /* Get the key node */ + Node = (PCM_KEY_NODE)HvGetCell(SymbolicKcb->KeyHive, SymbolicKcb->KeyCell); + if (!Node) goto Exit; + + /* Find the symbolic link key */ + LinkCell = CmpFindValueByName(Hive, Node, &CmSymbolicLinkValueName); + HvReleaseCell(SymbolicKcb->KeyHive, SymbolicKcb->KeyCell); + if (LinkCell == HCELL_NIL) goto Exit; + + /* Get the value cell */ + LinkValue = (PCM_KEY_VALUE)HvGetCell(Hive, LinkCell); + if (!LinkValue) goto Exit; + + /* Make sure it's a registry link */ + if (LinkValue->Type != REG_LINK) goto Exit; + + /* Now read the value data */ + if (!CmpGetValueData(Hive, + LinkValue, + &ValueLength, + (PVOID)&LinkName, + &LinkNameAllocated, + &CellToRelease)) + { + /* Fail */ + goto Exit; + } + + /* Get the length */ + Length = ValueLength + sizeof(WCHAR); + + /* Make sure we start with a slash */ + if (*LinkName != OBJ_NAME_PATH_SEPARATOR) goto Exit; + + /* Add the remaining name if needed */ + if (RemainingName) Length += RemainingName->Length + sizeof(WCHAR); + + /* Check for overflow */ + if (Length > 0xFFFF) goto Exit; + + /* Check if we need a new buffer */ + if (Length > ObjectName->MaximumLength) + { + /* We do -- allocate one */ + NewBuffer = ExAllocatePoolWithTag(PagedPool, Length, TAG_CM); + if (!NewBuffer) goto Exit; + + /* Setup the new string and copy the symbolic target */ + NewObjectName.Buffer = NewBuffer; + NewObjectName.MaximumLength = (USHORT)Length; + NewObjectName.Length = (USHORT)ValueLength; + RtlCopyMemory(NewBuffer, LinkName, ValueLength); + + /* Check if we need to add anything else */ + if (RemainingName) + { + /* Add the remaining name */ + NewBuffer[ValueLength / sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + NewObjectName.Length += sizeof(WCHAR); + RtlAppendUnicodeStringToString(&NewObjectName, RemainingName); + } + + /* Free the old buffer */ + ExFreePool(ObjectName->Buffer); + *ObjectName = NewObjectName; + } + else + { + /* The old name is large enough -- update the length */ + ObjectName->Length = (USHORT)ValueLength; + if (RemainingName) + { + /* Copy the remaining name inside */ + RtlMoveMemory(&ObjectName->Buffer[(ValueLength / sizeof(WCHAR)) + 1], + RemainingName->Buffer, + RemainingName->Length); + + /* Add the slash and update the length */ + ObjectName->Buffer[ValueLength / sizeof(WCHAR)] = OBJ_NAME_PATH_SEPARATOR; + ObjectName->Length += RemainingName->Length + sizeof(WCHAR); + } + + /* Copy the symbolic link target name */ + RtlCopyMemory(ObjectName->Buffer, LinkName, ValueLength); + } + + /* Null-terminate the whole thing */ + ObjectName->Buffer[ObjectName->Length / sizeof(WCHAR)] = UNICODE_NULL; + Result = TRUE; + +Exit: + /* Free the link name */ + if (LinkNameAllocated) ExFreePool(LinkName); + + /* Check if we had a value cell */ + if (LinkValue) + { + /* Release it */ + ASSERT(LinkCell != HCELL_NIL); + HvReleaseCell(Hive, LinkCell); + } + + /* Check if we had an active cell and release it, then return the result */ + if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); + return Result; } NTSTATUS @@ -196,7 +325,7 @@ /* Fill out the key node */ KeyNode->Signature = CM_KEY_NODE_SIGNATURE; - KeyNode->Flags = Flags; + KeyNode->Flags = Flags &~ REG_OPTION_CREATE_LINK; KeQuerySystemTime(&SystemTime); KeyNode->LastWriteTime = SystemTime; KeyNode->Spare = 0; @@ -903,9 +1032,52 @@ /* Check if this is a symlink */ if (Kcb->Flags & KEY_SYM_LINK) { + DPRINT1("Parsing sym link: %lx %lx %lx\n", Kcb->Flags, Status, + CompleteName); + + /* Get the next name */ + Result = CmpGetNextName(&Current, &NextName, &Last); + Current.Buffer = NextName.Buffer; + + /* Validate the current name string length */ + if (Current.Length + NextName.Length > MAXUSHORT) + { + /* too long */ + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + Current.Length += NextName.Length; + + /* Validate the current name string maximum length */ + if (Current.MaximumLength + NextName.MaximumLength > MAXUSHORT) + { + /* too long */ + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + Current.MaximumLength += NextName.MaximumLength; + + /* Parse the symlink */ + if (CmpGetSymbolicLink(Hive, + CompleteName, + Kcb, + &Current)) + { + /* Symlink parse succeeded */ + Status = STATUS_REPARSE; + } + else + { + /* Couldn't find symlink */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + /* Not implemented */ - DPRINT1("Parsing sym link\n"); - while (TRUE); + DPRINT1("Parsing sym link: %lx %wZ %wZ\n", Status, + CompleteName, &Current); + + /* We're done */ + goto Quickie; } /* Get the key node */ @@ -967,8 +1139,22 @@ Object); if (Status == STATUS_REPARSE) { + DPRINT1("Parsing sym link: %lx %lx\n", Status, + CompleteName); + + /* Parse the symlink */ + if (!CmpGetSymbolicLink(Hive, + CompleteName, + Kcb, + NULL)) + { + /* Symlink parse failed */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + /* Not implemented */ - DPRINT1("Parsing sym link\n"); + DPRINT1("Parsing sym link: %lx %wZ\n", Status, + CompleteName); while (TRUE); } @@ -1056,9 +1242,51 @@ } else { + DPRINT1("Parsing sym link: %lx %lx\n", Status, + CompleteName); + + /* Save the next name */ + Current.Buffer = NextName.Buffer; + + /* Validate the current name string length */ + if (Current.Length + NextName.Length > MAXUSHORT) + { + /* too long */ + Status = STATUS_NAME_TOO_LONG; + break; + } + Current.Length += NextName.Length; + + /* Validate the current name string maximum length */ + if (Current.MaximumLength + NextName.MaximumLength > MAXUSHORT) + { + /* too long */ + Status = STATUS_NAME_TOO_LONG; + break; + } + Current.MaximumLength += NextName.MaximumLength; + + /* Parse the symlink */ + if (CmpGetSymbolicLink(Hive, + CompleteName, + Kcb, + &Current)) + { + /* Symlink parse succeeded */ + Status = STATUS_REPARSE; + } + else + { + /* Couldn't find symlink */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + /* Not implemented */ - DPRINT1("Parsing sym link\n"); - while (TRUE); + DPRINT1("Parsing sym link: %lx %wZ %wZ\n", Status, + CompleteName, &Current); + + /* We're done */ + break; } } else if ((Result) && (Last)) @@ -1076,6 +1304,7 @@ } /* Dereference the parent if it exists */ +Quickie: if (ParentKcb) CmpDereferenceKeyControlBlock(ParentKcb); /* Unlock the registry */

1 0

[dchapyshev] 31058: - Update Russian Translation for servman - Add rasdlg to bootcd - Delete unused icons for main.cpl - Update English and Russian Translation for console.dll - Small fix Russian Translation for kernel32 - Update Russian Translation for shell32
by dchapyshev＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: dchapyshev Date: Fri Dec 7 20:05:46 2007 New Revision: 31058 URL: http://svn.reactos.org/svn/reactos?rev=31058&view=rev Log: - Update Russian Translation for servman - Add rasdlg to bootcd - Delete unused icons for main.cpl - Update English and Russian Translation for console.dll - Small fix Russian Translation for kernel32 - Update Russian Translation for shell32 Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/main/resources/folder_closed.ico trunk/reactos/dll/cpl/main/resources/folder_open.ico trunk/reactos/dll/win32/console/lang/en-US.rc trunk/reactos/dll/win32/console/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/nls/rus.nls trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -117,19 +117,19 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Èìÿ ñëóæáû :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Îòîáðàæàåìîå èìÿ :", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Èñïîëíÿåìûé ôàéë :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Îïèñàíèå :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 13 - LTEXT "Äîïîëíèòåëüíûå îïöèè (íàæìèòå ñïðàâêó äëÿ óòî÷íåíèÿ)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 6, 192, 44, 13 + EDITTEXT IDC_CREATE_SERVNAME, 71, 9, 150, 14, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 87, 29, 134, 14, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 14, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 8, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 8, 162, 210, 14, WS_CHILD | WS_VISIBLE + LTEXT "*Èìÿ ñëóæáû:", IDC_STATIC, 8, 12, 59, 9 + LTEXT "*Îòîáðàæàåìîå èìÿ:", IDC_STATIC, 8, 33, 78, 9 + LTEXT "*Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 8, 51, 96, 9 + LTEXT "Îïèñàíèå:", IDC_STATIC, 8, 86, 58, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 14 + LTEXT "Äîïîëíèòåëíî (íàæìèòå ""Ñïðàâêà"" äëÿ óòî÷íåíèÿ)", IDC_STATIC, 8, 151, 206, 9 + PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 8, 192, 44, 14 END IDD_DLG_DELETE DIALOGEX 6,6,185,148 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Dec 7 20:05:46 2007 @@ -224,6 +224,7 @@ dll\win32\psapi\psapi.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\rasapi32\rasapi32.dll 1 +dll\win32\rasdlg\rasdlg.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_open.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/console/lang/en-US.rc Fri Dec 7 20:05:46 2007 @@ -2,7 +2,7 @@ * * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/en.rc + * FILE: dll/win32/console/lang/en-US.rc * PURPOSE: English resource file * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ @@ -11,141 +11,139 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Cursor Size", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 -GROUPBOX "Display Options", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "Command History:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "&Buffer Size", -1, 25, 100, 60, 15 -EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15 -EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 -CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 - - -GROUPBOX "Edit Options", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Cursor Size", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "Command History", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "Edit Options", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Font" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 -LTEXT "Size", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 -LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Font", -1, 10, 105, 35, 10 -CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 -LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL -GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Each character is:", -1, 130, 165, 75, 10 -LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 -LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + LTEXT "Window Preview:", -1, 10, 10, 94, 10 + LTEXT "Size:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "&Font:", -1, 10, 105, 33, 10 + CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Each character is:", -1, 124, 166, 75, 10 + LTEXT "screen pixel wide\nscreen pixel high", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Layout" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 -LTEXT "&Width:", -1, 135, 30, 25, 10 -LTEXT "&Height:", -1, 135, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Size", -1, 130, 60, 115, 40 -LTEXT "&W&idth:", -1, 135, 70, 25, 10 -LTEXT "&H&eight:", -1, 135, 80, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 130, 105, 115, 55 -LTEXT "&Left:", -1, 135, 120, 25, 10 -LTEXT "&Top:", -1, 135, 130, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 + LTEXT "Window Preview:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Screen Buffer Size", -1, 130, 12, 115, 50 + LTEXT "&Width:", -1, 140, 28, 40, 10 + LTEXT "&Height:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Window Size", -1, 130, 65, 115, 47 + LTEXT "&W&idth:", -1, 140, 78, 39, 10 + LTEXT "&H&eight:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "Window Position", -1, 130, 116, 115, 64 + LTEXT "&Left:", -1, 140, 132, 38, 10 + LTEXT "&Top:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Selected Color Values", -1, 120, 15, 90, 45 -LTEXT "&Red:", -1, 125, 25, 30, 10 -EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Green:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Blue:", -1, 125, 45, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 + LTEXT "&Red:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "&Green:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "&Blue:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Apply Properties" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 -CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 -PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE -PUSHBUTTON "Cancel", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END STRINGTABLE BEGIN - IDS_CPLNAME "Console" - IDS_CPLDESCRIPTION "Configures console properties." - IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Raster Fonts" + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configures console properties." + IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Raster Fonts" END Modified: trunk/reactos/dll/win32/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/console/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -1,152 +1,143 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-11) -/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ - * - * PROJECT: ReactOS Console Configuration DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/en.rc - * PURPOSE: English resource file - * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) - */ +/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ */ #include <commctrl.h> LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Íàñòðîéêà" +CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Ðàçìåð êóðñîðà", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 -GROUPBOX "Ýêðàí", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "Èñòîðèÿ êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "&Ðàçìåð áóôåðà", -1, 25, 100, 60, 15 -EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&×èñëî áóôåðîâ:", -1, 25, 120, 80, 15 -EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 -CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 - - -GROUPBOX "Ðåäàêòèðîâàíèå", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Ðàçìåð êóðñîðà", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Ýêðàí", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "Èñòîðèÿ êîìàíä", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Ðàçìåð áóôåðà:", -1, 14, 101, 60, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "&×èñëî áóôåðîâ:", -1, 14, 124, 60, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "Ðåäàêòèðîâàíèå", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Øðèôò" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10 -LTEXT "Ðàçìåð", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 -LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Øðèôò", -1, 10, 105, 35, 10 -CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 -LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL -GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Êàæäûé ñèìâîë:", -1, 130, 165, 75, 10 -LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 140, 180, 65, 20 -LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 10, 10, 94, 10 + LTEXT "Ðàçìåð:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "&Øðèôò:", -1, 10, 105, 33, 10 + CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Êàæäûé ñèìâîë:", -1, 124, 166, 75, 10 + LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Ðàñêëàäêà" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 15, 115, 40 -LTEXT "&Øèðèíà:", -1, 135, 30, 25, 10 -LTEXT "&Âûñîòà:", -1, 135, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Ðàçìåð îêíà", -1, 130, 60, 115, 40 -LTEXT "Ø&èðèíà:", -1, 135, 70, 25, 10 -LTEXT "Â&ûñîòà:", -1, 135, 80, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 130, 105, 115, 55 -LTEXT "&Îòñòóï:", -1, 135, 120, 25, 10 -LTEXT "&Âûñîòà:", -1, 135, 130, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 + LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 12, 115, 50 + LTEXT "&Øèðèíà:", -1, 140, 28, 40, 10 + LTEXT "&Âûñîòà:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Ðàçìåð îêíà", -1, 130, 65, 115, 47 + LTEXT "Ø&èðèíà:", -1, 140, 78, 39, 10 + LTEXT "Â&ûñîòà:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "Ïîëîæåíèå îêíà", -1, 130, 116, 115, 64 + LTEXT "&Îòñòóï:", -1, 140, 132, 38, 10 + LTEXT "&Âûñîòà:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 140, 165, 100, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Öâåòà" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 120, 15, 90, 45 -LTEXT "&Êðàñíûé:", -1, 125, 25, 30, 10 -EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Çåëåíûé:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Ãîëóáîé:", -1, 125, 45, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 + CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 129, 7, 118, 73 + LTEXT "&Êðàñíûé:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "&Çåëåíûé:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "&Ãîëóáîé:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Ïðèìåíèòü ñâîéñòâà" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 -CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 -PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE -PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Îòìåíà", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END STRINGTABLE BEGIN - IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà" - IDS_CPLDESCRIPTION "Íàñòðîéêà Êîìàíäíîé ñòðîêè." - IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû" + IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà" + IDS_CPLDESCRIPTION "Íàñòðîéêà êîìàíäíîé ñòðîêè." + IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-07 5:00\nSYSTEM32 <DIR> 10-01-07 5:00" + IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû" END Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/rus.nls (original) +++ trunk/reactos/dll/win32/kernel32/nls/rus.nls Fri Dec 7 20:05:46 2007 @@ -143,7 +143,7 @@ LGRPID_JAPANESE+LGRPID_RES_BASE "ßïîíñêèé" LGRPID_KOREAN+LGRPID_RES_BASE "Êîðåéñêèé" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé òðàäèöèîííûé" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîù¸ííûé" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîùåííûé" LGRPID_THAI+LGRPID_RES_BASE "Òàéñêèé" LGRPID_HEBREW+LGRPID_RES_BASE "Èâðèò" LGRPID_ARABIC+LGRPID_RES_BASE "Àðàáñêèé" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -72,7 +72,7 @@ MENUITEM "&Êîïèðîâàòü", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Ñîçäàòü &ÿðëûê", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Óäàëìòü", FCIDM_SHVIEW_DELETE + MENUITEM "&Óäàëèòü", FCIDM_SHVIEW_DELETE MENUITEM "Ïåðåè&ìåíîâàòü", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES @@ -239,7 +239,7 @@ LTEXT "Àâòîðñêèå ïðàâà: ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 GROUPBOX "Äîïîëíèòåëüíûå ñâåäåíèÿ: ", 14006, 6, 70, 222, 115 - LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 50, 10 + LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 63, 10 LTEXT "Çíà÷åíèå: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY

1 0

[hpoussin] 31057: Better guess of the file path
by hpoussin＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: hpoussin Date: Fri Dec 7 20:00:21 2007 New Revision: 31057 URL: http://svn.reactos.org/svn/reactos?rev=31057&view=rev Log: Better guess of the file path Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Dec 7 20:00:21 2007 @@ -877,6 +877,7 @@ PIMAGE_NT_HEADERS NtHeader; WCHAR PathToDrivers[] = L"\\SystemRoot\\System32\\drivers\\"; WCHAR PathToSystem32[] = L"\\SystemRoot\\System32\\"; + WCHAR PathSetup[] = L"\\SystemRoot\\"; CHAR DriverNameLow[256]; ULONG Base; @@ -1064,7 +1065,13 @@ LdrEntry->FullDllName.Buffer = BldrModuleStringsFull[i]; /* Guess the path */ - if (strstr(DriverNameLow, ".dll") || strstr(DriverNameLow, ".exe")) + if (LoaderBlock->SetupLdrBlock) + { + UNICODE_STRING TempString; + RtlInitUnicodeString(&TempString, PathSetup); + RtlAppendUnicodeStringToString(&LdrEntry->FullDllName, &TempString); + } + else if (strstr(DriverNameLow, ".dll") || strstr(DriverNameLow, ".exe")) { UNICODE_STRING TempString; RtlInitUnicodeString(&TempString, PathToSystem32);

1 0

[fireball] 31056: - Fix LiveCD. - Move CmpQueryKeyName and CmpDeleteKeyObject to config, and actually make CmpDeleteKeyObject do something. - Partly implement CmpCloseKeyObject. - Rewrite CmpLinkHiveToMaster to use ObOpenObjectByName instead of Ob-hacks, and add proper call in new parse routine to handle link node creation. We don't use Ob hacks for this anymore! - Setup the CM_KEY_BODY when required. - Call (and partly implement) EnlistKeyBodyWithKCB when required.
by fireball＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: fireball Date: Fri Dec 7 19:11:02 2007 New Revision: 31056 URL: http://svn.reactos.org/svn/reactos?rev=31056&view=rev Log: - Fix LiveCD. - Move CmpQueryKeyName and CmpDeleteKeyObject to config, and actually make CmpDeleteKeyObject do something. - Partly implement CmpCloseKeyObject. - Rewrite CmpLinkHiveToMaster to use ObOpenObjectByName instead of Ob-hacks, and add proper call in new parse routine to handle link node creation. We don't use Ob hacks for this anymore! - Setup the CM_KEY_BODY when required. - Call (and partly implement) EnlistKeyBodyWithKCB when required. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Dec 7 19:11:02 2007 @@ -815,56 +815,6 @@ return(STATUS_SUCCESS); } -VOID -NTAPI -CmpDeleteKeyObject(PVOID DeletedObject) -{ - PCM_KEY_BODY KeyObject; - REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - NTSTATUS Status; - - DPRINT("Delete key object (%p)\n", DeletedObject); - - KeyObject = (PCM_KEY_BODY) DeletedObject; - - - PostOperationInfo.Object = (PVOID)KeyObject; - KeyHandleCloseInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreKeyHandleClose, &KeyHandleCloseInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); - return; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = STATUS_SUCCESS; - CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); -} - -NTSTATUS -NTAPI -CmpQueryKeyName(PVOID ObjectBody, - IN BOOLEAN HasName, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode) -{ - DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); - return STATUS_SUCCESS; -} - static NTSTATUS CmiGetLinkTarget(PCMHIVE RegistryHive, PCM_KEY_NODE KeyCell, Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Fri Dec 7 19:11:02 2007 @@ -812,7 +812,12 @@ EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, IN ULONG Flags) { - ASSERT(FALSE); -} - - + /* Sanity check */ + ASSERT(KeyBody->KeyControlBlock != NULL); + + /* Initialize the list entry */ + InitializeListHead(&KeyBody->KeyBodyList); + + /* FIXME: Implement once we don't link parents to children anymore */ +} + Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Dec 7 19:11:02 2007 @@ -165,7 +165,11 @@ 0, Object); if (!NT_SUCCESS(Status)) goto Quickie; + + /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); + KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->KeyControlBlock = NULL; /* Check if we had a class */ if (ParseContext->Class.Length > 0) @@ -232,7 +236,12 @@ ASSERT(Kcb->RefCount == 1); /* Now fill out the Cm object */ + KeyBody->NotifyBlock = NULL; + KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->KeyControlBlock = Kcb; + + /* Link it with the KCB */ + EnlistKeyBodyWithKCB(KeyBody, 0); Quickie: /* Check if we got here because of failure */ @@ -484,6 +493,12 @@ /* Get the key body and fill it out */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; + KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->ProcessID = PsGetCurrentProcessId(); + KeyBody->NotifyBlock = NULL; + + /* Link to the KCB */ + EnlistKeyBodyWithKCB(KeyBody, 0); } else { @@ -703,6 +718,7 @@ /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; + KeyBody->KeyControlBlock->ParentKcb->KcbLastWriteTime = TimeStamp; /* Check if we need to update name maximum */ if (KeyNode->MaxNameLen < Name.Length) @@ -718,6 +734,14 @@ /* Update it */ KeyNode->MaxClassLen = Context->Class.Length; } + + /* Release the cell */ + HvReleaseCell(Hive, Cell); + } + else + { + /* Release the link cell */ + HvReleaseCell(Hive, LinkCell); } Exit: @@ -986,11 +1010,22 @@ /* Check if this was the last key for a create */ if ((Last) && (ParseContext)) { + PCM_KEY_BODY KeyBody; + /* Check if we're doing a link node */ if (ParseContext->CreateLink) { /* The only thing we should see */ - DPRINT1("Expected: Creating new link\n"); + Status = CmpCreateLinkNode(Hive, + Cell, + AccessState, + NextName, + AccessMode, + Attributes, + ParseContext, + ParentKcb, + Object); + DPRINT1("Link created: %lx\n", Status); } else { @@ -998,6 +1033,14 @@ DPRINT1("Unexpected: Creating new child\n"); while (TRUE); } + + /* Check for reparse (in this case, someone beat us) */ + if (Status == STATUS_REPARSE) break; + + /* ReactOS Hack: Link this key to the parent */ + KeyBody = (PCM_KEY_BODY)*Object; + InsertTailList(&ParentKcb->KeyBodyListHead, + &KeyBody->KeyBodyList); /* Update disposition */ ParseContext->Disposition = REG_CREATED_NEW_KEY; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Dec 7 19:11:02 2007 @@ -72,6 +72,96 @@ return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); } +VOID +NTAPI +CmpDeleteKeyObject(PVOID DeletedObject) +{ + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)DeletedObject; + PCM_KEY_CONTROL_BLOCK Kcb; + REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + NTSTATUS Status; + PAGED_CODE(); + + /* First off, prepare the handle close information callback */ + PostOperationInfo.Object = KeyBody; + KeyHandleCloseInfo.Object = KeyBody; + Status = CmiCallRegisteredCallbacks(RegNtPreKeyHandleClose, + &KeyHandleCloseInfo); + if (!NT_SUCCESS(Status)) + { + /* If we failed, notify the post routine */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); + return; + } + + /* Acquire hive lock */ + CmpLockRegistry(); + + /* Make sure this is a valid key body */ + if (KeyBody->Type == TAG('k', 'y', '0', '2')) + { + /* Get the KCB */ + Kcb = KeyBody->KeyControlBlock; + if (Kcb) + { + /* Delist the key (once new parse routines are used) */ + //DelistKeyBodyFromKCB(KeyBody, FALSE); + } + + /* Dereference the KCB */ + CmpDelayDerefKeyControlBlock(Kcb); + + } + + /* Release the registry lock */ + CmpUnlockRegistry(); + + /* Do the post callback */ + PostOperationInfo.Status = STATUS_SUCCESS; + CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); +} + +VOID +NTAPI +CmpCloseKeyObject(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)Object; + PAGED_CODE(); + + /* Don't do anything if we're not the last handle */ + if (SystemHandleCount > 1) return; + + /* Make sure we're a valid key body */ + if (KeyBody->Type == TAG('k', 'y', '0', '2')) + { + /* Don't do anything if we don't have a notify block */ + if (!KeyBody->NotifyBlock) return; + + /* This shouldn't happen yet */ + ASSERT(FALSE); + } +} + +NTSTATUS +NTAPI +CmpQueryKeyName(IN PVOID ObjectBody, + IN BOOLEAN HasName, + IN OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) +{ + DPRINT1("CmpQueryKeyName() called\n"); + while (TRUE); + return STATUS_SUCCESS; +} + NTSTATUS NTAPI CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, @@ -491,14 +581,10 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RemainingPath; - PCM_KEY_BODY ParentKey; - PCM_KEY_BODY NewKey; NTSTATUS Status; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; CM_PARSE_CONTEXT ParseContext = {0}; HANDLE KeyHandle; + PCM_KEY_BODY KeyBody; PAGED_CODE(); /* Setup the object attributes */ @@ -533,83 +619,22 @@ KEY_READ | KEY_WRITE, (PVOID)&ParseContext, &KeyHandle); - - /* Capture all the info */ - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - KernelMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); if (!NT_SUCCESS(Status)) return Status; - - /* Do the parse */ - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&ParentKey, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - - /* Let go of captured attributes and name */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - /* Get out of here if we failed */ - if (!NT_SUCCESS(Status)) return Status; - - /* Scan for no name */ - if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) - { - /* Fail */ - ObDereferenceObject(ParentKey); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* Scan for leading backslash */ - while ((RemainingPath.Length) && - (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) - { - /* Ignore it */ - RemainingPath.Length -= sizeof(WCHAR); - RemainingPath.MaximumLength -= sizeof(WCHAR); - RemainingPath.Buffer++; - } - - /* Create the link node */ - Status = CmpCreateLinkNode(ParentKey->KeyControlBlock->KeyHive, - ParentKey->KeyControlBlock->KeyCell, - NULL, - RemainingPath, - KernelMode, - 0, - &ParseContext, - ParentKey->KeyControlBlock, - (PVOID*)&NewKey); - if (!NT_SUCCESS(Status)) - { - /* Failed */ - DPRINT1("CmpLinkHiveToMaster failed: %lx\n", Status); - ObDereferenceObject(ParentKey); - return Status; - } - - /* Free the create information */ - ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo); - OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo = NULL; /* Mark the hive as clean */ RegistryHive->Hive.DirtyFlag = FALSE; - /* Update KCB information */ - NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; - - /* Reference the new key */ - ObReferenceObject(NewKey); - - /* Link this key to the parent */ - InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyList); + /* ReactOS Hack: Keep alive */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + KernelMode, + (PVOID*)&KeyBody, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Close the extra handle */ + ZwClose(KeyHandle); return STATUS_SUCCESS; } @@ -767,7 +792,7 @@ ObjectTypeInitializer.ParseProcedure = CmpParseKey; ObjectTypeInitializer.SecurityProcedure = CmpSecurityMethod; ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; - //ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; + ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; ObjectTypeInitializer.SecurityRequired = TRUE; /* Create it */ @@ -892,9 +917,12 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; - RootKey->Type = TAG('k', 'v', '0', '2'); + RootKey->Type = TAG('k', 'y', '0', '2'); RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); + + /* Link with KCB */ + EnlistKeyBodyWithKCB(RootKey, 0); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -928,7 +956,7 @@ PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); - ULONG BufferSize,ResultSize; + ULONG BufferSize, ResultSize; /* Check if we are booted in setup */ if (ExpInTextModeSetup) @@ -1056,7 +1084,8 @@ &CmHive, &CmpMachineHiveList[i].Allocate, 0); - if (!(NT_SUCCESS(Status)) || !(CmHive->FileHandles[HFILE_TYPE_LOG])) + if (!(NT_SUCCESS(Status)) || + (!(CmHive->FileHandles[HFILE_TYPE_LOG]) && !(CmpMiniNTBoot))) // hak { /* We failed or couldn't get a log file, raise a hard error */ ErrorParameters = &FileName;

1 0

[hpoussin] 31055: Remove useless files
by hpoussin＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: hpoussin Date: Fri Dec 7 17:23:40 2007 New Revision: 31055 URL: http://svn.reactos.org/svn/reactos?rev=31055&view=rev Log: Remove useless files Removed: trunk/reactos/hal/halppc/generic/ipi.c trunk/reactos/hal/halppc/generic/kdbg.c trunk/reactos/hal/halppc/generic/mca.c trunk/reactos/hal/halppc/generic/pwroff.c trunk/reactos/hal/halppc/generic/resource.c trunk/reactos/hal/halppc/generic/sysbus.c trunk/reactos/hal/halppc/generic/systimer.S trunk/reactos/hal/halppc/generic/time.c trunk/reactos/hal/halx86/generic/irql.c Removed: trunk/reactos/hal/halppc/generic/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/ipi.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/ipi.c (original) +++ trunk/reactos/hal/halppc/generic/ipi.c (removed) @@ -1,24 +1,0 @@ -/* $Id: ipi.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/ipi.c - * PURPOSE: Miscellaneous hardware functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalRequestIpi(ULONG ProcessorNo) -{ - DPRINT("HalRequestIpi(ProcessorNo %lu)\n", ProcessorNo); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/kdbg.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/kdbg.c (original) +++ trunk/reactos/hal/halppc/generic/kdbg.c (removed) @@ -1,547 +1,0 @@ -/* $Id: kdbg.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/kdbg.c - * PURPOSE: Serial i/o functions for the kernel debugger. - * PROGRAMMER: Emanuele Aliberti - * Eric Kohl - * UPDATE HISTORY: - * Created 05/09/99 - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -#define DEFAULT_BAUD_RATE 19200 - - -/* MACROS *******************************************************************/ - -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) -#define SR_IER_ERDA 0x01 -#define SR_IER_ETHRE 0x02 -#define SR_IER_ERLSI 0x04 -#define SR_IER_EMS 0x08 -#define SR_IER_ALL 0x0F -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) -#define SER_FCR(x) ((x)+2) -#define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR 0x02 -#define SR_FCR_CLEAR_XMIT 0x04 -#define SER_LCR(x) ((x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SR_MCR_OUT1 0x04 -#define SR_MCR_OUT2 0x08 -#define SR_MCR_LOOP 0x10 -#define SER_LSR(x) ((x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) - - -/* GLOBAL VARIABLES *********************************************************/ - -#define KdComPortInUse _KdComPortInUse -ULONG KdComPortInUse = 0; - -/* STATIC VARIABLES *********************************************************/ - -static ULONG ComPort = 0; -static ULONG BaudRate = 0; -static PUCHAR PortBase = (PUCHAR)0; - -/* The com port must only be initialized once! */ -static BOOLEAN PortInitialized = FALSE; - - -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN -KdpDoesComPortExist (PUCHAR BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR (SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x1F); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR (SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR (SER_IER(BaseAddress), 0); - found = TRUE; - } - } - - /* restore MCR */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), mcr); - - return (found); -} - - -/* FUNCTIONS ****************************************************************/ - -/* HAL.KdPortInitialize */ -BOOLEAN -STDCALL -KdPortInitialize ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInitialized == FALSE) - { - if (PortInformation->BaudRate != 0) - { - BaudRate = PortInformation->BaudRate; - } - else - { - BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[2])) - { - PortBase = (PUCHAR)BaseArray[2]; - ComPort = 2; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else if (KdpDoesComPortExist ((PUCHAR)BaseArray[1])) - { - PortBase = (PUCHAR)BaseArray[1]; - ComPort = 1; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No COM port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - PortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - ComPort = PortInformation->ComPort; - PortInformation->BaseAddress = (ULONG)PortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No serial port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - PortInitialized = TRUE; - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(PortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(PortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(PortBase), lcr); - - /* set baud rate */ - divisor = 115200 / BaudRate; - WRITE_PORT_UCHAR (SER_DLL(PortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(PortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(PortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(PortBase)); - - /* - * set global info - */ - KdComPortInUse = (ULONG)PortBase; - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - ComPort, - (ULONG)PortBase, - BaudRate); - - HalDisplayString (buffer); - - return TRUE; -} - - -/* HAL.KdPortInitializeEx */ -BOOLEAN -STDCALL -KdPortInitializeEx ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - PUCHAR ComPortBase; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInformation->BaudRate == 0) - { - PortInformation->BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - return FALSE; - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - ComPortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = (ULONG)ComPortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - PortInformation->ComPort, - (ULONG)ComPortBase]; - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: Serial port not found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(ComPortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), lcr); - - /* set baud rate */ - divisor = 115200 / PortInformation->BaudRate; - WRITE_PORT_UCHAR (SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - -#ifndef NDEBUG - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - PortInformation->ComPort, - (ULONG)ComPortBase, - PortInformation->BaudRate); - - HalDisplayString (buffer); - -#endif /* NDEBUG */ - - return TRUE; -} - - -/* HAL.KdPortGetByte */ -BOOLEAN -STDCALL -KdPortGetByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - if ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortGetByteEx */ -BOOLEAN -STDCALL -KdPortGetByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - if ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortPollByte */ -BOOLEAN -STDCALL -KdPortPollByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - - return TRUE; -} - - -/* HAL.KdPortPollByteEx */ -BOOLEAN -STDCALL -KdPortPollByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - - return TRUE; -} - - - - -/* HAL.KdPortPutByte */ -VOID -STDCALL -KdPortPutByte ( - UCHAR ByteToSend - ) -{ - if (PortInitialized == FALSE) - return; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(PortBase), ByteToSend); -} - -/* HAL.KdPortPutByteEx */ -VOID -STDCALL -KdPortPutByteEx ( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(ComPortBase), ByteToSend); -} - - -/* HAL.KdPortRestore */ -VOID -STDCALL -KdPortRestore ( - VOID - ) -{ -} - - -/* HAL.KdPortSave */ -VOID -STDCALL -KdPortSave ( - VOID - ) -{ -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -STDCALL -KdPortDisableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -STDCALL -KdPortEnableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - return TRUE; -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/mca.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/mca.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/mca.c (original) +++ trunk/reactos/hal/halppc/generic/mca.c (removed) @@ -1,79 +1,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * 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. - * - * This 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. - * - * You 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. - */ -/* $Id: mca.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mca.c - * PURPOSE: Interfaces to the MicroChannel bus - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * TODO: - * What Adapter ID is read from an empty slot? - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -ULONG STDCALL -HalpGetMicroChannelData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - PCM_MCA_POS_DATA PosData = (PCM_MCA_POS_DATA)Buffer; - - DPRINT("HalpGetMicroChannelData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if ((BusNumber != 0) || - (SlotNumber == 0) || (SlotNumber > 8) || - (Length < sizeof(CM_MCA_POS_DATA))) - return(0); - - /* Enter Setup-Mode for given slot */ - WRITE_PORT_UCHAR((PUCHAR)0x96, (UCHAR)(((UCHAR)(SlotNumber - 1) & 0x07) | 0x08)); - - /* Read POS data */ - PosData->AdapterId = (READ_PORT_UCHAR((PUCHAR)0x101) << 8) + - READ_PORT_UCHAR((PUCHAR)0x100); - PosData->PosData1 = READ_PORT_UCHAR((PUCHAR)0x102); - PosData->PosData2 = READ_PORT_UCHAR((PUCHAR)0x103); - PosData->PosData3 = READ_PORT_UCHAR((PUCHAR)0x104); - PosData->PosData4 = READ_PORT_UCHAR((PUCHAR)0x105); - - /* Leave Setup-Mode for given slot */ - WRITE_PORT_UCHAR((PUCHAR)0x96, (UCHAR)((UCHAR)(SlotNumber - 1) & 0x07)); - - return(sizeof(CM_MCA_POS_DATA)); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/pwroff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pwroff.… ============================================================================== --- trunk/reactos/hal/halppc/generic/pwroff.c (original) +++ trunk/reactos/hal/halppc/generic/pwroff.c (removed) @@ -1,121 +1,0 @@ -/* $Id: pwroff.c 23907 2006-09-04 05:52:23Z arty $ - * - * FILE : reactos/hal/x86/apm.c - * DESCRIPTION: Turn CPU off... - * PROJECT : ReactOS Operating System - * AUTHOR : D. Lindauer (July 11 1997) - * NOTE : This program is public domain - * REVISIONS : - * 1999-12-26 - */ - -#define APM_FUNCTION_AVAILABLE 0x5300 -#define APM_FUNCTION_CONNREAL 0x5301 -#define APM_FUNCTION_POWEROFF 0x5307 -#define APM_FUNCTION_ENABLECPU 0x530d -#define APM_FUNCTION_ENABLEAPM 0x530e - -#define APM_DEVICE_BIOS 0 -#define APM_DEVICE_ALL 1 - -#define APM_MODE_DISABLE 0 -#define APM_MODE_ENABLE 1 - - - -#if defined(__GNUC__) - -nopm db 'No power management functionality',10,13,'$' -errmsg db 'Power management error',10,13,'$' -wrongver db 'Need APM version 1.1 or better',10,13,'$' -; -; Entry point -; -go: - mov dx,offset nopm - jc error - cmp ax,101h ; See if version 1.1 or greater - mov dx,offset wrongver - jc error - - mov [ver],ax - mov ax,5301h ; Do a real mode connection - mov bx,0 ; device = BIOS - int 15h - jnc noconerr - - cmp ah,2 ; Pass if already connected - mov dx,offset errmsg ; else error - jnz error -noconerr: - mov ax,530eh ; Enable latest version of APM - mov bx,0 ; device = BIOS - mov cx,[ver] ; version - int 15h - mov dx,offset errmsg - jc error - - mov ax,530dh ; Now engage and enable CPU management - mov bx,1 ; device = all - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov ax,530fh - mov bx,1 ; device = ALL - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov dx,offset errmsg -error: - call print - mov ax,4c01h - int 21h - int 3 - end start - - -BOOLEAN -ApmCall ( - DWORD Function, - DWORD Device, - DWORD Mode - ) -{ - /* AX <== Function */ - /* BX <== Device */ - /* CX <== Mode */ - __asm__("int 21\n"); /* 0x15 */ -} - -#elif defined(_MSC_VER) -#else -#error Unknown compiler for inline assembler -#endif - - -BOOLEAN -HalPowerOff (VOID) -{ - ApmCall ( - APM_FUNCTION_AVAILABLE, - APM_DEVICE_BIOS, - 0 - ); - ApmCall ( - APM_FUNCTION_ENABLEAPM, - ); - /* Shutdown CPU */ - ApmCall ( - APM_FUNCTION_POWEROFF, - APM_DEVICE_ALL, - 3 - ); - return TRUE; -} - - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/resourc… ============================================================================== --- trunk/reactos/hal/halppc/generic/resource.c (original) +++ trunk/reactos/hal/halppc/generic/resource.c (removed) @@ -1,31 +1,0 @@ -/* $Id: resource.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/resource.c - * PURPOSE: Miscellaneous resource functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysbus.… ============================================================================== --- trunk/reactos/hal/halppc/generic/sysbus.c (original) +++ trunk/reactos/hal/halppc/generic/sysbus.c (removed) @@ -1,66 +1,0 @@ -/* $Id: sysbus.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/sysbus.c - * PURPOSE: System bus handler functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * 09/04/2000 Created - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS ****************************************************************/ - -ULONG STDCALL -HalpGetSystemInterruptVector(PVOID BusHandler, - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptVector); - *Irql = VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - - -BOOLEAN STDCALL -HalpTranslateSystemBusAddress(PBUS_HANDLER BusHandler, - ULONG BusNumber, - PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, - PPHYSICAL_ADDRESS TranslatedAddress) -{ - ULONG BaseAddress = 0; - - if (*AddressSpace == 0) - { - /* memory space */ - - } - else if (*AddressSpace == 1) - { - /* io space */ - - } - else - { - /* other */ - return FALSE; - } - - TranslatedAddress->QuadPart = BusAddress.QuadPart + BaseAddress; - - return TRUE; -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/systime… ============================================================================== --- trunk/reactos/hal/halppc/generic/systimer.S (original) +++ trunk/reactos/hal/halppc/generic/systimer.S (removed) @@ -1,48 +1,0 @@ -/* - * FILE: hal/halx86/generic/timer.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Timer Interrupt and Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* FUNCTIONS *****************************************************************/ - -.globl _HalpClockInterrupt@0 -.func HalpClockInterrupt@0 -_HalpClockInterrupt@0: - - /* Enter trap */ - INT_PROLOG Hci, DoPushFakeErrorCode - - /* Push vector and make stack for IRQL */ - push 0x30 - sub esp, 4 - - /* Begin the interrupt */ - push esp - push 0x30 - push CLOCK2_LEVEL - call _HalBeginSystemInterrupt@12 - - /* Check if it's spurious */ - or al, al - jz Spurious - - /* Do a tick */ - mov eax, 100000 - jmp _KeUpdateSystemTime@0 - -Spurious: - - /* Exit the interrupt */ - add esp, 8 - mov esi, $ - jmp _Kei386EoiHelper@0 -.endfunc - Removed: trunk/reactos/hal/halppc/generic/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/time.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/time.c (original) +++ trunk/reactos/hal/halppc/generic/time.c (removed) @@ -1,102 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/time.c - * PURPOSE: Getting time information - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* MACROS and CONSTANTS ******************************************************/ - -/* macro BCD_INT : convert bcd to int */ -#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) - -/* macro INT_BCD : convert int to bcd */ -#define INT_BCD(int) (((int / 10) << 4) + (int % 10)) - - -#define RTC_REGISTER_A 0x0A -#define RTC_REG_A_UIP 0x80 /* Update In Progress bit */ - -#define RTC_REGISTER_B 0x0B - -#define RTC_REGISTER_CENTURY 0x32 - -/* GLOBALS ******************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN STDCALL -HalQueryRealTimeClock(PTIME_FIELDS Time) -{ - return TRUE; -} - - -VOID STDCALL -HalSetRealTimeClock(PTIME_FIELDS Time) -{ -} - - -BOOLEAN STDCALL -HalGetEnvironmentVariable(PCH Name, - USHORT ValueLength, - PCH Value) -{ - strncpy(Value, "TRUE", ValueLength); - return TRUE; -} - - -BOOLEAN STDCALL -HalSetEnvironmentVariable(PCH Name, - PCH Value) -{ - return TRUE; -} - - -ULONG STDCALL -HalpGetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - DPRINT("HalpGetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - return 0; -} - - -ULONG STDCALL -HalpSetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - DPRINT("HalpSetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - return 0; -} - -/* EOF */ Removed: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c (removed) @@ -1,570 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/irql.c - * PURPOSE: Implements IRQLs - * PROGRAMMER: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -/* - * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS -*/ - -typedef union -{ - USHORT both; - struct - { - UCHAR master; - UCHAR slave; - }; -} -PIC_MASK; - -/* - * PURPOSE: - Mask for HalEnableSystemInterrupt and HalDisableSystemInterrupt - * - At startup enable timer and cascade - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask = {.both = 0xFFFA}; -#else -static PIC_MASK pic_mask = { 0xFFFA }; -#endif - - -/* - * PURPOSE: Mask for disabling of acknowledged interrupts - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask_intr = {.both = 0x0000}; -#else -static PIC_MASK pic_mask_intr = { 0 }; -#endif - -static ULONG HalpPendingInterruptCount[NR_IRQS]; - -#define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) -#define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) - -#ifdef _MSC_VER - -#define KiInterruptDispatch2(x, y) - -#else - -VOID STDCALL -KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); - -#endif - -/* FUNCTIONS ****************************************************************/ - -#undef KeGetCurrentIrql -KIRQL STDCALL KeGetCurrentIrql (VOID) -/* - * PURPOSE: Returns the current irq level - * RETURNS: The current irq level - */ -{ - return(KeGetPcr()->Irql); -} - -VOID NTAPI HalpInitPICs(VOID) -{ - memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); - - /* Initialization sequence */ - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); - WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); - /* Start of hardware irqs (0x24) */ - WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); - WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); - /* 8259-1 is master */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); - /* 8259-2 is slave */ - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); - /* 8086 mode */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); - /* Enable interrupts */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0xFF); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0xFF); - - /* We can now enable interrupts */ - _enable(); -} - -VOID HalpEndSystemInterrupt(KIRQL Irql) -/* - * FUNCTION: Enable all irqs with higher priority. - */ -{ - const USHORT mask[] = - { - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, - 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, - 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - }; - - /* Interrupts should be disable while enabling irqs of both pics */ - _disable(); - - pic_mask_intr.both &= mask[Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - - /* restore ints */ - _enable(); -} - -VOID -HalpHardwareInt30(VOID) -{ - __asm__ __volatile__ ("int $0x30"); -} - -VOID -HalpHardwareInt31(VOID) -{ - __asm__ __volatile__ ("int $0x31"); -} - -VOID -HalpHardwareInt32(VOID) -{ - __asm__ __volatile__ ("int $0x32"); -} - -VOID -HalpHardwareInt33(VOID) -{ - __asm__ __volatile__ ("int $0x33"); -} - -VOID -HalpHardwareInt34(VOID) -{ - __asm__ __volatile__ ("int $0x34"); -} - -VOID -HalpHardwareInt35(VOID) -{ - __asm__ __volatile__ ("int $0x35"); -} - -VOID -HalpHardwareInt36(VOID) -{ - __asm__ __volatile__ ("int $0x36"); -} - -VOID -HalpHardwareInt37(VOID) -{ - __asm__ __volatile__ ("int $0x37"); -} - -VOID -HalpHardwareInt38(VOID) -{ - __asm__ __volatile__ ("int $0x38"); -} - -VOID -HalpHardwareInt39(VOID) -{ - __asm__ __volatile__ ("int $0x39"); -} - -VOID -HalpHardwareInt3A(VOID) -{ - __asm__ __volatile__ ("int $0x3A"); -} - -VOID -HalpHardwareInt3B(VOID) -{ - __asm__ __volatile__ ("int $0x3B"); -} - -VOID -HalpHardwareInt3C(VOID) -{ - __asm__ __volatile__ ("int $0x3C"); -} - -VOID -HalpHardwareInt3D(VOID) -{ - __asm__ __volatile__ ("int $0x3D"); -} - -VOID -HalpHardwareInt3E(VOID) -{ - __asm__ __volatile__ ("int $0x3E"); - while (TRUE); -} - -VOID -HalpHardwareInt3F(VOID) -{ - __asm__ __volatile__ ("int $0x3F"); -} - - -typedef VOID (*PHARDWARE_INT)(VOID); - -PHARDWARE_INT HalpHardwareInt[NR_IRQS] = -{ - HalpHardwareInt30, - HalpHardwareInt31, - HalpHardwareInt32, - HalpHardwareInt33, - HalpHardwareInt34, - HalpHardwareInt35, - HalpHardwareInt36, - HalpHardwareInt37, - HalpHardwareInt38, - HalpHardwareInt39, - HalpHardwareInt3A, - HalpHardwareInt3B, - HalpHardwareInt3C, - HalpHardwareInt3D, - HalpHardwareInt3E, - HalpHardwareInt3F -}; - -VOID -HalpExecuteIrqs(KIRQL NewIrql) -{ - ULONG IrqLimit, i; - IrqLimit = min(PROFILE_LEVEL - NewIrql, NR_IRQS); - - /* - * For each irq if there have been any deferred interrupts then now - * dispatch them. - */ - for (i = 0; i < IrqLimit; i++) - { - if (HalpPendingInterruptCount[i] > 0) - { - KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); - - while (HalpPendingInterruptCount[i] > 0) - { - /* - * For each deferred interrupt execute all the handlers at DIRQL. - */ - HalpPendingInterruptCount[i]--; - HalpHardwareInt[i](); - } - //KeGetPcr()->Irql--; - //HalpEndSystemInterrupt(KeGetPcr()->Irql); - } - } - -} - -VOID -HalpLowerIrql(KIRQL NewIrql) -{ - if (NewIrql >= PROFILE_LEVEL) - { - KeGetPcr()->Irql = NewIrql; - return; - } - HalpExecuteIrqs(NewIrql); - if (NewIrql >= DISPATCH_LEVEL) - { - KeGetPcr()->Irql = NewIrql; - return; - } - KeGetPcr()->Irql = DISPATCH_LEVEL; - if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) - { - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; - KiDispatchInterrupt(); - } - KeGetPcr()->Irql = APC_LEVEL; - if (NewIrql == APC_LEVEL) - { - return; - } - if (KeGetCurrentThread() != NULL && - KeGetCurrentThread()->ApcState.KernelApcPending) - { - KiDeliverApc(KernelMode, NULL, NULL); - } - KeGetPcr()->Irql = PASSIVE_LEVEL; -} - -/********************************************************************** - * NAME EXPORTED - * KfLowerIrql - * - * DESCRIPTION - * Restores the irq level on the current processor - * - * ARGUMENTS - * NewIrql = Irql to lower to - * - * RETURN VALUE - * None - * - * NOTES - * Uses fastcall convention - */ -VOID FASTCALL -KfLowerIrql (KIRQL NewIrql) -{ - DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql > KeGetPcr()->Irql) - { - DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", - __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); - KEBUGCHECK(0); - for(;;); - } - - HalpLowerIrql(NewIrql); -} - -/********************************************************************** - * NAME EXPORTED - * KfRaiseIrql - * - * DESCRIPTION - * Raises the hardware priority (irql) - * - * ARGUMENTS - * NewIrql = Irql to raise to - * - * RETURN VALUE - * previous irq level - * - * NOTES - * Uses fastcall convention - */ - -KIRQL FASTCALL -KfRaiseIrql (KIRQL NewIrql) -{ - KIRQL OldIrql; - - DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql < KeGetPcr()->Irql) - { - DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", - __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); - KEBUGCHECK (0); - for(;;); - } - - OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = NewIrql; - return OldIrql; -} - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToDpcLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to DISPATCH level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToDpcLevel (VOID) -{ - return KfRaiseIrql (DISPATCH_LEVEL); -} - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToSynchLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to CLOCK2 level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToSynchLevel (VOID) -{ - return KfRaiseIrql (DISPATCH_LEVEL); -} - - -BOOLEAN STDCALL -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) -{ - ULONG irq; - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - { - return(FALSE); - } - irq = Vector - IRQ_BASE; - pic_mask_intr.both |= ((1 << irq) & 0xfffe); // do not disable the timer interrupt - - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x20); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - /* Send EOI to the PICs */ - WRITE_PORT_UCHAR((PUCHAR)0x20,0x20); - WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); - } -#if 0 - if (KeGetPcr()->Irql >= Irql) - { - HalpPendingInterruptCount[irq]++; - return(FALSE); - } -#endif - *OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = Irql; - - return(TRUE); -} - - -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) -/* - * FUNCTION: Finish a system interrupt and restore the specified irq level. - */ -{ - HalpLowerIrql(Irql); - HalpEndSystemInterrupt(Irql); -} - -BOOLEAN -STDCALL -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - ULONG irq; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - pic_mask.both |= (1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.slave)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } - - return TRUE; -} - - -BOOLEAN -STDCALL -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - ULONG irq; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - pic_mask.both &= ~(1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } - - return TRUE; -} - - -VOID FASTCALL -HalRequestSoftwareInterrupt( - IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; - break; - - case DISPATCH_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; - break; - - default: - KEBUGCHECK(0); - } -} - -VOID FASTCALL -HalClearSoftwareInterrupt( - IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = FALSE; - break; - - case DISPATCH_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; - break; - - default: - KEBUGCHECK(0); - } -} - -/* EOF */

1 0

[dchapyshev] 31054: - Update Russian translation
by dchapyshev＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: dchapyshev Date: Fri Dec 7 13:59:53 2007 New Revision: 31054 URL: http://svn.reactos.org/svn/reactos?rev=31054&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Fri Dec 7 13:59:53 2007 @@ -7,12 +7,12 @@ STRINGTABLE { IDS_APPNAME, "Ñàïåð" - IDS_SECONDS, "seconds" + IDS_SECONDS, "ñåêóíä" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Game" { + POPUP "&Èãðà" { MENUITEM "&Íîâàÿ èãðà", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Ìåòêè", IDM_MARKQ @@ -47,7 +47,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60

1 0

[peterw] 31053: - Some formatting changes and cleanup.
by peterw＠svn.reactos.org 07 Dec '07

07 Dec '07

Author: peterw Date: Fri Dec 7 13:10:02 2007 New Revision: 31053 URL: http://svn.reactos.org/svn/reactos?rev=31053&view=rev Log: - Some formatting changes and cleanup. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Fri Dec 7 13:10:02 2007 @@ -104,44 +104,44 @@ goto :EOC :BUILD -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) -) goto :EOF :BUILDMULTI -:: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + :: + :: Get the number of CPUs in the system so we know how many jobs to execute. + :: To modify the number used alter the options used with cpucount: + :: No Option - Number of CPUs. + :: -x1 - Number of CPUs, plus 1. + :: -x2 - Number of CPUs, doubled. + :: + for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) -) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Fri Dec 7 13:10:02 2007 @@ -36,11 +36,11 @@ :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -set /p _1="Please enter a ReactOS source directory, or 'previous': " -if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC -) + set /p _1="Please enter a ReactOS source directory, or 'previous': " + if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC + ) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Fri Dec 7 13:10:02 2007 @@ -35,11 +35,11 @@ goto :EOC :INTERACTIVE -set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " -if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC -) + set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " + if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Dec 7 13:10:02 2007 @@ -28,43 +28,43 @@ ) call :INTERACTIVE -:RADD2RLINE :: :: First get the ImageBase of the File. If its smaller than the given :: Parameter, everything is ok, because it was already added onto the :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -if "%_1%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC -) -if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC -) -echo %_1% -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i -if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" -) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" -) +:RADD2RLINE + if "%_1%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC + ) + if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC + ) + echo %_1% + for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i + if %%i lss %_2% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" + ) else ( + set /a baseaddr+=0x%_2% + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" + ) goto :EOC :: :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH -) -if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " -) + if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH + ) + if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " + ) goto :EOF :: Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Fri Dec 7 13:10:02 2007 @@ -36,10 +36,9 @@ !include "LogicLib.nsh" !include "x64.nsh" -;; MUI begin. - -;; -;; Read our custom page ini, remove previous version. +;; +;; Read our custom page ini, remove previous version and make sure only +;; one instance of the installer is running. ;; Function .onInit System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' @@ -91,7 +90,7 @@ !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.pdf" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.pdf" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !insertmacro MUI_PAGE_FINISH @@ -105,8 +104,6 @@ ;; ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English" - -;; MUI end. Section -BaseFiles SEC01 SetShellVarContext current Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ma… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile Fri Dec 7 13:10:02 2007 @@ -47,4 +47,4 @@ $(STRIP) tee$(SUFFIX) clean: - del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe scut.exe tee.exe

1 0

[fireball] 31052: - Replace KEY_OBJECT by real CM_KEY_BODY NT type.
by fireball＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: fireball Date: Fri Dec 7 00:11:57 2007 New Revision: 31052 URL: http://svn.reactos.org/svn/reactos?rev=31052&view=rev Log: - Replace KEY_OBJECT by real CM_KEY_BODY NT type. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Fri Dec 7 00:11:57 2007 @@ -44,7 +44,7 @@ { UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; ULONG LocalDisposition; - PKEY_OBJECT KeyObject, Parent; + PCM_KEY_BODY KeyObject, Parent; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; @@ -173,7 +173,7 @@ KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; /* Link child to parent */ - InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyEntry); + InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyList); /* Create the actual handle to the object */ Status = CmpCreateHandle(KeyObject, @@ -217,7 +217,7 @@ { UNICODE_STRING RemainingPath = {0}; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PKEY_OBJECT Object = NULL; + PCM_KEY_BODY Object = NULL; HANDLE hKey = NULL; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Dec 7 00:11:57 2007 @@ -441,9 +441,9 @@ CmiScanKeyList(PCM_KEY_CONTROL_BLOCK Parent, PCUNICODE_STRING KeyName, ULONG Attributes, - PKEY_OBJECT* ReturnedObject) + PCM_KEY_BODY* ReturnedObject) { - PKEY_OBJECT CurKey = NULL; + PCM_KEY_BODY CurKey = NULL; PCM_NAME_CONTROL_BLOCK Ncb; PLIST_ENTRY NextEntry; PWCHAR p, pp; @@ -455,7 +455,7 @@ while (NextEntry != &Parent->KeyBodyListHead) { /* Get the current ReactOS Key Object */ - CurKey = CONTAINING_RECORD(NextEntry, KEY_OBJECT, KeyBodyEntry); + CurKey = CONTAINING_RECORD(NextEntry, CM_KEY_BODY, KeyBodyList); /* Get the NCB */ Ncb = CurKey->KeyControlBlock->NameBlock; @@ -542,8 +542,8 @@ OUT PVOID *NextObject) { HCELL_INDEX BlockOffset; - PKEY_OBJECT FoundObject; - PKEY_OBJECT ParsedKey; + PCM_KEY_BODY FoundObject; + PCM_KEY_BODY ParsedKey; PCM_KEY_NODE SubKeyCell; NTSTATUS Status; PWSTR StartPtr; @@ -573,8 +573,6 @@ } ParsedKey = ParsedObject; - - VERIFY_KEY_OBJECT(ParsedKey); *NextObject = NULL; @@ -698,7 +696,7 @@ NULL, KernelMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, (PVOID*)&FoundObject); @@ -744,7 +742,7 @@ FoundObject->KeyControlBlock = Kcb; ASSERT(FoundObject->KeyControlBlock->KeyHive == ParsedKey->KeyControlBlock->KeyHive); - InsertTailList(&ParsedKey->KeyControlBlock->KeyBodyListHead, &FoundObject->KeyBodyEntry); + InsertTailList(&ParsedKey->KeyControlBlock->KeyBodyListHead, &FoundObject->KeyBodyList); DPRINT("Created object 0x%p\n", FoundObject); } else @@ -809,7 +807,6 @@ *Path = EndPtr; - VERIFY_KEY_OBJECT(FoundObject); *NextObject = FoundObject; @@ -822,14 +819,14 @@ NTAPI CmpDeleteKeyObject(PVOID DeletedObject) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; NTSTATUS Status; DPRINT("Delete key object (%p)\n", DeletedObject); - KeyObject = (PKEY_OBJECT) DeletedObject; + KeyObject = (PCM_KEY_BODY) DeletedObject; PostOperationInfo.Object = (PVOID)KeyObject; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri Dec 7 00:11:57 2007 @@ -179,8 +179,7 @@ union { ULONG ValueList; - //struct _CM_KEY_CONTROL_BLOCK *RealKcb; - struct _KEY_OBJECT *RealKcb; + struct _CM_KEY_CONTROL_BLOCK *RealKcb; }; } CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; @@ -490,11 +489,6 @@ // // BUGBUG Old Hive Stuff for Temporary Support // -typedef struct _KEY_OBJECT -{ - PCM_KEY_CONTROL_BLOCK KeyControlBlock; - LIST_ENTRY KeyBodyEntry; -} KEY_OBJECT, *PKEY_OBJECT; NTSTATUS NTAPI CmFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, @@ -884,13 +878,6 @@ IN ULONG Flags ); -VOID -NTAPI -EnlistKeyBodyWithKeyObject( - IN PKEY_OBJECT KeyObject, - IN ULONG Flags -); - NTSTATUS NTAPI CmpFreeKeyByCell( @@ -1364,7 +1351,7 @@ IN POBJECT_ATTRIBUTES TargetKey, IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, - IN PKEY_OBJECT KeyBody + IN PCM_KEY_BODY KeyBody ); // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Fri Dec 7 00:11:57 2007 @@ -1170,7 +1170,7 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, - IN PKEY_OBJECT KeyBody) + IN PCM_KEY_BODY KeyBody) { SECURITY_QUALITY_OF_SERVICE ServiceQos; SECURITY_CLIENT_CONTEXT ClientSecurityContext; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Dec 7 00:11:57 2007 @@ -89,7 +89,7 @@ OUT PVOID *Object) { NTSTATUS Status = STATUS_SUCCESS; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; HCELL_INDEX ClassCell = HCELL_NIL; PCM_KEY_NODE KeyNode; PCELL_DATA CellData; @@ -160,12 +160,12 @@ NULL, AccessMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, Object); if (!NT_SUCCESS(Status)) goto Quickie; - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); /* Check if we had a class */ if (ParseContext->Class.Length > 0) @@ -271,7 +271,7 @@ PCELL_DATA CellData; HCELL_INDEX KeyCell; ULONG ParentType; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; @@ -354,7 +354,7 @@ if (NT_SUCCESS(Status)) { /* Get the key body */ - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); /* Now add the subkey */ if (!CmpAddSubKey(Hive, Cell, KeyCell)) @@ -436,7 +436,7 @@ OUT PVOID *Object) { NTSTATUS Status; - PKEY_OBJECT KeyBody = NULL; + PCM_KEY_BODY KeyBody = NULL; PCM_KEY_CONTROL_BLOCK Kcb = NULL; /* Make sure the hive isn't locked */ @@ -475,14 +475,14 @@ NULL, AccessMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, Object); if (NT_SUCCESS(Status)) { /* Get the key body and fill it out */ - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; } else @@ -510,7 +510,7 @@ { NTSTATUS Status; HCELL_INDEX KeyCell, LinkCell, ChildCell; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; PCM_KEY_CONTROL_BLOCK Kcb = ParentKcb; @@ -693,7 +693,7 @@ } /* Get the key body */ - KeyBody = (PKEY_OBJECT)*Object; + KeyBody = (PCM_KEY_BODY)*Object; /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); @@ -849,7 +849,7 @@ } /* Grab the KCB */ - Kcb = ((PKEY_OBJECT)ParseObject)->KeyControlBlock; + Kcb = ((PCM_KEY_BODY)ParseObject)->KeyControlBlock; DPRINT1("KCB Parse: %p\n", Kcb); /* Lookup in the cache */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Dec 7 00:11:57 2007 @@ -492,8 +492,8 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; + PCM_KEY_BODY ParentKey; + PCM_KEY_BODY NewKey; NTSTATUS Status; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; @@ -609,7 +609,7 @@ ObReferenceObject(NewKey); /* Link this key to the parent */ - InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyEntry); + InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyList); return STATUS_SUCCESS; } @@ -840,11 +840,7 @@ { UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; -#if 0 PCM_KEY_BODY RootKey; -#else - PKEY_OBJECT RootKey; -#endif HCELL_INDEX RootIndex; NTSTATUS Status; PCM_KEY_NODE KeyCell; @@ -872,7 +868,7 @@ &ObjectAttributes, KernelMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, (PVOID*)&RootKey); @@ -896,11 +892,9 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; -#if 0 RootKey->Type = TAG('k', 'v', '0', '2'); RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); -#endif /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Fri Dec 7 00:11:57 2007 @@ -22,7 +22,7 @@ NTAPI NtDeleteKey(IN HANDLE KeyHandle) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; NTSTATUS Status; REG_DELETE_KEY_INFORMATION DeleteKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; @@ -81,7 +81,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -142,7 +142,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -203,7 +203,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_QUERY_KEY_INFORMATION QueryKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -265,7 +265,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -328,7 +328,7 @@ IN ULONG DataSize) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -385,7 +385,7 @@ NtDeleteValueKey(IN HANDLE KeyHandle, IN PUNICODE_STRING ValueName) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; NTSTATUS Status; REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; @@ -433,7 +433,7 @@ NtFlushKey(IN HANDLE KeyHandle) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; PAGED_CODE(); /* Get the key object */ @@ -513,7 +513,7 @@ { NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PKEY_OBJECT KeyBody = NULL; + PCM_KEY_BODY KeyBody = NULL; PAGED_CODE(); /* Validate flags */

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