Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 56029: [XDK] - Forgot this one in 55840
by sginsberg＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sginsberg Date: Mon Mar 5 12:57:08 2012 New Revision: 56029 URL: http://svn.reactos.org/svn/reactos?rev=56029&view=rev Log: [XDK] - Forgot this one in 55840 Modified: trunk/reactos/include/xdk/kefuncs.h Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Mon Mar 5 12:57:08 2012 @@ -255,8 +255,8 @@ } #endif -//DECLSPEC_NORETURN -NTKERNELAPI +NTKERNELAPI +DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx(

1 0

[sginsberg] 56028: [FREELDR] - Give freeldr its own RtlAssert to avoid linking to the one in rtl. Makes it possible to use the DbgPrompt version (currently #if 0-ed) of RtlAssert in ntdll/ntos with...
by sginsberg＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: sginsberg Date: Mon Mar 5 12:50:08 2012 New Revision: 56028 URL: http://svn.reactos.org/svn/reactos?rev=56028&view=rev Log: [FREELDR] - Give freeldr its own RtlAssert to avoid linking to the one in rtl. Makes it possible to use the DbgPrompt version (currently #if 0-ed) of RtlAssert in ntdll/ntos without breaking freeldr linking. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Mon Mar 5 12:50:08 2012 @@ -312,6 +312,32 @@ UiMessageBoxCritical(Buffer); assert(FALSE); for (;;); +} + +VOID +NTAPI +RtlAssert(IN PVOID FailedAssertion, + IN PVOID FileName, + IN ULONG LineNumber, + IN PCHAR Message OPTIONAL) +{ + if (Message) + { + DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber, + Message); + } + else + { + DbgPrint("Assertion \'%s\' failed at %s line %d\n", + (PCHAR)FailedAssertion, + (PCHAR)FileName, + LineNumber); + } + + DbgBreakPoint(); }

1 0

[khornicek] 56027: [TRANSLATION] - Follow-up to r55891. - Resource cleanup.
by khornicek＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: khornicek Date: Mon Mar 5 11:13:13 2012 New Revision: 56027 URL: http://svn.reactos.org/svn/reactos?rev=56027&view=rev Log: [TRANSLATION] - Follow-up to r55891. - Resource cleanup. Added: trunk/reactos/base/shell/explorer/explorer-el.rc - copied unchanged from r55952, trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-ja.rc - copied unchanged from r55952, trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-zh.rc - copied, changed from r56026, trunk/reactos/base/shell/explorer/explorer-cn.rc Removed: trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/explorer-cn-msvc.rc trunk/reactos/base/shell/explorer/explorer-cn.rc trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-jp.rc Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Removed: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc (removed) @@ -1,401 +1,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Bengali resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_BENGALI, LANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Execute...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_FILE_EXIT - END - POPUP "&View" - BEGIN - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR - MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR - MENUITEM "&Status Bar", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Refresh\tF5", ID_REFRESH - MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&Window" - BEGIN - MENUITEM "New &Window", 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 - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "&Help" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Task Manager...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Open Volume Control", ID_TRAY_VOLUME - MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS - MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON - MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA - MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&ev·" - BEGIN - MENUITEM "&cwiPvjbv...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "&eÜ Kiv", ID_FILE_EXIT - END - POPUP "&cÖ`k©b" - BEGIN - MENUITEM "&mnvqK ev·", ID_VIEW_TOOL_BAR - MENUITEM "cvk¦© ev·", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Ae¯v wb`©kK ev·", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&cyY:mZR Kiv", ID_REFRESH - MENUITEM "m¤ú~Y© c`©vq", ID_VIEW_FULLSCREEN - MENUITEM "&eûgyLx Kg©¶Î", ID_VIEW_MDI - END - POPUP "&mnvqK" - BEGIN - MENUITEM "&wba©vib", ID_TOOLS_OPTIONS - END - POPUP "&mvnvh¨" - BEGIN - MENUITEM "&we¯viK m¤ú©K...", ID_ABOUT_EXPLORER - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_EXECUTE DIALOGEX DISCARDABLE 15, 13, 210, 63 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Execute" -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 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Cancel",2,158,23,47,14 - PUSHBUTTON "&Help",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Search Program in Startmenu" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "&Filter:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - 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 -END - -IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop Properties" -FONT 8, "MS Shell Dlg" -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 | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",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 | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",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 | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",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 | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",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 | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",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 | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - 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 -END - -IDD_DESKBAR_TASKBAR DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Taskbar Properties" -FONT 8, "MS Shell Dlg" -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 -END - -IDD_DESKBAR_STARTMENU DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Startmenu Properties" -FONT 8, "MS Shell Dlg" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Configure Notification Icons" -FONT 8, "MS Shell Dlg", 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 | - ES_READONLY - CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "cQ`gZ Kg©¶Î wbq¿b" -FONT 12, "SutonnyMJ", 0, 0, 0x1 -BEGIN - LTEXT "Avcbvi cQ`gZ Kg©¶Î wba©vib Kib :-",IDC_STATIC,23,7, - 160,8 - CONTROL "&eûgyLx Kg©¶Î",IDC_MDI,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,23,31,124,10 - CONTROL "&GKgyLx Kg©¶Î",IDC_SDI,"Button",BS_AUTORADIOBUTTON,23, - 61,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 "GKwU Kg©¶Î Dcev· Lvjv",IDC_SEPARATE_SUBFOLDERS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,90,135,10 - LTEXT "GB wbqgvejx mKj Kg©¶Îi Rb¨ wbw`©ó ne",IDC_STATIC,23, - 118,174,22 - DEFPUSHBUTTON "&OK",IDOK,48,140,50,10,WS_GROUP - PUSHBUTTON "&evwZj",IDCANCEL,106,140,50,10 -END - -IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Explorer" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ReactOS Explorer",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 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "we¯viK" - IDS_START "Kvh©Kvix ZvwjKv" - IDS_LOGOFF "Log Off..." - IDS_SHUTDOWN "eÜ Kiv..." - IDS_RESTART "Restart..." - IDS_LAUNCH "cwiPvjbv..." - IDS_START_HELP "mvnvh¨" - IDS_SEARCH_FILES "AbymÜvb..." - IDS_DOCUMENTS "Z_¨ fvÛvi" - IDS_FAVORITES "fvj jvMv" - IDS_PROGRAMS "Kg©" - IDS_SETTINGS "wbq¿b" - IDS_EXPLORE "we¯vi Kiv" - IDS_EMPTY "(Empty)" - IDS_RECENT "mgmvgwqK Z_¨" - IDS_ADMIN "cÖkvmwbK" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Kvh©Kvix ZvwjKv" - IDS_MINIMIZE_ALL "mKj ev· A`k¨ Kiv" - IDS_DESKTOP_NUM "W¯Uc %d" - IDS_VOLUME "AvIqvR" - IDS_ITEMS_CUR "Pjgvb ch©vq" - IDS_ITEMS_CONFIGURED "MVb kwj" - IDS_ITEMS_VISIBLE "m`k" - IDS_ITEMS_HIDDEN "A`k¨" - IDS_NOTIFY_SHOW "`Lvbv" - IDS_NOTIFY_HIDE "jyKvbv" - IDS_NOTIFY_AUTOHIDE "Avcbv Avcwb jywKq hvIqv" - IDS_SHOW_HIDDEN_ICONS "A`k¨ cÖwZK `Lvbv" - IDS_HIDE_ICONS "cÖwZK jyKvbv " - IDS_TERMINATE "ivm we¯viK eÜ Kiv" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "RvjK" - IDS_CONNECTIONS "RvjKi m¤ú©K" - IDS_DRIVES "wefvM" - IDS_SEARCH_COMPUTER "Kw¤úDUvi AbymÜvb..." - IDS_SETTINGS_MENU "ZvwjKv wba©vib" - IDS_CONTROL_PANEL "wbq¿b K`ª" - IDS_PRINTERS "wcÖUvi (Qvcv h¿)" - IDS_BROWSE "dvBj wbq bvovPvov Kiv" - IDS_SEARCH_PRG "Kg© AbymÜvb...." - IDS_ALL_USERS "mKj e¨enviKvix\\" - IDS_SEARCH "AbymÜvb\n" - IDS_ABOUT_EXPLORER "&we¯viK m¤ú©K..." - IDS_LAUNCH_MANY_PROGRAMS - "You have selected more than one program.\nAre you sure you want to launch all of them?" - IDS_DESKTOPBAR_SETTINGS "W¯Uc wbq¿b" - IDS_DESKTOP "W¯Uc" - IDS_TASKBAR "Kvh©Kvix `Û" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" -END - -#endif // Bengali resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - - Removed: trunk/reactos/base/shell/explorer/explorer-cn-msvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc (removed) @@ -1,402 +1,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Chinese (P.R.C.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MDIFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "ÎÄ¼þ(&F)" - BEGIN - MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT - END - POPUP "²é¿´(&V)" - BEGIN - MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR - MENUITEM "¸½¼ÓÀ¸(&E)", ID_VIEW_EXTRA_BAR - MENUITEM "Çý¶¯Æ÷À¸(&D)", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR - MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH - MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "µ¥ÎÄµµ½çÃæ(&S)", ID_VIEW_SDI - END - POPUP "´°¿Ú(&W)" - BEGIN - MENUITEM "ÐÂ´°¿Ú(&W)", ID_WINDOW_NEW - MENUITEM "²ãµþÅÅÁÐ(&C)\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "ºáÏòÆ½ÆÌ(&H)", ID_WINDOW_TILE_HORZ - MENUITEM "×ÝÏòÆ½ÆÌ(&V)\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "×Ô¶¯ÅÅÁÐ(&A)", ID_WINDOW_AUTOSORT - MENUITEM "È«²¿×îÐ¡»¯(&S)", ID_WINDOW_ARRANGE - END - POPUP "¹¤¾ß(&T)" - BEGIN - MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS - END - POPUP "°ïÖú(&H)" - BEGIN - MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "ÉèÖÃ(&S)...", ID_DESKTOPBAR_SETTINGS - MENUITEM "ÈÎÎñ¹ÜÀíÆ÷(&T)...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "´ò¿ªÒôÁ¿¿ØÖÆ(&O)", ID_TRAY_VOLUME - MENUITEM "µ÷ÕûÒôÆµÊôÐÔ(&A)", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "ÏÔÊ¾Òþ²ØÍ¼±ê(&S)", ID_SHOW_HIDDEN_ICONS - MENUITEM "ÏÔÊ¾Í¼±ê°´Å¥(&B)", ID_SHOW_ICON_BUTTON - MENUITEM "ÅäÖÃÈÎÎñÀ¸Í¨ÖªÇø(&C)...", ID_CONFIG_NOTIFYAREA - MENUITEM "ÉèÖÃÈÕÆÚ/Ê±¼ä(&T)...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU PRELOAD DISCARDABLE -BEGIN - POPUP "ÎÄ¼þ(&F)" - BEGIN - MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT - END - POPUP "²é¿´(&V)" - BEGIN - MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR - MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH - MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "¶àÎÄµµ½çÃæ(&M)", ID_VIEW_MDI - END - POPUP "¹¤¾ß(&T)" - BEGIN - MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS - END - POPUP "°ïÖú(&H)" - BEGIN - MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_EXECUTE DIALOGEX FIXED IMPURE 15, 13, 210, 63 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÔËÐÐ" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "ÃüÁî(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "·ûºÅÁ´½Ó(&S)",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "È·¶¨(&O)",1,158,6,47,14 - PUSHBUTTON "È¡Ïû(&C)",2,158,23,47,14 - PUSHBUTTON "°ïÖú(&H)",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "ÔÚ¿ªÊ¼²Ëµ¥ËÑË÷³ÌÐò" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "¹ýÂË(&F):",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,185,33 - PUSHBUTTON "Ñ¡È¡ÊäÈëÏî(&C)",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 172 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "×ÀÃæÊôÐÔ" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ÇëÑ¡Ôñ×ÀÃæÍ¼±êÅÅÁÐ·½Ê½:", - IDC_STATIC,7,7,166,8 - CONTROL "×óÉÏÏòÏÂ",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "×óÉÏÏòÓÒ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "ÓÒÉÏÏò×ó",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "ÓÒÉÏÏòÏÂ",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "×óÏÂÏòÉÏ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "×óÏÂÏòÓÒ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "ÓÒÏÂÏò×ó",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "ÓÒÏÂÏòÉÏ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "±ß½çÏòÏÂ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "±ß½çºá×Ý",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - 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 | - WS_TABSTOP,159,121,46,44 -// CONTROL "ÏÔÊ¾°æ±¾ºÅ(&V)",ID_DESKTOP_VERSION,"Button", -// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÈÎÎñÀ¸ÊôÐÔ" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ÏÔÊ¾Ê±ÖÓ(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "Òþ²Ø²»»î¶¯µÄÍ¨ÖªÇøÍ¼±ê(&H)", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "ÈÎÎñÀ¸Í¨ÖªÇø(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "¿ªÊ¼²Ëµ¥ÊôÐÔ" -FONT 8, "MS Shell Dlg" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 207, 150 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "ÅäÖÃÍ¨ÖªÇøÍ¼±ê" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,193,31 - LTEXT "ÌáÊ¾ÎÄ×Ö(&T):",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,55,42,145,14,ES_AUTOHSCROLL - LTEXT "´°¿Ú±êÌâ(&I):",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,55,60,145,14,ES_AUTOHSCROLL - LTEXT "Ä£¿éÂ·¾¶(&M):",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,55,78,145,14,ES_AUTOHSCROLL - GROUPBOX "ÏÔÊ¾Ä£Ê½(&D)",IDC_LABEL4,7,95,157,28 - CONTROL "ÏÔÊ¾(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,107,33,10 - CONTROL "Òþ²Ø(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, - 66,107,29,10 - CONTROL "×Ô¶¯Òþ²Ø(&U)",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,107,43,10 - ICON "",IDC_PICTURE,173,100,20,20 - LTEXT "×îºó¸ü¸Ä(&L):",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "ÏÔÊ¾±»Òþ²ØµÄ(&W)",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,131,56,10 - DEFPUSHBUTTON "È·¶¨(&O)",IDOK,91,129,50,14,WS_GROUP - PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,150,129,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "Ñ¡Ôñä¯ÀÀÆ÷´°¿ÚÄ£Ê½" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - LTEXT "ÇëÑ¡Ôñä¯ÀÀÆ÷ÓÃ»§½çÃæ:", - IDC_STATIC,7,7,160,8 - CONTROL "&MDI (¶àÎÄµµ½çÃæ)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,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 "ÔÚÁíÒ»´°¿Ú´òÀ´×ÓÎÄ¼þ¼Ð(&E)", - IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 - LTEXT "ÒÔºó×ÊÔ´¹ÜÀíÆ÷´°¿Ú½«Ê¹ÓÃÕâÐ©×÷ÎªÈ±Ê¡ÉèÖÃ", - IDC_STATIC,7,111,174,22 - DEFPUSHBUTTON "È·¶¨(&O)",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,106,136,50,14 -END - -IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¹ØÓÚ ReactOS ä¯ÀÀÆ÷" -FONT 8, "MS Shell Dlg" -BEGIN - 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 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "È·¶¨(&O)",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "Reactos ä¯ÀÀÆ÷" - IDS_START "¿ªÊ¼" - IDS_LOGOFF "×¢Ïú..." - IDS_SHUTDOWN "¹Ø±Õ..." - IDS_RESTART "ÖØÐÂÆô¶¯..." - IDS_LAUNCH "ÔËÐÐ..." - IDS_START_HELP "°ïÖú" - IDS_SEARCH_FILES "ËÑË÷..." - IDS_DOCUMENTS "ÎÒµÄÎÄµµ" - IDS_FAVORITES "ÊÕ²Ø¼Ð" - IDS_PROGRAMS "³ÌÐò" - IDS_SETTINGS "ÉèÖÃ" - IDS_EXPLORE "ä¯ÀÀÆ÷" - IDS_EMPTY "(¿Õ)" - IDS_RECENT "×î½üµÄÎÄµµ" - IDS_ADMIN "¹ÜÀí¹¤¾ß" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "¿ªÊ¼²Ëµ¥" - IDS_MINIMIZE_ALL "×îÐ¡»¯ËùÓÐ´°¿Ú" - IDS_DESKTOP_NUM "×ÀÃæ %d" - IDS_VOLUME "ÒôÁ¿" - IDS_ITEMS_CUR "µ±Ç°ÏîÄ¿" - IDS_ITEMS_CONFIGURED "ÅäÖÃ" - IDS_ITEMS_VISIBLE "¿É¼û" - IDS_ITEMS_HIDDEN "Òþ²Ø" - IDS_NOTIFY_SHOW "ÏÔÊ¾" - IDS_NOTIFY_HIDE "Òþ²Ø" - IDS_NOTIFY_AUTOHIDE "×Ô¶¯Òþ²Ø" - IDS_SHOW_HIDDEN_ICONS "ÏÔÊ¾Òþ²ØµÄÍ¼±ê" - IDS_HIDE_ICONS "Òþ²ØÍ¼±ê" - IDS_TERMINATE "ÖÕÖ¹ ROS ä¯ÀÀÆ÷" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "ÍøÂç" - IDS_CONNECTIONS "ÍøÂçÁ¬½Ó" - IDS_DRIVES "Çý¶¯Æ÷" - IDS_SEARCH_COMPUTER "ËÑË÷¼ÆËã»ú..." - IDS_SETTINGS_MENU "ÉèÖÃ²Ëµ¥" - IDS_CONTROL_PANEL "¿ØÖÆÃæ°å" - IDS_PRINTERS "´òÓ¡»ú" - IDS_BROWSE "ä¯ÀÀÎÄ¼þ" - IDS_SEARCH_PRG "ËÑË÷³ÌÐò..." - IDS_ALL_USERS "All Users\\" - IDS_SEARCH "ËÑË÷" - IDS_ABOUT_EXPLORER "¹ØÓÚä¯ÀÀÆ÷(&A)..." - IDS_LAUNCH_MANY_PROGRAMS - "ÇëÑ¡ÔñÒ»¸öÒÔÉÏµÄÓ¦ÓÃ³ÌÐò¡£\nÈ·¶¨ÒªÔËÐÐÕâÐ©³ÌÐòÃ´£¿" - IDS_DESKTOPBAR_SETTINGS "×ÀÃæÉèÖÃ" - IDS_DESKTOP "×ÀÃæ" - IDS_TASKBAR "ÈÎÎñÀ¸" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" -END - -#endif // Chinese (P.R.C.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED Removed: 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 [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc (removed) @@ -1,403 +1,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Greek resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL) -#ifdef _WIN32 -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -#pragma code_page(1253) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Áñ÷åßï" - BEGIN - MENUITEM "&ÅêôÝëåóç...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "¸&îïäïò", ID_FILE_EXIT - END - POPUP "&ÅìöÜíéóç" - BEGIN - 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 - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&ÐáñÜèõñï" - BEGIN - MENUITEM "ÍÝï &ÐáñÜèõñï", ID_WINDOW_NEW - 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 - MENUITEM "&ÅðéëïãÝò", ID_TOOLS_OPTIONS - END - POPUP "&ÂïÞèåéá" - BEGIN - MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER - MENUITEM "&Ó÷åôéêÜ ìå ôï Reactos", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Ñõèìßóåéò...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Äéá÷åßñçóç Åñãáóéþí", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "¢íïéãìá ôçò ñýèìéóçò Ýíôáóçò Þ÷ïõ", ID_TRAY_VOLUME - MENUITEM "Äéüñèùóç éäéïôÞôùí Þ÷ïõ", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - 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 - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Áñ÷åßï" - BEGIN - MENUITEM "&ÅêôÝëåóç...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "¸&îïäïò", ID_FILE_EXIT - END - POPUP "&ÅìöÜíéóç" - BEGIN - MENUITEM "Ã&ñáììÞ åñãáëåßùí", ID_VIEW_TOOL_BAR - MENUITEM "Á&ãáðçìÝíá", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&ÃñáììÞ êáôÜóôáóçò", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&ÁíáíÝùóç\tF5", ID_REFRESH - MENUITEM "Ð&ëÞñçò ïèüíç", ID_VIEW_FULLSCREEN - MENUITEM "MDI", ID_VIEW_MDI - END - 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 - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_EXECUTE DIALOGEX DISCARDABLE 15, 13, 210, 63 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÅêôÝëåóç" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 - CONTROL "¢íïéãìá:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3,18, - 58,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "¿ò óýìâïëï",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Áêýñùóç",2,158,24,47,14 - PUSHBUTTON "&ÂïÞèåéá",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "ÁíáæÞôçóç óôï ìåíïý ""Ýíáñîç""" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - 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 | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&ÁíáæÞôçóç",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Éäéüôçôåò åðéöÜíåéáò åñãáóßáò" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "ÅðéëÝîôå ôïí ôñüðï ôáêôïðïßçóç ôùí åéêïíéäßùí:", - IDC_STATIC,7,7,198,8 - CONTROL "êÜôù",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "äåîéÜ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "áñéóôåñÜ",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "êÜôù",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "ðÜíù",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "äåîéÜ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "áñéóôåñÜ",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "ðÜíù",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "êÜôùí",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "ðëáßóéï",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - 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 | - WS_TABSTOP,159,121,46,44 -// CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", -// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Éäéüôçôåò ãñáììÞò åñãáóéþí" -FONT 8, "MS Shell Dlg" -BEGIN - 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 DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Éäéüôçôåò ôïõ ìåíïý ""Ýíáñîç""" -FONT 8, "MS Shell Dlg" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 218, 174 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Ñõèìßóåéò ãéá ôïí ÷þñï åéäïðïéÞóåùí" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - 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 "åìöÜíçóç êñõöþí",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,155,79,10 - DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&¢êõñï",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "ÌïñöÞ ôïõ åîåñåõíçôÞ" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - 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 "¢íïéãìá õðïöáêÝëùí óå îå÷ùñéóôÜ ðáñÜèõñá", - 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 "&¢êõñï",IDCANCEL,106,136,50,14 -END - -IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ó÷åôéêÜ ìå ôïí åîñåõíçôÞ ôïõ ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - 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 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "ÅîåñåõíçôÞò ôïõ ReactOS" - IDS_START "Ýíáñîç" - IDS_LOGOFF "Áðïóýíäåóç..." - IDS_SHUTDOWN "Ôåñìáôéóìüò..." - IDS_RESTART "Åðáíåêêßíçóç..." - IDS_LAUNCH "ÅêôÝëåóç..." - IDS_START_HELP "ÂïÞèåéá" - IDS_SEARCH_FILES "ÁíáæÞôçóç..." - IDS_DOCUMENTS "Ôá ÝããñáöÜ ìïõ" - IDS_FAVORITES "ÁãáðçìÝíá" - IDS_PROGRAMS "ÐñïãñÜììáôá" - IDS_SETTINGS "Ñõèìßóåéò" - IDS_EXPLORE "Åîåñåýíçóç" - IDS_EMPTY "(Êåíü)" - IDS_RECENT "Ðñüóöáôá Ýããñáöá" - IDS_ADMIN "Äéá÷åßñçóç" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Ìåíïý Ýíáñîç" - IDS_MINIMIZE_ALL "Åëá÷éóôïðïßçóç üëùí ôùí ðáñáèýñùí" - IDS_DESKTOP_NUM "ÅðéöÜíåéá åñãáóßáò %d" - IDS_VOLUME "¸íôáóç Þ÷ïõ" - IDS_ITEMS_CUR "current items" - IDS_ITEMS_CONFIGURED "configuration" - IDS_ITEMS_VISIBLE "ïñáôü" - IDS_ITEMS_HIDDEN "êñõììÝíï" - IDS_NOTIFY_SHOW "åìöÜíçóç" - IDS_NOTIFY_HIDE "áðüêñõøç" - IDS_NOTIFY_AUTOHIDE "áõôüìáôç áðüêñõøç" - IDS_SHOW_HIDDEN_ICONS "ÅìöÜíçóç êñõììÝíùí åéêïíéäßùí" - IDS_HIDE_ICONS "Áðüêñõøç åéêïíéäßùí" - IDS_TERMINATE "Ôåñìáôéóìüò ôçò Åîåñåýíçóçò ôïõ ROS" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Äßêôõï" - IDS_CONNECTIONS "ÓõíäÝóåéò äéêôßïõ" - IDS_DRIVES "Ï õðïëïãéóôÞò ìïõ" - IDS_SEARCH_COMPUTER "ÁíáæÞôçóç ÕðïëïãéóôÞ..." - IDS_SETTINGS_MENU "Ñõèìßóåéò" - IDS_CONTROL_PANEL "Ðßíáêáò åëÝã÷ïõ" - IDS_PRINTERS "ÅêôõðùôÝò" - IDS_BROWSE "Åîåñåýíçóç áñ÷åßùí" - IDS_SEARCH_PRG "ÁíáæÞôçóç ÐñïãñÜììáôïò..." - IDS_ALL_USERS "All Users\\" - IDS_SEARCH "ÁíáæÞôçóç" - IDS_ABOUT_EXPLORER "Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ" - IDS_LAUNCH_MANY_PROGRAMS - "¸÷åôå åðéëÝîåé ðáñáðÜíù ôïõ åíüò ðñïãñÜììáôá.\nÅßóôå óßãïõñïé ïôé èÝëåôå íá åêôåëåóôïýí üëá;" - IDS_DESKTOPBAR_SETTINGS "Ñõèìßóåéò ÅðéöÜíåéáò Åñãáóßáò" - IDS_DESKTOP "ÅðéöÜíåéá Åñãáóßáò" - IDS_TASKBAR "ÃñáììÞ åñãáóéþí" - IDS_NAMECOLUMN "Name" - IDS_PATHCOLUMN "Path" - IDS_MENUCOLUMN "Menu path" -END - -#endif // Greek resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - - Removed: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc (removed) @@ -1,404 +1,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Japanese resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(932) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "Às(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "I¹(&X)", ID_FILE_EXIT - END - POPUP "\\¦(&V)" - BEGIN - MENUITEM "c[ o[(&T)", ID_VIEW_TOOL_BAR - MENUITEM "GLXg o[(&E)", ID_VIEW_EXTRA_BAR - MENUITEM "hCuo[(&D)", ID_VIEW_DRIVE_BAR - MENUITEM "TCh o[(&I)", ID_VIEW_SIDE_BAR - MENUITEM "Xe[^X o[(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "ÅVÌîñÉXV(&R)\tF5", ID_REFRESH - MENUITEM "SæÊ\\¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "EBhE(&W)" - BEGIN - MENUITEM "Vµ¢EBhE(&W)", ID_WINDOW_NEW - MENUITEM "dËÄ\\¦\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "½ÉÀ×Ä\\¦(&H)", ID_WINDOW_TILE_HORZ - MENUITEM "¼ÉÀ×Ä\\¦(&V)\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "©®®ñ", ID_WINDOW_AUTOSORT - MENUITEM "Å¬»³ê½qEBhEð®ñ(&S)", ID_WINDOW_ARRANGE - END - POPUP "c[(&T)" - BEGIN - MENUITEM "IvV(&O)", ID_TOOLS_OPTIONS - END - POPUP "wv(&H)" - BEGIN - MENUITEM "Explorer FAQ (&F)...", ID_EXPLORER_FAQ - MENUITEM "Explorer ÉÂ¢Ä(&A)...", ID_ABOUT_EXPLORER - MENUITEM "OS ÉÂ¢Ä(&O)...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Ýè(&S)...", ID_DESKTOPBAR_SETTINGS - MENUITEM "^XN }l[W(&T)...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "Explorer ÉÂ¢Ä(&A)...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "{[ Rg[ðJ", ID_TRAY_VOLUME - MENUITEM "I[fBI vpeBÌ²®", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "B³ê½ACRð\\¦·é(&S)", ID_SHOW_HIDDEN_ICONS - MENUITEM "ACR {^ð\\¦·é(&B)", ID_SHOW_ICON_BUTTON - MENUITEM "ÊmÌJX^}CY(&C)...", ID_CONFIG_NOTIFYAREA - MENUITEM "útÆÌ²®(&T)...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "Explorer ÉÂ¢Ä(&A)...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "Às(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "Â¶é(&C)", ID_FILE_EXIT - END - POPUP "\\¦(&V)" - BEGIN - MENUITEM "c[ o[(&T)", ID_VIEW_TOOL_BAR - MENUITEM "TCh o[(&I)", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "Xe[^X o[(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "ÅVÌîñÉXV(&R)\tF5", ID_REFRESH - MENUITEM "SæÊ\\¦(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "MDI (&M)", ID_VIEW_MDI - END - POPUP "c[(&T)" - BEGIN - MENUITEM "IvV(&O)", ID_TOOLS_OPTIONS - END - POPUP "wv(&H)" - BEGIN - MENUITEM "Explorer FAQ (&F)...", ID_EXPLORER_FAQ - MENUITEM "Explorer ÉÂ¢Ä(&A)...", ID_ABOUT_EXPLORER - MENUITEM "OS ÉÂ¢Ä(&O)...", ID_ABOUT_WINDOWS - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_EXECUTE DIALOGEX DISCARDABLE 15, 13, 210, 63 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Às" -FONT 9, "MS UI Gothic" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 - CONTROL "R}h(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "Å¬»µ½óÔÅÀs(&S)",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "OK (&O)",1,158,6,47,14 - PUSHBUTTON "LZ(&C)",2,158,23,47,14 - PUSHBUTTON "wv(&H)",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "X^[gj[©çvOðõ" -FONT 9, "MS UI Gothic", 0, 0, 0x1 -BEGIN - LTEXT "tB^(&F):",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "o^ð`FbN·é(&C)",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "fXNgbvÌvpeB" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "gpµ½¢ACRÌzuðIðµÄ¾³¢:", - IDC_STATIC,7,7,166,8 - CONTROL "¶ã©çºÖ",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "¶ã©çEÖ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "Eã©ç¶Ö",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "Eã©çºÖ",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "¶º©çãÖ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "¶º©çEÖ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "Eº©ç¶Ö",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "Eº©çºÖ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "¶EðºÖ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "ãÆ¶EÌ[",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - 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 | - WS_TABSTOP,159,121,46,44 -// CONTROL "fXNgbvÉo[Wð\\¦·é(&V)",ID_DESKTOP_VERSION,"Button", -// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "^XN o[ÌvpeB" -FONT 9, "MS UI Gothic" -BEGIN - CONTROL "vð\\¦·é(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "ANeBuÅÈ¢ÊmACRðB·(&H)", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 - PUSHBUTTON "ÊmACR(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOGEX DISCARDABLE 0, 0, 210, 194 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "X^[gj[ÌvpeB" -FONT 9, "MS UI Gothic" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "ÊmACRÌÝè" -FONT 9, "MS UI Gothic", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "c[ `bvÌàe(&T):",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "EBhEÌ^Cg(&I):",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "W[Ìê(&M):",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "\\¦[h(&D)",IDC_LABEL4,7,96,157,28 - CONTROL "\\¦·é(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "B·(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 - CONTROL "©®IÉB·(&U)",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "ÅIÏX(&L):",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "Bê½ACRà\\¦(&W)",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "OK (&O)",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "LZ(&C)",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_APPWINDOW -CAPTION "GNXv[ÌEBhE [hÌIð" -FONT 9, "MS UI Gothic", 0, 0, 0x1 -BEGIN - LTEXT "gpµ½¢[U[ C^[tF[XðIðµÄ¾³¢:", - IDC_STATIC,7,7,160,8 - CONTROL "MDI (Multiple Document Interface)(&M)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 - CONTROL "SDI (Single Document Interface)(&S)",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 "TutH_ðVµ¢EBhEÅJ(&E)", - IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,90,135,10 - LTEXT "±êæè±ÌÝèªA·×ÄÌ Explorer EBhEÌftHgÉÈèÜ·B", - IDC_STATIC,7,111,174,22 - DEFPUSHBUTTON "OK (&O)",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "LZ(&C)",IDCANCEL,106,136,50,14 -END - -IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Explorer ÉÂ¢Ä" -FONT 9, "MS UI Gothic" -BEGIN - LTEXT "ReactOS Explorer",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 - LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, - 8 - CONTROL "OK (&O)",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, - 154,90,38,12 -END - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "ReactOS Explorer" - IDS_START "X^[g" - IDS_LOGOFF "OIt..." - IDS_SHUTDOWN "Vbg_E..." - IDS_RESTART "ÄN®..." - IDS_LAUNCH "t@C¼ðwèµÄÀs..." - IDS_START_HELP "wv" - IDS_SEARCH_FILES "t@CâtH_..." - IDS_DOCUMENTS "}ChLg" - IDS_FAVORITES "¨CÉüè" - IDS_PROGRAMS "vO" - IDS_SETTINGS "Ýè" - IDS_EXPLORE "GNXv[" - IDS_EMPTY "(Èµ)" - IDS_RECENT "ÅßgÁ½t@C" - IDS_ADMIN "Çc[" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "X^[gj[" - IDS_MINIMIZE_ALL "SEBhEðÅ¬»" - IDS_DESKTOP_NUM "fXNgbv %d" - IDS_VOLUME "¹Ê" - IDS_ITEMS_CUR "»ÝÌACR" - IDS_ITEMS_CONFIGURED "Ýè" - IDS_ITEMS_VISIBLE "\\¦" - IDS_ITEMS_HIDDEN "ñ\\¦" - IDS_NOTIFY_SHOW "\\¦·é" - IDS_NOTIFY_HIDE "B·" - IDS_NOTIFY_AUTOHIDE "©®IÉB·" - IDS_SHOW_HIDDEN_ICONS "BêÄ¢éACRà\\¦·é" - IDS_HIDE_ICONS "ACRðB·" - IDS_TERMINATE "ROS Explorer ðI¹·é" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "lbg[N" - IDS_CONNECTIONS "lbg[NÚ±" - IDS_DRIVES "[JfBXN" - IDS_SEARCH_COMPUTER "Rs[^Ìõ..." - IDS_SETTINGS_MENU "Ýèj[" - IDS_CONTROL_PANEL "Rg[ pl" - IDS_PRINTERS "v^" - IDS_BROWSE "t@CÌuEY" - IDS_SEARCH_PRG "vOðõ..." - IDS_ALL_USERS "All Users\\" - IDS_SEARCH "õ" - IDS_ABOUT_EXPLORER "Explorer ÉÂ¢Ä(&A)..." - IDS_LAUNCH_MANY_PROGRAMS - "ñÂÈãÌvOªIð³êÜµ½B\n·×ÄÌvOðÀsµÜ·©?" - IDS_DESKTOPBAR_SETTINGS "fXNgbvÌÝè" - IDS_DESKTOP "fXNgbv" - IDS_TASKBAR "^XNo[" - IDS_NAMECOLUMN "¼O" - IDS_PATHCOLUMN "pX" - IDS_MENUCOLUMN "j[pX" -END - -#endif // Japanese resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - - Copied: trunk/reactos/base/shell/explorer/explorer-zh.rc (from r56026, trunk/reactos/base/shell/explorer/explorer-cn.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-zh.rc [iso-8859-1] Mon Mar 5 11:13:13 2012 @@ -18,7 +18,6 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) #ifdef _WIN32 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -28,42 +27,42 @@ IDM_MDIFRAME MENU PRELOAD DISCARDABLE BEGIN - POPUP "ÎÄ¼þ(&F)" - BEGIN - MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT - END - POPUP "²é¿´(&V)" - BEGIN - MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR - MENUITEM "¸½¼ÓÀ¸(&E)", ID_VIEW_EXTRA_BAR - MENUITEM "Çý¶¯Æ÷À¸(&D)", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR - MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH - MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "µ¥ÎÄµµ½çÃæ(&S)", ID_VIEW_SDI - END - POPUP "´°¿Ú(&W)" - BEGIN - MENUITEM "ÐÂ´°¿Ú(&W)", ID_WINDOW_NEW - MENUITEM "²ãµþÅÅÁÐ(&C)\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "ºáÏòÆ½ÆÌ(&H)", ID_WINDOW_TILE_HORZ - MENUITEM "×ÝÏòÆ½ÆÌ(&V)\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "×Ô¶¯ÅÅÁÐ(&A)", ID_WINDOW_AUTOSORT - MENUITEM "È«²¿×îÐ¡»¯(&S)", ID_WINDOW_ARRANGE - END - POPUP "¹¤¾ß(&T)" - BEGIN - MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS - END - POPUP "°ïÖú(&H)" - BEGIN - MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS + POPUP "æä»¶(&F)" + BEGIN + MENUITEM "è¿è¡(&E)...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "éåº(&X)", ID_FILE_EXIT + END + POPUP "æ¥ç(&V)" + BEGIN + MENUITEM "å·¥å·æ (&T)", ID_VIEW_TOOL_BAR + MENUITEM "éå æ (&E)", ID_VIEW_EXTRA_BAR + MENUITEM "é©±å¨å¨æ (&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "ä¾§è¾¹æ (&S)", ID_VIEW_SIDE_BAR + MENUITEM "ç¶ææ (&S)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "å·æ°(&R)\tF5", ID_REFRESH + MENUITEM "å¨å±(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "åææ¡£çé¢(&S)", ID_VIEW_SDI + END + POPUP "çªå£(&W)" + BEGIN + MENUITEM "æ°çªå£(&W)", ID_WINDOW_NEW + MENUITEM "å±å æå(&C)\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "æ¨ªåå¹³éº(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "çºµåå¹³éº(&V)\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "èªå¨æå(&A)", ID_WINDOW_AUTOSORT + MENUITEM "å¨é¨æå°å(&S)", ID_WINDOW_ARRANGE + END + POPUP "å·¥å·(&T)" + BEGIN + MENUITEM "éé¡¹(&O)", ID_TOOLS_OPTIONS + END + POPUP "å¸®å©(&H)" + BEGIN + MENUITEM "æµè§å¨å¸®å©ææ¡£(&F)...", ID_EXPLORER_FAQ + MENUITEM "å³äºæµè§å¨(&A)...", ID_ABOUT_EXPLORER + MENUITEM "å³äºæä½ç³»ç»(&O)...", ID_ABOUT_WINDOWS END END @@ -71,10 +70,10 @@ BEGIN POPUP "" BEGIN - MENUITEM "ÉèÖÃ(&S)...", ID_DESKTOPBAR_SETTINGS - MENUITEM "ÈÎÎñ¹ÜÀíÆ÷(&T)...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + MENUITEM "è®¾ç½®(&S)...", ID_DESKTOPBAR_SETTINGS + MENUITEM "ä»»å¡ç®¡çå¨(&T)...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "å³äºæµè§å¨(&A)...", ID_ABOUT_EXPLORER END END @@ -82,8 +81,8 @@ BEGIN POPUP "" BEGIN - MENUITEM "´ò¿ªÒôÁ¿¿ØÖÆ(&O)", ID_TRAY_VOLUME - MENUITEM "µ÷ÕûÒôÆµÊôÐÔ(&A)", ID_VOLUME_PROPERTIES + MENUITEM "æå¼é³éæ§å¶(&O)", ID_TRAY_VOLUME + MENUITEM "è°æ´é³é¢å±æ§(&A)", ID_VOLUME_PROPERTIES END END @@ -91,42 +90,42 @@ BEGIN POPUP "" BEGIN - MENUITEM "ÏÔÊ¾Òþ²ØÍ¼±ê(&S)", ID_SHOW_HIDDEN_ICONS - MENUITEM "ÏÔÊ¾Í¼±ê°´Å¥(&B)", ID_SHOW_ICON_BUTTON - MENUITEM "ÅäÖÃÈÎÎñÀ¸Í¨ÖªÇø(&C)...", ID_CONFIG_NOTIFYAREA - MENUITEM "ÉèÖÃÈÕÆÚ/Ê±¼ä(&T)...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER + MENUITEM "æ¾ç¤ºéèå¾æ (&S)", ID_SHOW_HIDDEN_ICONS + MENUITEM "æ¾ç¤ºå¾æ æé®(&B)", ID_SHOW_ICON_BUTTON + MENUITEM "éç½®ä»»å¡æ éç¥åº(&C)...", ID_CONFIG_NOTIFYAREA + MENUITEM "è®¾ç½®æ¥æ/æ¶é´(&T)...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "å³äºæµè§å¨(&A)...", ID_ABOUT_EXPLORER END END IDM_SDIFRAME MENU PRELOAD DISCARDABLE BEGIN - POPUP "ÎÄ¼þ(&F)" - BEGIN - MENUITEM "ÔËÐÐ(&E)...", ID_EXECUTE - MENUITEM SEPARATOR - MENUITEM "ÍË³ö(&X)", ID_FILE_EXIT - END - POPUP "²é¿´(&V)" - BEGIN - MENUITEM "¹¤¾ßÀ¸(&T)", ID_VIEW_TOOL_BAR - MENUITEM "²à±ßÀ¸(&S)", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "×´Ì¬À¸(&S)", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "Ë¢ÐÂ(&R)\tF5", ID_REFRESH - MENUITEM "È«ÆÁ(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "¶àÎÄµµ½çÃæ(&M)", ID_VIEW_MDI - END - POPUP "¹¤¾ß(&T)" - BEGIN - MENUITEM "Ñ¡Ïî(&O)", ID_TOOLS_OPTIONS - END - POPUP "°ïÖú(&H)" - BEGIN - MENUITEM "ä¯ÀÀÆ÷°ïÖúÎÄµµ(&F)...", ID_EXPLORER_FAQ - MENUITEM "¹ØÓÚä¯ÀÀÆ÷(&A)...", ID_ABOUT_EXPLORER - MENUITEM "¹ØÓÚ²Ù×÷ÏµÍ³(&O)...", ID_ABOUT_WINDOWS + POPUP "æä»¶(&F)" + BEGIN + MENUITEM "è¿è¡(&E)...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "éåº(&X)", ID_FILE_EXIT + END + POPUP "æ¥ç(&V)" + BEGIN + MENUITEM "å·¥å·æ (&T)", ID_VIEW_TOOL_BAR + MENUITEM "ä¾§è¾¹æ (&S)", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "ç¶ææ (&S)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "å·æ°(&R)\tF5", ID_REFRESH + MENUITEM "å¨å±(&U)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "å¤ææ¡£çé¢(&M)", ID_VIEW_MDI + END + POPUP "å·¥å·(&T)" + BEGIN + MENUITEM "éé¡¹(&O)", ID_TOOLS_OPTIONS + END + POPUP "å¸®å©(&H)" + BEGIN + MENUITEM "æµè§å¨å¸®å©ææ¡£(&F)...", ID_EXPLORER_FAQ + MENUITEM "å³äºæµè§å¨(&A)...", ID_ABOUT_EXPLORER + MENUITEM "å³äºæä½ç³»ç»(&O)...", ID_ABOUT_WINDOWS END END @@ -138,86 +137,86 @@ IDD_EXECUTE DIALOGEX FIXED IMPURE 15, 13, 210, 63 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÔËÐÐ" +CAPTION "è¿è¡" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "ÃüÁî(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + CONTROL "å½ä»¤(&C):",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, 18,60,10 EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "·ûºÅÁ´½Ó(&S)",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + CONTROL "ç¬¦å·é¾æ¥(&S)",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, 45,71,12 - DEFPUSHBUTTON "È·¶¨(&O)",1,158,6,47,14 - PUSHBUTTON "È¡Ïû(&C)",2,158,23,47,14 - PUSHBUTTON "°ïÖú(&H)",254,158,43,47,14 + DEFPUSHBUTTON "ç¡®å®(&O)",1,158,6,47,14 + PUSHBUTTON "åæ¶(&C)",2,158,23,47,14 + PUSHBUTTON "å¸®å©(&H)",254,158,43,47,14 END IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "ÔÚ¿ªÊ¼²Ëµ¥ËÑË÷³ÌÐò" +CAPTION "å¨å¼å§èåæç´¢ç¨åº" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "¹ýÂË(&F):",IDC_STATIC,7,9,18,8 + LTEXT "è¿æ»¤(&F):",IDC_STATIC,7,9,18,8 EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,185,33 - PUSHBUTTON "Ñ¡È¡ÊäÈëÏî(&C)",IDC_CHECK_ENTRIES,143,7,50,14 + PUSHBUTTON "éåè¾å¥é¡¹(&C)",IDC_CHECK_ENTRIES,143,7,50,14 END IDD_DESKBAR_DESKTOP DIALOGEX DISCARDABLE 0, 0, 212, 172 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "×ÀÃæÊôÐÔ" +CAPTION "æ¡é¢å±æ§" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÇëÑ¡Ôñ×ÀÃæÍ¼±êÅÅÁÐ·½Ê½:", + LTEXT "è¯·éæ©æ¡é¢å¾æ æåæ¹å¼:", IDC_STATIC,7,7,166,8 - CONTROL "×óÉÏÏòÏÂ",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "å·¦ä¸åä¸",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "×óÉÏÏòÓÒ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "å·¦ä¸åå³",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "ÓÒÉÏÏò×ó",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "å³ä¸åå·¦",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "ÓÒÉÏÏòÏÂ",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "å³ä¸åä¸",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "×óÏÂÏòÉÏ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "å·¦ä¸åä¸",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "×óÏÂÏòÓÒ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "å·¦ä¸åå³",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "ÓÒÏÂÏò×ó",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "å³ä¸åå·¦",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "ÓÒÏÂÏòÉÏ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "å³ä¸åä¸",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "±ß½çÏòÏÂ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "è¾¹çåä¸",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "±ß½çºá×Ý",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "è¾¹çæ¨ªçºµ",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "×ÀÃæ»·ÈÆ",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 | WS_TABSTOP,159,121,46,44 -// CONTROL "ÏÔÊ¾°æ±¾ºÅ(&V)",ID_DESKTOP_VERSION,"Button", +// CONTROL "æ¾ç¤ºçæ¬å·(&V)",ID_DESKTOP_VERSION,"Button", // BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOGEX DISCARDABLE 0, 0, 210, 194 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "ÈÎÎñÀ¸ÊôÐÔ" +CAPTION "ä»»å¡æ å±æ§" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ÏÔÊ¾Ê±ÖÓ(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + CONTROL "æ¾ç¤ºæ¶é(&C)",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,52,10 - CONTROL "Òþ²Ø²»»î¶¯µÄÍ¨ÖªÇøÍ¼±ê(&H)", + CONTROL "éèä¸æ´»å¨çéç¥åºå¾æ (&H)", ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 - PUSHBUTTON "ÈÎÎñÀ¸Í¨ÖªÇø(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14 + PUSHBUTTON "ä»»å¡æ éç¥åº(&N)...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END IDD_DESKBAR_STARTMENU DIALOGEX DISCARDABLE 0, 0, 210, 194 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "¿ªÊ¼²Ëµ¥ÊôÐÔ" +CAPTION "å¼å§èåå±æ§" FONT 8, "MS Shell Dlg" BEGIN END @@ -226,69 +225,69 @@ STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "ÅäÖÃÍ¨ÖªÇøÍ¼±ê" +CAPTION "éç½®éç¥åºå¾æ " FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,193,31 - LTEXT "ÌáÊ¾ÎÄ×Ö(&T):",IDC_LABEL1,7,44,40,8 + LTEXT "æç¤ºæå(&T):",IDC_LABEL1,7,44,40,8 EDITTEXT IDC_NOTIFY_TOOLTIP,55,42,145,14,ES_AUTOHSCROLL - LTEXT "´°¿Ú±êÌâ(&I):",IDC_LABEL2,7,63,44,8 + LTEXT "çªå£æ é¢(&I):",IDC_LABEL2,7,63,44,8 EDITTEXT IDC_NOTIFY_TITLE,55,60,145,14,ES_AUTOHSCROLL - LTEXT "Ä£¿éÂ·¾¶(&M):",IDC_LABEL3,7,81,43,8 + LTEXT "æ¨¡åè·¯å¾(&M):",IDC_LABEL3,7,81,43,8 EDITTEXT IDC_NOTIFY_MODULE,55,78,145,14,ES_AUTOHSCROLL - GROUPBOX "ÏÔÊ¾Ä£Ê½(&D)",IDC_LABEL4,7,95,157,28 - CONTROL "ÏÔÊ¾(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + GROUPBOX "æ¾ç¤ºæ¨¡å¼(&D)",IDC_LABEL4,7,95,157,28 + CONTROL "æ¾ç¤º(&S)",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,107,33,10 - CONTROL "Òþ²Ø(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, + CONTROL "éè(&H)",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, 66,107,29,10 - CONTROL "×Ô¶¯Òþ²Ø(&U)",IDC_NOTIFY_AUTOHIDE,"Button", + CONTROL "èªå¨éè(&U)",IDC_NOTIFY_AUTOHIDE,"Button", BS_AUTORADIOBUTTON,112,107,43,10 ICON "",IDC_PICTURE,173,100,20,20 - LTEXT "×îºó¸ü¸Ä(&L):",IDC_LABEL6,7,132,43,8 + LTEXT "æåæ´æ¹(&L):",IDC_LABEL6,7,132,43,8 EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | ES_READONLY - CONTROL "ÏÔÊ¾±»Òþ²ØµÄ(&W)",ID_SHOW_HIDDEN_ICONS,"Button", + CONTROL "æ¾ç¤ºè¢«éèç(&W)",ID_SHOW_HIDDEN_ICONS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,131,56,10 - DEFPUSHBUTTON "È·¶¨(&O)",IDOK,91,129,50,14,WS_GROUP - PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,150,129,50,14 + DEFPUSHBUTTON "ç¡®å®(&O)",IDOK,91,129,50,14,WS_GROUP + PUSHBUTTON "åæ¶(&C)",IDCANCEL,150,129,50,14 END IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Ñ¡Ôñä¯ÀÀÆ÷´°¿ÚÄ£Ê½" +CAPTION "éæ©æµè§å¨çªå£æ¨¡å¼" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "ÇëÑ¡Ôñä¯ÀÀÆ÷ÓÃ»§½çÃæ:", + LTEXT "è¯·éæ©æµè§å¨ç¨æ·çé¢:", IDC_STATIC,7,7,160,8 - CONTROL "&MDI (¶àÎÄµµ½çÃæ)",IDC_MDI,"Button", + CONTROL "&MDI (å¤ææ¡£çé¢)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 - CONTROL "&SDI (µ¥ÎÄµµ½çÃæ)",IDC_SDI,"Button", + 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 "ÔÚÁíÒ»´°¿Ú´òÀ´×ÓÎÄ¼þ¼Ð(&E)", + CONTROL "å¨å¦ä¸çªå£ææ¥åæä»¶å¤¹(&E)", IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 - LTEXT "ÒÔºó×ÊÔ´¹ÜÀíÆ÷´°¿Ú½«Ê¹ÓÃÕâÐ©×÷ÎªÈ±Ê¡ÉèÖÃ", + LTEXT "ä»¥åèµæºç®¡çå¨çªå£å°ä½¿ç¨è¿äºä½ä¸ºç¼ºçè®¾ç½®", IDC_STATIC,7,111,174,22 - DEFPUSHBUTTON "È·¶¨(&O)",IDOK,29,136,50,14,WS_GROUP - PUSHBUTTON "È¡Ïû(&C)",IDCANCEL,106,136,50,14 + DEFPUSHBUTTON "ç¡®å®(&O)",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "åæ¶(&C)",IDCANCEL,106,136,50,14 END IDD_ABOUT_EXPLORER DIALOGEX DISCARDABLE 0, 0, 199, 106 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¹ØÓÚ ReactOS ä¯ÀÀÆ÷" +CAPTION "å³äº ReactOS æµè§å¨" FONT 8, "MS Shell Dlg" 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 LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, 8 - CONTROL "È·¶¨(&O)",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + CONTROL "ç¡®å®(&O)",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, 154,90,38,12 END @@ -326,61 +325,61 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_TITLE "Reactos ä¯ÀÀÆ÷" - IDS_START "¿ªÊ¼" - IDS_LOGOFF "×¢Ïú..." - IDS_SHUTDOWN "¹Ø±Õ..." - IDS_RESTART "ÖØÐÂÆô¶¯..." - IDS_LAUNCH "ÔËÐÐ..." - IDS_START_HELP "°ïÖú" - IDS_SEARCH_FILES "ËÑË÷..." - IDS_DOCUMENTS "ÎÒµÄÎÄµµ" - IDS_FAVORITES "ÊÕ²Ø¼Ð" - IDS_PROGRAMS "³ÌÐò" - IDS_SETTINGS "ÉèÖÃ" - IDS_EXPLORE "ä¯ÀÀÆ÷" - IDS_EMPTY "(¿Õ)" - IDS_RECENT "×î½üµÄÎÄµµ" - IDS_ADMIN "¹ÜÀí¹¤¾ß" + IDS_TITLE "Reactos æµè§å¨" + IDS_START "å¼å§" + IDS_LOGOFF "æ³¨é..." + IDS_SHUTDOWN "å³é..." + IDS_RESTART "éæ°å¯å¨..." + IDS_LAUNCH "è¿è¡..." + IDS_START_HELP "å¸®å©" + IDS_SEARCH_FILES "æç´¢..." + IDS_DOCUMENTS "æçææ¡£" + IDS_FAVORITES "æ¶èå¤¹" + IDS_PROGRAMS "ç¨åº" + IDS_SETTINGS "è®¾ç½®" + IDS_EXPLORE "æµè§å¨" + IDS_EMPTY "(ç©º)" + IDS_RECENT "æè¿çææ¡£" + IDS_ADMIN "ç®¡çå·¥å·" END STRINGTABLE DISCARDABLE BEGIN - IDS_STARTMENU "¿ªÊ¼²Ëµ¥" - IDS_MINIMIZE_ALL "×îÐ¡»¯ËùÓÐ´°¿Ú" - IDS_DESKTOP_NUM "×ÀÃæ %d" - IDS_VOLUME "ÒôÁ¿" - IDS_ITEMS_CUR "µ±Ç°ÏîÄ¿" - IDS_ITEMS_CONFIGURED "ÅäÖÃ" - IDS_ITEMS_VISIBLE "¿É¼û" - IDS_ITEMS_HIDDEN "Òþ²Ø" - IDS_NOTIFY_SHOW "ÏÔÊ¾" - IDS_NOTIFY_HIDE "Òþ²Ø" - IDS_NOTIFY_AUTOHIDE "×Ô¶¯Òþ²Ø" - IDS_SHOW_HIDDEN_ICONS "ÏÔÊ¾Òþ²ØµÄÍ¼±ê" - IDS_HIDE_ICONS "Òþ²ØÍ¼±ê" - IDS_TERMINATE "ÖÕÖ¹ ROS ä¯ÀÀÆ÷" + IDS_STARTMENU "å¼å§èå" + IDS_MINIMIZE_ALL "æå°åææçªå£" + IDS_DESKTOP_NUM "æ¡é¢ %d" + IDS_VOLUME "é³é" + IDS_ITEMS_CUR "å½åé¡¹ç®" + IDS_ITEMS_CONFIGURED "éç½®" + IDS_ITEMS_VISIBLE "å¯è§" + IDS_ITEMS_HIDDEN "éè" + IDS_NOTIFY_SHOW "æ¾ç¤º" + IDS_NOTIFY_HIDE "éè" + IDS_NOTIFY_AUTOHIDE "èªå¨éè" + IDS_SHOW_HIDDEN_ICONS "æ¾ç¤ºéèçå¾æ " + IDS_HIDE_ICONS "éèå¾æ " + IDS_TERMINATE "ç»æ¢ ROS æµè§å¨" END STRINGTABLE DISCARDABLE BEGIN - IDS_NETWORK "ÍøÂç" - IDS_CONNECTIONS "ÍøÂçÁ¬½Ó" - IDS_DRIVES "Çý¶¯Æ÷" - IDS_SEARCH_COMPUTER "ËÑË÷¼ÆËã»ú..." - IDS_SETTINGS_MENU "ÉèÖÃ²Ëµ¥" - IDS_CONTROL_PANEL "¿ØÖÆÃæ°å" - IDS_PRINTERS "´òÓ¡»ú" - IDS_BROWSE "ä¯ÀÀÎÄ¼þ" - IDS_SEARCH_PRG "ËÑË÷³ÌÐò..." + IDS_NETWORK "ç½ç»" + IDS_CONNECTIONS "ç½ç»è¿æ¥" + IDS_DRIVES "é©±å¨å¨" + IDS_SEARCH_COMPUTER "æç´¢è®¡ç®æº..." + IDS_SETTINGS_MENU "è®¾ç½®èå" + IDS_CONTROL_PANEL "æ§å¶é¢æ¿" + IDS_PRINTERS "æå°æº" + IDS_BROWSE "æµè§æä»¶" + IDS_SEARCH_PRG "æç´¢ç¨åº..." IDS_ALL_USERS "All Users\\" - IDS_SEARCH "ËÑË÷" - IDS_ABOUT_EXPLORER "¹ØÓÚä¯ÀÀÆ÷(&A)..." + IDS_SEARCH "æç´¢" + IDS_ABOUT_EXPLORER "å³äºæµè§å¨(&A)..." IDS_LAUNCH_MANY_PROGRAMS - "ÇëÑ¡ÔñÒ»¸öÒÔÉÏµÄÓ¦ÓÃ³ÌÐò¡£\nÈ·¶¨ÒªÔËÐÐÕâÐ©³ÌÐòÃ´£¿" - IDS_DESKTOPBAR_SETTINGS "×ÀÃæÉèÖÃ" - IDS_DESKTOP "×ÀÃæ" - IDS_TASKBAR "ÈÎÎñÀ¸" + "è¯·éæ©ä¸ä¸ªä»¥ä¸çåºç¨ç¨åºã\nç¡®å®è¦è¿è¡è¿äºç¨åºä¹ï¼" + IDS_DESKTOPBAR_SETTINGS "æ¡é¢è®¾ç½®" + IDS_DESKTOP "æ¡é¢" + IDS_TASKBAR "ä»»å¡æ " IDS_NAMECOLUMN "Name" IDS_PATHCOLUMN "Path" IDS_MENUCOLUMN "Menu path" Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Mon Mar 5 11:13:13 2012 @@ -113,11 +113,11 @@ "#include ""explorer-en.rc""\r\n" "#include ""explorer-es.rc""\r\n" "#include ""explorer-fr.rc""\r\n" - "#include ""explorer-gr.rc""\r\n" + "#include ""explorer-el.rc""\r\n" "#include ""explorer-hu.rc""\r\n" "#include ""explorer-id.rc""\r\n" "#include ""explorer-it.rc""\r\n" - "#include ""explorer-jp.rc""\r\n" + "#include ""explorer-ja.rc""\r\n" "#include ""explorer-ko.rc""\r\n" "#include ""explorer-ko.rc""\r\n" "#include ""explorer-nl.rc""\r\n" @@ -126,18 +126,12 @@ "#include ""explorer-sk.rc""\r\n" "#include ""explorer-sv.rc""\r\n" "\r\n" - "#ifdef __WINDRES__\r\n" - "#include ""explorer-cn.rc""\r\n" - "#else\r\n" - "//#include ""explorer-cn-msvc.rc""\r\n" - "#include ""explorer-bn.rc""\r\n" - "#endif\r\n" - "\r\n" "#pragma code_page(65001)" "#include ""explorer-pl.rc""\r\n" "#include ""explorer-ro.rc""\r\n" "#include ""explorer-ru.rc""\r\n" "#include ""explorer-uk.rc""\r\n" + "#include ""explorer-zh.rc""\r\n" "\0" END @@ -218,37 +212,75 @@ CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "explorer.exe.manifest" #endif -#include "explorer-bg.rc" -#include "explorer-cz.rc" -#include "explorer-de.rc" -#include "explorer-en.rc" -#include "explorer-es.rc" -#include "explorer-fr.rc" -#include "explorer-gr.rc" -#include "explorer-hu.rc" -#include "explorer-id.rc" -#include "explorer-it.rc" -#include "explorer-jp.rc" -#include "explorer-ko.rc" -#include "explorer-nl.rc" -#include "explorer-no.rc" -#include "explorer-pt.rc" -#include "explorer-sk.rc" -#include "explorer-sv.rc" - -#ifdef __WINDRES__ -#include "explorer-cn.rc" -#else -//#include "explorer-cn-msvc.rc" -#include "explorer-bn.rc" +#ifdef LANGUAGE_BG_BG + #include "explorer-bg.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "explorer-cz.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "explorer-de.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "explorer-el.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "explorer-en.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "explorer-es.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "explorer-fr.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "explorer-hu.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "explorer-id.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "explorer-it.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "explorer-ja.rc" +#endif +#ifdef LANGUAGE_KO_KR + #include "explorer-ko.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "explorer-nl.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "explorer-no.rc" +#endif +#ifdef LANGUAGE_PT_PT + #include "explorer-pt.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "explorer-sk.rc" +#endif +#ifdef LANGUAGE_SV_SE + #include "explorer-sv.rc" #endif // UTF-8 #pragma code_page(65001) -#include "explorer-pl.rc" -#include "explorer-ro.rc" -#include "explorer-ru.rc" -#include "explorer-uk.rc" +#ifdef LANGUAGE_PL_PL + #include "explorer-pl.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "explorer-ro.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "explorer-ru.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "explorer-uk.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "explorer-zh.rc" +#endif ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED

1 0

[arty] 56026: [FSRTL] Fix my lock implementation to a degree. - Have a single list associated with the CSQ. - Remove some confusion from when the lock information was a generic table. - Make the co...
by arty＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: arty Date: Mon Mar 5 09:49:06 2012 New Revision: 56026 URL: http://svn.reactos.org/svn/reactos?rev=56026&view=rev Log: [FSRTL] Fix my lock implementation to a degree. - Have a single list associated with the CSQ. - Remove some confusion from when the lock information was a generic table. - Make the compare function not be confused by attempts to give strange offsets and lengths. - Make the uninitialize function complete all lock requests as specified. - Remove my unneeded attempt to shoehorn in an eresource. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Mon Mar 5 09:49:06 2012 @@ -9,10 +9,8 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> - -#define RESOURCE_OF_LOCK(L) ((PERESOURCE)&((L)->Unknown1)) /* GLOBALS *******************************************************************/ @@ -37,6 +35,7 @@ RTL_GENERIC_TABLE RangeTable; IO_CSQ Csq; KSPIN_LOCK CsqLock; + LIST_ENTRY CsqList; PFILE_LOCK BelongsTo; } LOCK_INFORMATION, *PLOCK_INFORMATION; @@ -57,7 +56,7 @@ static PVOID NTAPI LockAllocate(PRTL_GENERIC_TABLE Table, CLONG Bytes) { PVOID Result; - Result = ExAllocatePoolWithTag(NonPagedPool, Bytes, 'FLCK'); + Result = ExAllocatePoolWithTag(NonPagedPool, Bytes, 'LTAB'); DPRINT("LockAllocate(%d) => %p\n", Bytes, Result); return Result; } @@ -65,7 +64,7 @@ static VOID NTAPI LockFree(PRTL_GENERIC_TABLE Table, PVOID Buffer) { DPRINT("LockFree(%p)\n", Buffer); - ExFreePoolWithTag(Buffer, 'FLCK'); + ExFreePoolWithTag(Buffer, 'LTAB'); } static RTL_GENERIC_COMPARE_RESULTS NTAPI LockCompare @@ -75,10 +74,10 @@ RTL_GENERIC_COMPARE_RESULTS Result; DPRINT("Starting to compare element %x to element %x\n", PtrA, PtrB); Result = - (A->Exclusive.FileLock.EndingByte.QuadPart < + (A->Exclusive.FileLock.StartingByte.QuadPart < B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericLessThan : (A->Exclusive.FileLock.StartingByte.QuadPart > - B->Exclusive.FileLock.EndingByte.QuadPart) ? GenericGreaterThan : + B->Exclusive.FileLock.StartingByte.QuadPart) ? GenericGreaterThan : GenericEqual; DPRINT("Compare(%x:%x) %x-%x to %x-%x => %d\n", A,B, @@ -97,8 +96,8 @@ PIRP Irp, PVOID InsertContext) { - PCOMBINED_LOCK_ELEMENT LockElement = InsertContext; - InsertTailList(&LockElement->Exclusive.ListEntry, &Irp->Tail.Overlay.ListEntry); + PLOCK_INFORMATION LockInfo = CONTAINING_RECORD(Csq, LOCK_INFORMATION, Csq); + InsertTailList(&LockInfo->CsqList, &Irp->Tail.Overlay.ListEntry); return STATUS_SUCCESS; } @@ -113,45 +112,51 @@ // lock that can be acquired, now that the lock matching PeekContext // has been removed. COMBINED_LOCK_ELEMENT LockElement; - PCOMBINED_LOCK_ELEMENT WhereUnlocked = PeekContext, Matching; + PCOMBINED_LOCK_ELEMENT WhereUnlock = PeekContext; PLOCK_INFORMATION LockInfo = CONTAINING_RECORD(Csq, LOCK_INFORMATION, Csq); - PFILE_LOCK FileLock = LockInfo->BelongsTo; - if (!PeekContext) - return CONTAINING_RECORD - (Irp->Tail.Overlay.ListEntry.Flink, - IRP, - Tail.Overlay.ListEntry); - else - { - PLIST_ENTRY Following; - if (!FileLock->LockInformation) - { - return CONTAINING_RECORD - (Irp->Tail.Overlay.ListEntry.Flink, - IRP, - Tail.Overlay.ListEntry); - } - for (Following = Irp->Tail.Overlay.ListEntry.Flink; - Following != &WhereUnlocked->Exclusive.ListEntry; - Following = Following->Flink) - { - PIRP Irp = CONTAINING_RECORD(Following, IRP, Tail.Overlay.ListEntry); - PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); - LockElement.Exclusive.FileLock.StartingByte = - IoStack->Parameters.LockControl.ByteOffset; - LockElement.Exclusive.FileLock.EndingByte.QuadPart = - LockElement.Exclusive.FileLock.StartingByte.QuadPart + - IoStack->Parameters.LockControl.Length->QuadPart; - Matching = RtlLookupElementGenericTable - (FileLock->LockInformation, &LockElement); - if (!Matching) - { - // This IRP is fine... - return Irp; - } - } - return NULL; - } + PLIST_ENTRY Following; + if (!Irp) + { + Irp = CONTAINING_RECORD + (LockInfo->CsqList.Flink, + IRP, + Tail.Overlay.ListEntry); + Following = &Irp->Tail.Overlay.ListEntry; + } + else + Following = Irp->Tail.Overlay.ListEntry.Flink; + + for (; + Following != &LockInfo->CsqList; + Following = Following->Flink) + { + PIRP Irp = CONTAINING_RECORD(Following, IRP, Tail.Overlay.ListEntry); + PIO_STACK_LOCATION IoStack = IoGetCurrentIrpStackLocation(Irp); + BOOLEAN Matching; + LockElement.Exclusive.FileLock.StartingByte = + IoStack->Parameters.LockControl.ByteOffset; + LockElement.Exclusive.FileLock.EndingByte.QuadPart = + LockElement.Exclusive.FileLock.StartingByte.QuadPart + + IoStack->Parameters.LockControl.Length->QuadPart; + /* If a context was specified, it's a range to check to unlock */ + if (WhereUnlock) + { + Matching = LockCompare + (&LockInfo->RangeTable, &LockElement, WhereUnlock) != GenericEqual; + } + /* Else get any completable IRP */ + else + { + Matching = !!RtlLookupElementGenericTable + (&LockInfo->RangeTable, &LockElement); + } + if (!Matching) + { + // This IRP is fine... + return Irp; + } + } + return NULL; } static VOID NTAPI @@ -258,7 +263,7 @@ /* Initialize the lock, if necessary */ if (!FileLock->LockInformation) { - LockInfo = ExAllocatePool(PagedPool, sizeof(LOCK_INFORMATION)); + LockInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(LOCK_INFORMATION), 'FLCK'); FileLock->LockInformation = LockInfo; if (!FileLock) return FALSE; @@ -273,6 +278,7 @@ NULL); KeInitializeSpinLock(&LockInfo->CsqLock); + InitializeListHead(&LockInfo->CsqList); IoCsqInitializeEx (&LockInfo->Csq, @@ -360,10 +366,6 @@ /* Assume all is cool, and lock is set */ IoStatus->Status = STATUS_SUCCESS; - // Initialize our resource ... We'll use this to mediate access to the - // irp queue. - ExInitializeResourceLite(RESOURCE_OF_LOCK(&Conflict->Exclusive)); - if (Irp) { /* Complete the request */ @@ -520,9 +522,9 @@ return STATUS_RANGE_NOT_LOCKED; // this is definitely the thing we want RtlCopyMemory(&Find, Entry, sizeof(Find)); - RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); NextMatchingLockIrp = IoCsqRemoveNextIrp(&InternalInfo->Csq, &Find); - if (NextMatchingLockIrp) + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); + while (NextMatchingLockIrp) { // Got a new lock irp... try to do the new lock operation // Note that we pick an operation that would succeed at the time @@ -583,13 +585,13 @@ IN PVOID Context OPTIONAL) { PCOMBINED_LOCK_ELEMENT Entry; - PRTL_GENERIC_TABLE InternalInfo = FileLock->LockInformation; + PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; // XXX Synchronize somehow if (!FileLock->LockInformation) return STATUS_RANGE_NOT_LOCKED; // no locks - for (Entry = RtlEnumerateGenericTable(InternalInfo, TRUE); + for (Entry = RtlEnumerateGenericTable(&InternalInfo->RangeTable, TRUE); Entry; - Entry = RtlEnumerateGenericTable(InternalInfo, FALSE)) + Entry = RtlEnumerateGenericTable(&InternalInfo->RangeTable, FALSE)) { LARGE_INTEGER Length; // We'll take the first one to be the list head, and free the others first... @@ -743,6 +745,7 @@ IN PUNLOCK_ROUTINE UnlockRoutine OPTIONAL) { /* Setup the lock */ + RtlZeroMemory(FileLock, sizeof(*FileLock)); FileLock->FastIoIsQuestionable = FALSE; FileLock->CompleteLockIrpRoutine = CompleteLockIrpRoutine; FileLock->UnlockRoutine = UnlockRoutine; @@ -758,8 +761,19 @@ { if (FileLock->LockInformation) { - ASSERT(!RtlNumberGenericTableElements(FileLock->LockInformation)); - ExFreePool(FileLock->LockInformation); + PIRP Irp; + PLOCK_INFORMATION InternalInfo = FileLock->LockInformation; + PCOMBINED_LOCK_ELEMENT Entry; + // MSDN: this completes any remaining lock IRPs + while ((Entry = RtlGetElementGenericTable(&InternalInfo->RangeTable, 0)) != NULL) + { + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); + } + while ((Irp = IoCsqRemoveNextIrp(&InternalInfo->Csq, NULL)) != NULL) + { + FsRtlProcessFileLock(FileLock, Irp, NULL); + } + ExFreePoolWithTag(InternalInfo, 'FLCK'); FileLock->LockInformation = NULL; } }

1 0

[arty] 56025: [NEWCC] Use the same method pagefile.c does to read in a page without mapping it.
by arty＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: arty Date: Mon Mar 5 04:34:06 2012 New Revision: 56025 URL: http://svn.reactos.org/svn/reactos?rev=56025&view=rev Log: [NEWCC] Use the same method pagefile.c does to read in a page without mapping it. Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/reqtools.c [iso-8859-1] Mon Mar 5 04:34:06 2012 @@ -51,6 +51,10 @@ #define DPRINTC DPRINT +VOID +NTAPI +MmBuildMdlFromPages(PMDL Mdl, PPFN_NUMBER Pages); + NTSTATUS NTAPI MiGetOnePage @@ -90,14 +94,12 @@ PPFN_NUMBER Page = &RequiredResources->Page[RequiredResources->Offset]; PLARGE_INTEGER FileOffset = &RequiredResources->FileOffset; NTSTATUS Status; - PVOID PageBuf = NULL; + PVOID PageBuf = NULL; + KEVENT Event; IO_STATUS_BLOCK IOSB; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PPFN_NUMBER Pages; - PMDL Mdl; - PVOID HyperMap; - - BoundaryAddressMultiple.QuadPart = 0; + UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; + PMDL Mdl = (PMDL)MdlBase; + KIRQL OldIrql; DPRINTC ("Pulling page %08x%08x from %wZ to %x\n", @@ -112,36 +114,36 @@ return Status; } - HyperMap = MmCreateHyperspaceMapping(*Page); - - Mdl = IoAllocateMdl(HyperMap, PAGE_SIZE, FALSE, FALSE, NULL); - if (!Mdl) { - MmReleasePageMemoryConsumer(RequiredResources->Consumer, *Page); - return STATUS_NO_MEMORY; - } - - MmInitializeMdl(Mdl, HyperMap, PAGE_SIZE); - Pages = (PPFN_NUMBER)(Mdl + 1); - Pages[0] = *Page; - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); - PageBuf = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); - MmDeleteHyperspaceMapping(HyperMap); + MmInitializeMdl(Mdl, NULL, PAGE_SIZE); + MmBuildMdlFromPages(Mdl, Page); + Mdl->MdlFlags |= MDL_PAGES_LOCKED; - Status = MiSimpleRead - (FileObject, - FileOffset, - PageBuf, - RequiredResources->Amount, - TRUE, - &IOSB); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoPageRead + (FileObject, + Mdl, + FileOffset, + &Event, + &IOSB); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IOSB.Status; + } + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { + MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); + } + + OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + PageBuf = MmCreateHyperspaceMapping(*Page); RtlZeroMemory ((PCHAR)PageBuf+RequiredResources->Amount, PAGE_SIZE-RequiredResources->Amount); + MmDeleteHyperspaceMapping(PageBuf); + KfLowerIrql(OldIrql); DPRINT("Read Status %x (Page %x)\n", Status, *Page); - - MmUnlockPages(Mdl); - IoFreeMdl(Mdl); if (!NT_SUCCESS(Status)) {

1 0

[arty] 56024: [NEWCC] Fix paging out. - We know we're in a wait entry in the section. What we really want to know is if it's safe to evict this address space when withdrawing the mappings. - We don...
by arty＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: arty Date: Mon Mar 5 02:20:22 2012 New Revision: 56024 URL: http://svn.reactos.org/svn/reactos?rev=56024&view=rev Log: [NEWCC] Fix paging out. - We know we're in a wait entry in the section. What we really want to know is if it's safe to evict this address space when withdrawing the mappings. - We don't want to corrupt our wait entry in the section page table to keep accumulating dirty state into the page out process until it's time to finally evict. Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Mon Mar 5 02:20:22 2012 @@ -184,7 +184,7 @@ (PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, PVOID Address, - BOOLEAN Dirty, + PBOOLEAN Dirty, PMM_REQUIRED_RESOURCES Required) { ULONG Entry; @@ -204,19 +204,16 @@ Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset); - if (MM_IS_WAIT_PTE(Entry)) - { + if (MmIsPageSwapEntry(Process, PAddress)) + { + SWAPENTRY SwapEntry; + MmGetPageFileMapping(Process, PAddress, &SwapEntry); MmUnlockSectionSegment(Segment); - return STATUS_SUCCESS + 1; - } - - if (Dirty) { - DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart); - MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); - } + return SwapEntry == MM_WAIT_ENTRY ? STATUS_SUCCESS + 1 : STATUS_UNSUCCESSFUL; + } MmDeleteRmap(Required->Page[0], Process, Address); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, &OurPage); + MmDeleteVirtualMapping(Process, Address, FALSE, Dirty, &OurPage); ASSERT(OurPage == Required->Page[0]); MmReleasePageMemoryConsumer(MC_CACHE, Required->Page[0]); @@ -230,7 +227,7 @@ NTAPI MmpPageOutPhysicalAddress(PFN_NUMBER Page) { - BOOLEAN ProcRef = FALSE; + BOOLEAN ProcRef = FALSE, PageDirty; PFN_NUMBER SectionPage = 0; PMM_RMAP_ENTRY entry; PMM_SECTION_SEGMENT Segment = NULL; @@ -357,8 +354,10 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); DPRINT("%x:%x, page %x %x\n", Process, Address, Page, Resources.Page[0]); + PageDirty = FALSE; Status = MmPageOutCacheSection - (AddressSpace, MemoryArea, Address, Dirty, &Resources); + (AddressSpace, MemoryArea, Address, &PageDirty, &Resources); + Dirty |= PageDirty; DPRINT("%x\n", Status); ASSERT(KeGetCurrentIrql() <= APC_LEVEL);

1 0

[arty] 56023: [NEWCC] Prevent us from recording an impossible dirty swap entry in the section page table.
by arty＠svn.reactos.org 05 Mar '12

05 Mar '12

Author: arty Date: Mon Mar 5 01:52:47 2012 New Revision: 56023 URL: http://svn.reactos.org/svn/reactos?rev=56023&view=rev Log: [NEWCC] Prevent us from recording an impossible dirty swap entry in the section page table. Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Mon Mar 5 01:52:47 2012 @@ -152,6 +152,7 @@ ULONG PageIndex, OldEntry; PCACHE_SECTION_PAGE_TABLE PageTable; ASSERT(Segment->Locked); + ASSERT(!IS_SWAP_FROM_SSE(Entry) || !IS_DIRTY_SSE(Entry)); if (Entry && !IS_SWAP_FROM_SSE(Entry)) MmGetRmapListHeadPage(PFN_FROM_SSE(Entry)); PageTable =

1 0

[cgutman] 56022: [NEWCC] - Add missing wait entry handling
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 23:45:16 2012 New Revision: 56022 URL: http://svn.reactos.org/svn/reactos?rev=56022&view=rev Log: [NEWCC] - Add missing wait entry handling Modified: trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Mar 4 23:45:16 2012 @@ -158,10 +158,22 @@ return Status; } } + else if (MM_IS_WAIT_PTE(Entry)) + { + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; + } else if (Entry) { PFN_NUMBER Page = PFN_FROM_SSE(Entry); DPRINT("Take reference to page %x #\n", Page); + + if (MiGetPfnEntry(Page) == NULL) + { + DPRINT1("Found no PFN entry for page 0x%x in page entry 0x%x (segment: 0x%p, offset: %08x%08x)\n", + Page, Entry, Segment, TotalOffset.HighPart, TotalOffset.LowPart); + KeBugCheck(CACHE_MANAGER); + } MmReferencePage(Page); Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Mar 4 23:45:16 2012 @@ -204,6 +204,12 @@ Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset); + if (MM_IS_WAIT_PTE(Entry)) + { + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; + } + if (Dirty) { DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart); MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); @@ -362,7 +368,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... the other guy has it, so we'll just fail for now - DPRINTC("Wait entry ... can't continue\n"); + DPRINT1("Wait entry ... can't continue\n"); Status = STATUS_UNSUCCESSFUL; goto bail; }

1 0

[pschweitzer] 56021: [RAMDISK] Implement RamdiskRemoveBusDevice. Stubplement RamdiskDeleteDiskDevice. Use them in RamdiskPnp.
by pschweitzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: pschweitzer Date: Sun Mar 4 23:08:33 2012 New Revision: 56021 URL: http://svn.reactos.org/svn/reactos?rev=56021&view=rev Log: [RAMDISK] Implement RamdiskRemoveBusDevice. Stubplement RamdiskDeleteDiskDevice. Use them in RamdiskPnp. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Mar 4 23:08:33 2012 @@ -1976,6 +1976,120 @@ NTSTATUS NTAPI +RamdiskDeleteDiskDevice(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskRemoveBusDevice(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PLIST_ENTRY ListHead, NextEntry; + PRAMDISK_BUS_EXTENSION DeviceExtension; + PRAMDISK_DRIVE_EXTENSION DriveExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // Acquire disks list lock + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + + // + // Loop over drives + // + ListHead = &DeviceExtension->DiskList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + DriveExtension = CONTAINING_RECORD(NextEntry, + RAMDISK_DRIVE_EXTENSION, + DiskList); + + // + // Delete the disk + // + IoAcquireRemoveLock(&DriveExtension->RemoveLock, NULL); + RamdiskDeleteDiskDevice(DriveExtension->PhysicalDeviceObject, NULL); + + // + // RamdiskDeleteDiskDevice releases list lock, so reacquire it + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + } + + // + // Release disks list lock + // + ExReleaseFastMutex(&DeviceExtension->DiskListLock); + KeLeaveCriticalRegion(); + + // + // Prepare to pass to the lower driver + // + IoSkipCurrentIrpStackLocation(Irp); + // + // Here everything went fine + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // Call lower driver + // + Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); + + // + // Update state + // + DeviceExtension->State = RamdiskStateBusRemoved; + + // + // Release the lock, and ensure that everyone + // has finished its job before we continue + // The lock has been acquired by the dispatcher + // + IoReleaseRemoveLockAndWait(&DeviceExtension->RemoveLock, Irp); + + // + // If there's a drive name + // + if (DeviceExtension->DriveDeviceName.Buffer) + { + // + // Inform it's going to be disabled + // and free the drive name + // + IoSetDeviceInterfaceState(&DeviceExtension->DriveDeviceName, FALSE); + RtlFreeUnicodeString(&DeviceExtension->DriveDeviceName); + } + + // + // Part from the stack, detach from lower device + // + IoDetachDevice(DeviceExtension->AttachedDevice); + + // + // Finally, delete device + // + RamdiskBusFdo = NULL; + IoDeleteDevice(DeviceObject); + + // + // Return status from lower driver + // + return Status; +} + +NTSTATUS +NTAPI RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2068,10 +2182,33 @@ break; case IRP_MN_REMOVE_DEVICE: - - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); - break; + + // + // Remove the proper device + // + if (DeviceExtension->Type == RamdiskBus) + { + Status = RamdiskRemoveBusDevice(DeviceObject, Irp); + + // + // Return here, lower device has already been called + // And remove lock released. This is needed by the function. + // + return Status; + } + else + { + Status = RamdiskDeleteDiskDevice(DeviceObject, Irp); + + // + // Complete the IRP here and return + // Here again we don't have to release remove lock + // This has already been done by the function. + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } case IRP_MN_SURPRISE_REMOVAL:

1 0

[cgutman] 56020: [NTOSKRNL] - Kill this straggler from last commit
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 22:45:46 2012 New Revision: 56020 URL: http://svn.reactos.org/svn/reactos?rev=56020&view=rev Log: [NTOSKRNL] - Kill this straggler from last commit Modified: trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Mar 4 22:45:46 2012 @@ -142,13 +142,6 @@ { DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); -#if (_MI_PAGING_LEVELS == 2) - if (Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Required->Page[0], Process, Address);

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