Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

by mf＠svn.reactos.com

remove resrc1.h Modified: trunk/reactos/subsys/system/explorer/explorer-ro.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-ro.rc --- trunk/reactos/subsys/system/explorer/explorer-ro.rc 2005-06-03 19:36:03 UTC (rev 15758) +++ trunk/reactos/subsys/system/explorer/explorer-ro.rc 2005-06-03 19:54:52 UTC (rev 15759) @@ -1,6 +1,6 @@ //Microsoft Developer Studio generated resource script. // -#include "resrc1.h" +#include "resource.h" #define APSTUDIO_READONLY_SYMBOLS //////////////////////////////////////////////////////////////////////// ///// @@ -203,7 +203,7 @@ 1 TEXTINCLUDE DISCARDABLE BEGIN - "resrc1.h\0" + "resource.h\0" END 2 TEXTINCLUDE DISCARDABLE

19 years, 5 months

[mf] 15758: split the big explorer resource file into smaller language specific rescource scripts

by mf＠svn.reactos.com

split the big explorer resource file into smaller language specific rescource scripts Modified: trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/dialogs/settings.cpp Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Added: trunk/reactos/subsys/system/explorer/explorer-de.rc Added: trunk/reactos/subsys/system/explorer/explorer-en.rc Added: trunk/reactos/subsys/system/explorer/explorer-es.rc Added: trunk/reactos/subsys/system/explorer/explorer-fr.rc Modified: trunk/reactos/subsys/system/explorer/explorer-jp.rc Added: trunk/reactos/subsys/system/explorer/explorer-pt.rc Added: trunk/reactos/subsys/system/explorer/explorer-ro.rc Added: trunk/reactos/subsys/system/explorer/explorer-ru.rc Added: trunk/reactos/subsys/system/explorer/explorer-sw.rc Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Deleted: trunk/reactos/subsys/system/explorer/explorer_intres.h Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Added: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/rosshell.dsp Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/webchild.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellbrowserimpl.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.h Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp Modified: trunk/reactos/subsys/system/explorer/utility/window.h _____ Modified: trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW --- trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/Make-rosshell.MinGW 2005-06-03 19:36:03 UTC (rev 15758) @@ -19,7 +19,7 @@ RCFLAGS += -D_DEBUG LFLAGS += -g else -CFLAGS += -DNDEBUG -Os -march=pentium4 +CFLAGS += -DNDEBUG -Os #-march=pentium4 RCFLAGS += -DNDEBUG LFLAGS += -s endif _____ Modified: trunk/reactos/subsys/system/explorer/Makefile.PCH --- trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/Makefile.PCH 2005-06-03 19:36:03 UTC (rev 15758) @@ -19,7 +19,7 @@ RCFLAGS += -D_DEBUG LFLAGS += -g else -CFLAGS += -DNDEBUG -Os -march=pentium4 +CFLAGS += -DNDEBUG -Os #-march=pentium4 RCFLAGS += -DNDEBUG LFLAGS += -s endif _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-06-03 19:36:03 UTC (rev 15758) @@ -28,7 +28,7 @@ #include "precomp.h" -#include "../explorer_intres.h" +#include "../resource.h" #include "../taskbar/desktopbar.h" #include "../taskbar/taskbar.h" // for PM_GET_LAST_ACTIVE _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-06-03 19:36:03 UTC (rev 15758) @@ -30,7 +30,7 @@ #include "precomp.h" -#include "../explorer_intres.h" +#include "../resource.h" #include "searchprogram.h" _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/settings.cpp --- trunk/reactos/subsys/system/explorer/dialogs/settings.cpp 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/dialogs/settings.cpp 2005-06-03 19:36:03 UTC (rev 15758) @@ -30,7 +30,7 @@ #include "precomp.h" -#include "../explorer_intres.h" +#include "../resource.h" #include "../taskbar/traynotify.h" #include "settings.h" _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-06-03 19:36:03 UTC (rev 15758) @@ -1,8 +1,24 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS //////////////////////////////////////////////////////////////////////// ///// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "resource.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// // Czech resources -// Translated by denzil <d3nzil(a)gmail.com> -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CZE) +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) #ifdef _WIN32 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT #pragma code_page(1250) @@ -13,213 +29,213 @@ // Menu // -IDM_MDIFRAME MENU PRELOAD DISCARDABLE +IDM_MDIFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&UkonÞit", ID_FILE_EXIT + MENUITEM "&UkonÞit", ID_FILE_EXIT END POPUP "&ZobrazenÝ" BEGIN - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR + MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR - MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR + MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR MENUITEM "&Status Bar", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH - MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "SDI", ID_VIEW_SDI END POPUP "&Okno" BEGIN - MENUITEM "&NovÚ Okno", ID_WINDOW_NEW - MENUITEM "&Kaskßdovat\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ - MENUITEM "U&spo°ßdat svisle\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT - MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE + MENUITEM "&NovÚ Okno", ID_WINDOW_NEW + MENUITEM "&Kaskßdovat\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ + MENUITEM "U&spo°ßdat svisle\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE END POPUP "&Nßstroje" BEGIN - MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS + MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS END POPUP "&Pomoc" BEGIN - MENUITEM "&Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O p&r¨zkumnÝku...", ID_ABOUT_EXPLORER - MENUITEM "&O OS...", ID_ABOUT_WINDOWS + MENUITEM "&Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ + MENUITEM "O p&r¨zkumnÝku...", ID_ABOUT_EXPLORER + MENUITEM "&O OS...", ID_ABOUT_WINDOWS END END -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU FIXED IMPURE BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&Otev°Ýt\tEnter", 101 - MENUITEM "&P°esunout...\tF7", 106 - MENUITEM "&KopÝrovat...\tF8", 107 - MENUITEM "&Ve schrßnce...\tF9", 118 + MENUITEM "&Otev°Ýt\tEnter", 101 + MENUITEM "&P°esunout...\tF7", 106 + MENUITEM "&KopÝrovat...\tF8", 107 + MENUITEM "&Ve schrßnce...\tF9", 118 MENUITEM "&Smazat\tDel", 108 - MENUITEM "P°&ejmenovat...", 109 + MENUITEM "P°&ejmenovat...", 109 MENUITEM "&Vlastnosti...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Ko&mprimovat...", 119 - MENUITEM "Dekomp&rimovat...", 120 + MENUITEM "Ko&mprimovat...", 119 + MENUITEM "Dekomp&rimovat...", 120 MENUITEM SEPARATOR - MENUITEM "Sp&ustit...", ID_EXECUTE - MENUITEM "&Tisknout...", 102 - MENUITEM "&Asociovat...", 103 + MENUITEM "Sp&ustit...", ID_EXECUTE + MENUITEM "&Tisknout...", 102 + MENUITEM "&Asociovat...", 103 MENUITEM SEPARATOR - MENUITEM "Vytvo°it adresß°...", ID_EXECUTE + MENUITEM "Vytvo°it adresß°...", ID_EXECUTE MENUITEM "&Hledat...", 104 - MENUITEM "&Vybrat soubory...", 116 + MENUITEM "&Vybrat soubory...", 116 MENUITEM SEPARATOR - MENUITEM "UkonÞit\tAlt+X", ID_FILE_EXIT + MENUITEM "UkonÞit\tAlt+X", ID_FILE_EXIT END POPUP "&Disk" BEGIN - MENUITEM "&KopÝrovat disk...", 201 - MENUITEM "&Jmenovka disku...", 202 + MENUITEM "&KopÝrovat disk...", 201 + MENUITEM "&Jmenovka disku...", 202 MENUITEM SEPARATOR - MENUITEM "&Formßtovat disk...", 203 + MENUITEM "&Formßtovat disk...", 203 MENUITEM SEPARATOR - MENUITEM "&Pipojit sÝØov² disk", 252 - MENUITEM "&Odpojit sÝØov² disk", 253 + MENUITEM "&Pipojit sÝØov² disk", 252 + MENUITEM "&Odpojit sÝØov² disk", 253 MENUITEM SEPARATOR - MENUITEM "&SdÝlet jako...", 254 - MENUITEM "&ZruÜit sdÝlenÝ...", 255 + MENUITEM "&SdÝlet jako...", 254 + MENUITEM "&ZruÜit sdÝlenÝ...", 255 MENUITEM SEPARATOR - MENUITEM "Z&volit disk...", 251 + MENUITEM "Z&volit disk...", 251 END POPUP "&Adresß°e" BEGIN - MENUITEM "&DalÜÝ ·rove?\t+", 301 - MENUITEM "&Rozbalit strom\t*", 302 - MENUITEM "R&ozbalit vÜe\tCtrl+*", 303 - MENUITEM "&Sbalit strom\t-", 304 + MENUITEM "&DalÜÝ ·rove?\t+", 301 + MENUITEM "&Rozbalit strom\t*", 302 + MENUITEM "R&ozbalit vÜe\tCtrl+*", 303 + MENUITEM "&Sbalit strom\t-", 304 MENUITEM SEPARATOR - MENUITEM "O&znaÞit potomky", 505 + MENUITEM "O&znaÞit potomky", 505 END POPUP "&ZobrazenÝ" BEGIN - MENUITEM "&Strom a adresß°e", 413 + MENUITEM "&Strom a adresß°e", 413 MENUITEM "&Jen strom", 411 - MENUITEM "J&en adresß°e", 412 + MENUITEM "J&en adresß°e", 412 MENUITEM SEPARATOR - MENUITEM "&Rozdýlit", 414 + MENUITEM "&Rozdýlit", 414 MENUITEM SEPARATOR - MENUITEM "&JmÚno", ID_VIEW_NAME - MENUITEM "&VÜechny detaily", ID_VIEW_ALL_ATTRIBUTES + MENUITEM "&JmÚno", ID_VIEW_NAME + MENUITEM "&VÜechny detaily", ID_VIEW_ALL_ATTRIBUTES , CHECKED - MENUITEM "?ßst&eÞnÚ detaily...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "?ßst&eÞnÚ detaily...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "T°Ýdit podle jmÚ&na", 404 - MENUITEM "T°Ýdit podle &druhu", 405 - MENUITEM "T°Ýdit podle ve&likosti", 406 - MENUITEM "T°Ýdit podle &data", 407 + MENUITEM "T°Ýdit podle jmÚ&na", 404 + MENUITEM "T°Ýdit podle &druhu", 405 + MENUITEM "T°Ýdit podle ve&likosti", 406 + MENUITEM "T°Ýdit podle &data", 407 MENUITEM SEPARATOR - MENUITEM "&T°Ýdit podle...", 409 + MENUITEM "&T°Ýdit podle...", 409 END POPUP "&NastavenÝ" BEGIN MENUITEM "&PotvtrzovßnÝ...", 65535 - MENUITEM "PÝ&smo...", 65535 - MENUITEM "&Upravit liÜtu nßstroj¨...", 65535 + MENUITEM "PÝ&smo...", 65535 + MENUITEM "&Upravit liÜtu nßstroj¨...", 65535 MENUITEM SEPARATOR - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR + MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "L&iÜta disk¨", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR MENUITEM "&Status Bar", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM SEPARATOR - MENUITEM "S&ymbol po býhu", 65535 - MENUITEM "&Ulo×it zmýny p°i ukonÞenÝ", 511 + MENUITEM "S&ymbol po býhu", 65535 + MENUITEM "&Ulo×it zmýny p°i ukonÞenÝ", 511 END POPUP "&ZabezpeÞenÝ" BEGIN - MENUITEM "&P°Ýstup...", 605 - MENUITEM "&LogovßnÝ...", 606 - MENUITEM "&VlastnÝk...", 607 + MENUITEM "&P°Ýstup...", 605 + MENUITEM "&LogovßnÝ...", 606 + MENUITEM "&VlastnÝk...", 607 END POPUP "&Okno" BEGIN - MENUITEM "&NovÚ okno", ID_WINDOW_NEW - MENUITEM "&Kaskßdovat\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ - MENUITEM "U&spo°ßdat svisle\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT - MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE - MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "&NovÚ okno", ID_WINDOW_NEW + MENUITEM "&Kaskßdovat\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "&Uspo°ßdat vodorovný", ID_WINDOW_TILE_HORZ + MENUITEM "U&spo°ßdat svisle\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Us&po°ßdat automaticky", ID_WINDOW_AUTOSORT + MENUITEM "Usp&o°ßdat symboly", ID_WINDOW_ARRANGE + MENUITEM "&Aktualizovat\tF5", ID_REFRESH END POPUP "&?" BEGIN - MENUITEM "&TÚmata nßpovýdy\tF1", ID_HELP - MENUITEM "&Hledat v nßpovýdý...\tF1", ID_HELP - MENUITEM "&Jak pou×Ývat nßpovýdu\tF1", ID_HELP_USING + MENUITEM "&TÚmata nßpovýdy\tF1", ID_HELP + MENUITEM "&Hledat v nßpovýdý...\tF1", ID_HELP + MENUITEM "&Jak pou×Ývat nßpovýdu\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Informace o Winefile...", ID_ABOUT_WINEFILE + MENUITEM "&Informace o Winefile...", ID_ABOUT_WINEFILE END END -IDM_DESKTOPBAR MENU DISCARDABLE +IDM_DESKTOPBAR MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&NastavenÝ...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&NastavenÝ...", ID_DESKTOPBAR_SETTINGS MENUITEM "&Sprßvce ·loh...", ID_TASKMGR MENUITEM SEPARATOR - MENUITEM "&O Exploreru...", ID_ABOUT_EXPLORER + MENUITEM "&O Exploreru...", ID_ABOUT_EXPLORER END END -IDM_VOLUME MENU DISCARDABLE +IDM_VOLUME MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Otev°Ýt ovlßdßnÝ hlasitosti", ID_TRAY_VOLUME - MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES + MENUITEM "&Otev°Ýt ovlßdßnÝ hlasitosti", ID_TRAY_VOLUME + MENUITEM "&Upravit vlastnosti zvuku", ID_VOLUME_PROPERTIES END END -IDM_NOTIFYAREA MENU DISCARDABLE +IDM_NOTIFYAREA MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Zobrazit skrytÚ ikony", ID_SHOW_HIDDEN_ICONS - MENUITEM "Z&obrazit ikonu tlaÞÝtka", ID_SHOW_ICON_BUTTON - MENUITEM "&Nastavit upozornýnÝ...", ID_CONFIG_NOTIFYAREA - MENUITEM "N&astavit datum a Þas...", ID_CONFIG_TIME + MENUITEM "&Zobrazit skrytÚ ikony", ID_SHOW_HIDDEN_ICONS + MENUITEM "Z&obrazit ikonu tlaÞÝtka", ID_SHOW_ICON_BUTTON + MENUITEM "&Nastavit upozornýnÝ...", ID_CONFIG_NOTIFYAREA + MENUITEM "N&astavit datum a Þas...", ID_CONFIG_TIME MENUITEM SEPARATOR - MENUITEM "&O pr¨zkunÝku...", ID_ABOUT_EXPLORER + MENUITEM "&O pr¨zkunÝku...", ID_ABOUT_EXPLORER END END -IDM_SDIFRAME MENU PRELOAD DISCARDABLE +IDM_SDIFRAME MENU PRELOAD DISCARDABLE BEGIN POPUP "&Soubor" BEGIN - MENUITEM "&UkonÞit", ID_FILE_EXIT + MENUITEM "&UkonÞit", ID_FILE_EXIT END POPUP "&ZobrazenÝ" BEGIN - MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR - MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Status liÜta", ID_VIEW_STATUSBAR + MENUITEM "&LiÜta nßstroj¨", ID_VIEW_TOOL_BAR + MENUITEM "&BoÞnÝ liÜta", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status liÜta", ID_VIEW_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Aktualizovat\tF5", ID_REFRESH - MENUITEM "Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&Aktualizovat\tF5", ID_REFRESH + MENUITEM "Celß obrazovka\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&MDI", ID_VIEW_MDI END POPUP "&Nßstroje" BEGIN - MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS + MENUITEM "&NastavenÝ", ID_TOOLS_OPTIONS END POPUP "&Pomoc" BEGIN - MENUITEM "Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ - MENUITEM "O &pr¨zkumnÝku...", ID_ABOUT_EXPLORER - MENUITEM "O &OS...", ID_ABOUT_WINDOWS + MENUITEM "Pr¨zkumnÝk &FAQ...", ID_EXPLORER_FAQ + MENUITEM "O &pr¨zkumnÝku...", ID_ABOUT_EXPLORER + MENUITEM "O &OS...", ID_ABOUT_WINDOWS END END @@ -246,7 +262,7 @@ END IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "Hledat program v nabÝdce Start" @@ -254,8 +270,8 @@ 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 | + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 PUSHBUTTON "&Vyhledat",IDC_CHECK_ENTRIES,143,7,50,14 END @@ -265,31 +281,31 @@ CAPTION "Vlastnosti plochy" FONT 8, "MS Sans Serif" BEGIN - LTEXT "ProsÝm zvolte si zp¨sob zarovnßnÝ ikon:", - IDC_STATIC,7,7,166,8 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + LTEXT "ProsÝm zvolte si zp¨sob zarovnßnÝ ikon:",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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + 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 | + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 CONTROL "Zobrazit verzi",ID_DESKTOP_VERSION,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 @@ -300,11 +316,10 @@ CAPTION "Vlastnosti panelu ·loh" FONT 8, "MS Sans Serif" BEGIN - CONTROL "&Zobrazit Þas",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + CONTROL "&Zobrazit Þas",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,52,10 - CONTROL "&Skr²t neaktivnÝ ikony", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,111,10 + CONTROL "&Skr²t neaktivnÝ ikony",ID_HIDE_INACTIVE_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 PUSHBUTTON "&UpozornýnÝ...",ID_CONFIG_NOTIFYAREA,153,173,50,14 END @@ -316,13 +331,13 @@ END IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW CAPTION "NastavenÝ ikon v oblasti upozor?ovßnÝ" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + 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 @@ -331,7 +346,7 @@ 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 | + 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 @@ -339,7 +354,7 @@ 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 | + 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 @@ -368,74 +383,14 @@ //////////////////////////////////////////////////////////////////////// ///// // -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_SEARCH_PROGRAM, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 193 - TOPMARGIN, 7 - BOTTOMMARGIN, 58 - END - - IDD_DESKBAR_DESKTOP, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 205 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_TASKBAR, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_DESKBAR_STARTMENU, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 203 - TOPMARGIN, 7 - BOTTOMMARGIN, 187 - END - - IDD_NOTIFYAREA, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 201 - TOPMARGIN, 7 - BOTTOMMARGIN, 167 - END - - IDD_MDI_SDI, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 181 - TOPMARGIN, 7 - BOTTOMMARGIN, 119 - END -END -#endif // APSTUDIO_INVOKED - - -/////////////////////////////////////////////////////////////////////// ////// -// // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN IDS_TITLE "Reactos pr¨zkumnÝk" IDS_START "Start" IDS_LOGOFF "Odhlßsit se..." - IDS_TERMINATE "UkonÞit ReactOS pr¨zkumnÝk" IDS_SHUTDOWN "Vypnout..." IDS_LAUNCH "Spustit..." IDS_START_HELP "Pomoc" @@ -450,8 +405,26 @@ IDS_ADMIN "Administrace" END -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE BEGIN + IDS_STARTMENU "NabÝdka Start" + IDS_MINIMIZE_ALL "minimalizovat vÜechna okna" + IDS_DESKTOP_NUM "Plocha %d" + IDS_VOLUME "Hlasitost" + IDS_ITEMS_CUR "souÞasnÚ polo×ky" + IDS_ITEMS_CONFIGURED "nastavenÝ" + IDS_ITEMS_VISIBLE "viditelnÚ" + IDS_ITEMS_HIDDEN "skrytÚ" + IDS_NOTIFY_SHOW "zobrazit" + IDS_NOTIFY_HIDE "skr²t" + IDS_NOTIFY_AUTOHIDE "skr²vat automaticky" + IDS_SHOW_HIDDEN_ICONS "Zobrazit skrytÚ ikony" + IDS_HIDE_ICONS "Skr²t ikony" + IDS_TERMINATE "UkonÞit ReactOS pr¨zkumnÝk" +END + +STRINGTABLE DISCARDABLE +BEGIN IDS_NETWORK "SÝì" IDS_CONNECTIONS "SÝØovÚ spojenÝ" IDS_DRIVES "Disky" @@ -464,30 +437,66 @@ IDS_ALL_USERS "VÜichni u×ivatelÚ\\" IDS_SEARCH "Hledat" IDS_ABOUT_EXPLORER "&O pr¨zkumnÝku..." - IDS_LAUNCH_MANY_PROGRAMS + IDS_LAUNCH_MANY_PROGRAMS "Spustili jste vÝce ne× jeden program.\nJste si jisti, ×e je chcete spustit vÜechny?" IDS_DESKTOPBAR_SETTINGS "NastavenÝ plochy" IDS_DESKTOP "Plocha" IDS_TASKBAR "Panel ·loh" END -STRINGTABLE DISCARDABLE +#endif // Czech resources +/////////////////////////////////////////////////////////////////////// ////// + + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE BEGIN - IDS_STARTMENU "NabÝdka Start" - IDS_MINIMIZE_ALL "minimalizovat vÜechna okna" - IDS_DESKTOP_NUM "Plocha %d" - IDS_VOLUME "Hlasitost" - IDS_ITEMS_CUR "souÞasnÚ polo×ky" - IDS_ITEMS_CONFIGURED "nastavenÝ" - IDS_ITEMS_VISIBLE "viditelnÚ" - IDS_ITEMS_HIDDEN "skrytÚ" - IDS_NOTIFY_SHOW "zobrazit" - IDS_NOTIFY_HIDE "skr²t" - IDS_NOTIFY_AUTOHIDE "skr²vat automaticky" - IDS_SHOW_HIDDEN_ICONS "Zobrazit skrytÚ ikony" - IDS_HIDE_ICONS "Skr²t ikony" + "resource.h\0" END -#endif // Czech resources +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""resource.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // German (Germany) resources //////////////////////////////////////////////////////////////////////// ///// + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Added: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-06-03 19:11:10 UTC (rev 15757) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-06-03 19:36:03 UTC (rev 15758) @@ -0,0 +1,352 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "resource.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// German (Germany) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) +#ifdef _WIN32 +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_WINEFILE MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "Í&ffnen\tEingabetaste", 101 + MENUITEM "&Verschieben...\tF7", 106 + MENUITEM "&Kopieren...\tF8", 107 + MENUITEM "&In Zwischenablage...\tF9", 118 + MENUITEM "&L÷schen\tEntf", 108 + MENUITEM "&Umbenennen...", 109 + MENUITEM "&Eigenschaften...\tAlt+Eingabetaste", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "K&omprimieren...", 119 + MENUITEM "Deko&mprimieren...", 120 + MENUITEM SEPARATOR + MENUITEM "&Ausf³hren...", ID_EXECUTE + MENUITEM "&Drucken...", 102 + MENUITEM "Zuord&nen...", 103 + MENUITEM SEPARATOR + MENUITEM "Ver&zeichnis erstellen...", ID_EXECUTE + MENUITEM "&Suchen...", 104 + MENUITEM "Dateien aus&wõhlen...", 116 + MENUITEM SEPARATOR + MENUITEM "&Beenden\tAlt+X", ID_FILE_EXIT + END + POPUP "Da&tentrõger" + BEGIN + MENUITEM "Datentrõger &kopieren...", 201 + MENUITEM "Datentrõger &benennen...", 202 + MENUITEM SEPARATOR + MENUITEM "Datentrõger &formatieren...", 203 + MENUITEM SEPARATOR + MENUITEM "Netzwerklaufwerk &verbinden...", 252 + MENUITEM "Netzwerklaufwerk &trennen...", 253 + MENUITEM SEPARATOR + MENUITEM "F&reigeben als...", 254 + MENUITEM "Freigabe been&den...", 255 + MENUITEM SEPARATOR + MENUITEM "Laufwerk aus&wõhlen...", 251 + END + POPUP "&Verzeichnisse" + BEGIN + MENUITEM "&Nõchste Ebene einblenden\t+", 301 + MENUITEM "&Zweig einblenden\t*", 302 + MENUITEM "Alle &Ebenen einblenden\tStrg+*", 303 + MENUITEM "Zweig &ausblenden\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Verzweigungen kennzeichnen", 505 + END + POPUP "&Ansicht" + BEGIN + MENUITEM "Struktur &und Verzeichnis", 413 + MENUITEM "Nur St&ruktur", 411 + MENUITEM "Nur &Verzeichnis", 412 + MENUITEM SEPARATOR + MENUITEM "&Teilen", 414 + MENUITEM SEPARATOR + MENUITEM "&Name", ID_VIEW_NAME + MENUITEM "A&lle Dateiangaben", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "&Bestimmte Dateiangaben...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "Nach N&ame", 404 + MENUITEM "Nach T&yp", 405 + MENUITEM "Nach &Gr÷?e", 406 + MENUITEM "Nach &Datum", 407 + MENUITEM SEPARATOR + MENUITEM "Angaben ausw&õhlen...", 409 + END + POPUP "&Optionen" + BEGIN + MENUITEM "&Bestõtigen...", 65535 + MENUITEM "Schrift&art...", 65535 + MENUITEM "Symbolleiste &definieren...", 65535 + MENUITEM SEPARATOR + MENUITEM "Sy&mbolleiste", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Statusleiste", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Vollb&ild\tStrg+Umschalt+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&Symbol nach Programmstart", 65535 + MENUITEM "&Einstellungen beim Beenden speichern", 511 + END + POPUP "&Sicherheit" + BEGIN + MENUITEM "&Berechtigungen...", 605 + MENUITEM "?ber&wachen...", 606 + MENUITEM "Besi&tzer...", 607 + END + POPUP "&Fenster" + BEGIN + MENUITEM "Neues &Fenster", ID_WINDOW_NEW + MENUITEM "?ber&lappend\tUmschalt+F5", ID_WINDOW_CASCADE + MENUITEM "&Untereinander", ID_WINDOW_TILE_HORZ + MENUITEM "&Nebeneinander\tUmschalt+F4", ID_WINDOW_TILE_VERT + MENUITEM "au&tomatisch anordnen", ID_WINDOW_AUTOSORT + MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Hilfethemen\tF1", ID_HELP + MENUITEM "&Suchen...\tF1", ID_HELP + MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&Info about ReactOS Explorer...", ID_ABOUT_WINEFILE + END +END + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", ID_FILE_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "Lauf&werkleiste", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Fenster" + BEGIN + MENUITEM "Neues &Fenster", ID_WINDOW_NEW + MENUITEM "?ber&lappend\tUmschalt+F5", ID_WINDOW_CASCADE + MENUITEM "&Untereinander", ID_WINDOW_TILE_HORZ + MENUITEM "&Nebeneinander\tUmschalt+F4", ID_WINDOW_TILE_VERT + MENUITEM "au&tomatisch anordnen", ID_WINDOW_AUTOSORT + MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE + END + POPUP "&Extras" + BEGIN + MENUITEM "&Optionen", ID_TOOLS_OPTIONS + END + POPUP "&Hilfe" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&?ber ReactOS Explorer...", ID_ABOUT_EXPLORER + MENUITEM "?ber React&OS...", ID_ABOUT_WINDOWS + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Beenden", ID_FILE_EXIT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren\tF5", ID_REFRESH + MENUITEM "&Vollbild\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Extras" + BEGIN + MENUITEM "&Optionen", ID_TOOLS_OPTIONS + END + POPUP "&Hilfe" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ausf³hren" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "Befehls&zeile:",-1,"Static",SS_LEFTNOWORDWRAP | + WS_GROUP,3,18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Als &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 3,45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "A&bbrechen",2,158,23,47,14 + PUSHBUTTON "&Hilfe",254,158,43,47,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Explorer" +FONT 10, "MS Sans Serif" +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 DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""resource.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Explorer" [truncated at 1000 lines; 6538 more skipped]

19 years, 5 months

[greatlrd] 15757: sorry foregt test one optimze

by greatlrd＠svn.reactos.com

sorry foregt test one optimze remove it until futer Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 18:57:53 UTC (rev 15756) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 19:11:10 UTC (rev 15757) @@ -464,26 +464,7 @@ } break; - case ROP4_DSTINVERT: - // return(~Dest); - { - /* calc dest start position */ - PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; - PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; - LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; - - for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) - { - for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, Destaddr++) - { - *Destaddr = ~(*Destaddr); - } - Destaddr+=DestxlDelta; - } - return TRUE; - } - break; - + case ROP4_NOTSRCERASE: // return(~(Dest | Source)); switch (BltInfo->SourceSurface->iBitmapFormat)

19 years, 5 months

[greatlrd] 15756: optimze for bitblt dib32bpp.c

by greatlrd＠svn.reactos.com

optimze for bitblt dib32bpp.c NOTSRCERASE, DSTINVERT you can gain more speed from these Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 18:33:15 UTC (rev 15755) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 18:57:53 UTC (rev 15756) @@ -387,30 +387,36 @@ case BMF_16BPP: case BMF_24BPP: { - PBYTE byteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; - PDWORD addr = (PDWORD)byteaddr + BltInfo->DestRect.left; - LONG xlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + /* calc dest start position */ + PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; + PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; + LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + /* calc src start position */ + SourceY = BltInfo->SourcePoint.y; for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) { - if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; + if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; - SourceX = BltInfo->SourcePoint.x; + SourceX = BltInfo->SourcePoint.x; - for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, addr++) - { + for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, Destaddr++) + { if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; - *addr = DIB_GetSource(BltInfo->SourceSurface, SourceX, + *Destaddr = DIB_GetSource(BltInfo->SourceSurface, SourceX, SourceY, BltInfo->XlateSourceToDest); - } + } + Destaddr+=DestxlDelta; } - addr+=xlDelta; + return TRUE; + break; } - break; + + case BMF_32BPP: { INT Destdelta; @@ -449,16 +455,78 @@ } while (--DesmaxY); } - return TRUE; - break; + return TRUE; + break; } - + + default: + break; + } + break; + case ROP4_DSTINVERT: + // return(~Dest); + { + /* calc dest start position */ + PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; + PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; + LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + + for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) + { + for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, Destaddr++) + { + *Destaddr = ~(*Destaddr); + } + Destaddr+=DestxlDelta; + } + return TRUE; + } + break; + + case ROP4_NOTSRCERASE: + // return(~(Dest | Source)); + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + { + /* calc dest start position */ + PBYTE Destbyteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; + PDWORD Destaddr = (PDWORD)Destbyteaddr + BltInfo->DestRect.left; + LONG DestxlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + + SourceY = BltInfo->SourcePoint.y; + + for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) + { + + if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; + + SourceX = BltInfo->SourcePoint.x; + + for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, Destaddr++) + { + if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; + + *Destaddr = ~(*Destaddr | DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest)); + } + Destaddr+=DestxlDelta; + } + return TRUE; + break; + default: break; } - break; + } + break; + default: break; }

19 years, 5 months

[frik85] 15755: update resource file (convert linux file to windows linebreak-compatible)

by frik85＠svn.reactos.com

update resource file (convert linux file to windows linebreak-compatible) Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc _____ Modified: trunk/reactos/lib/cpl/appwiz/Cz.rc --- trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-06-03 18:23:18 UTC (rev 15754) +++ trunk/reactos/lib/cpl/appwiz/Cz.rc 2005-06-03 18:33:15 UTC (rev 15755) @@ -1,50 +1,50 @@ -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Instalace/OdstranýnÝ" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 - LTEXT "Pro nainstalovßnÝ novÚ aplikace, klepnýte na Instalovat...",-1,36,18,PROPSHEETWIDTH-48,8 - PUSHBUTTON "&Instalovat...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 - LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN - - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 - LTEXT "NßsledujÝcÝ aplikace mohou b²t automaticky odstranýny. K odstranýnÝ aplikace nebo k nastavenÝ jejÝch komponent, ji vyberte ze seznamu a klepnýte na tlaÞÝtko P°idat/Odebrat.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "P°idat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 -END - -IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "NastavenÝ systÚmu ReactOS" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -END - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Vytvo°it odkaz..." -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Text1", -1, 115, 15, 160, 24 - LTEXT "Text2", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Create link" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Text1",-1,10,0,225,40 - LTEXT "Text2",-1,10,40,120,20 - LTEXT "Text3",-1,10,55,120,20 -END - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "P°idat/Odebrat aplikace" - IDS_CPLSYSTEMDESCRIPTION "NastavÝ aplikace a vytvo°Ý ikony." -END +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalace/OdstranýnÝ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Pro nainstalovßnÝ novÚ aplikace, klepnýte na Instalovat...",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Instalovat...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "NßsledujÝcÝ aplikace mohou b²t automaticky odstranýny. K odstranýnÝ aplikace nebo k nastavenÝ jejÝch komponent, ji vyberte ze seznamu a klepnýte na tlaÞÝtko P°idat/Odebrat.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "P°idat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "NastavenÝ systÚmu ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Vytvo°it odkaz..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Create link" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "P°idat/Odebrat aplikace" + IDS_CPLSYSTEMDESCRIPTION "NastavÝ aplikace a vytvo°Ý ikony." +END

19 years, 5 months

[frik85] 15754: Add german language resource file

by frik85＠svn.reactos.com

Add german language resource file Added: trunk/reactos/subsys/system/regsvr32/De.rc Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc _____ Added: trunk/reactos/subsys/system/regsvr32/De.rc --- trunk/reactos/subsys/system/regsvr32/De.rc 2005-06-03 18:21:50 UTC (rev 15753) +++ trunk/reactos/subsys/system/regsvr32/De.rc 2005-06-03 18:23:18 UTC (rev 15754) @@ -0,0 +1,33 @@ +#include "resource.h" +/* + * German language file by Klemens Friedl 2005-06-03 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +IDS_UsageMessage, "%s\n\nSyntax: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Sererregistrierung aufheben\n\ +/s - Hintergrundmodus; Medlungen werden nicht angezeigt\n\ +/c - Konsolen ausgabe\n\ +/i - Aufruf von DLLInstall, wobei optional eine [Befehlszeile] ³bergeben\n\ + werden kann. Unter Verwendung von /u wird die DLL_Deinstallation\n\ + aufgerufen.\n\ +/n - Kein Aufruf von DLLRegisterServer. Diese Option muss mit /i verwendet werden." + +IDS_NoDllSpecified, "Es wurde kein DLL-Name angegeben." + +IDS_InvalidFlag, "Ung³ltiger Parameter: %s" + +IDS_SwitchN_NoI, "Ung³ltiger Parameter: /n muss zusammen mit dem /i Schalter verwendet werden." + +IDS_DllNotLoaded, "LoadLibrary('%s') ist fehlgeschlagen.\nGetLastError R³ckgabewert 0x%08x." + +IDS_MissingEntry, "%s wurde geladen, aber der %s Einstiegspunkt wurde nicht gefunden.\n\n\ +%s wurde m÷glicherweise nicht exportiert, oder eine fehlerhafte Version von %s befindet sich im Speicher. Erwõgen Sie die Verwendung von PView um es festzustellen und zu l÷schen." + +IDS_FailureMessage, "%s in %s ist fehlgeschlagen.\nR³ckgabewert: 0x%08x" + +IDS_SuccessMessage "%s in %s war erfolgreich." +} _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.rc --- trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-06-03 18:21:50 UTC (rev 15753) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.rc 2005-06-03 18:23:18 UTC (rev 15754) @@ -7,3 +7,4 @@ #include <reactos/version.rc> #include "En.rc" +#include "De.rc"

19 years, 5 months

[frik85] 15753: Add german language resource to the ReactOS Command Processor

by frik85＠svn.reactos.com

Add german language resource to the ReactOS Command Processor (not completely finished, I will update it as soon as possible) Added: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/cmd.rc _____ Added: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-06-03 17:28:53 UTC (rev 15752) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-06-03 18:21:50 UTC (rev 15753) @@ -0,0 +1,581 @@ +#include "resource.h" +/* + * German language file by Klemens Friedl 2005-06-03 + * Note: translation process is not finished; + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_ATTRIB_HELP, "Zeigt Dateiattribute an oder aendert sie.\n\n\ +ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ + [/S [/D]]\n\n\ + + Setzt ein Attribut\n\ + - Loescht ein Attribut\n\ + R Attribut fuer 'schreibgeschuetzte Datei'\n\ + A Attribut fuer 'zu archivierende Datei'\n\ + S Attribut fuer 'Systemdatei'\n\ + H Attribut fuer 'versteckte Datei'\n\ + /S Verarbeitet uebereinstimmende Dateien im aktuellen Ordner\n\ + und in allen Unterordnern.\n\ + /D Verarbeitet auch die Ordner.\n\n\ +Tippen Sie ATTRIB ohne Parameter ein um die derzeit gesetzten Attribute (aller Dateien) anzuzeigen." + +STRING_ALIAS_HELP, "Setzt, loescht oder zeigt alias.\n\n\ +ALIAS [alias=[command]]\n\n\ + alias Name des alias.\n\ + command Text welcher fuer das alias zugeordnet wird.\n\n\ +Listet alle aliases auf:\n\ + ALIAS\n\n\ +Setzt ein neues oder ueberschreibt ein bestehendes alias:\n\ + ALIAS da=dir a:\n\n\ +Loescht ein alias von der alias-Liste:\n\ + ALIAS da=" + +STRING_BEEP_HELP, "Gibt einen beep-Ton durch den PC-Speaker aus.\n\nBEEP" + +STRING_CALL_HELP, "Ruft eine Batchdatei von einer anderen aus auf.\n\n\ +CALL [Laufwerk:][Pfad]Dateiname [Batch-Parameter]\n\n\ + Parameter Bezeichnet beliebige Angaben in der Befehlszeile, die von\n\ + dem aufgerufenen Batchprogramm benoetigt werden." + + +STRING_CD_HELP, "Wechselt das Verzeichnis oder zeigt dessen Namen an.\n\n\ +CHDIR [Laufwerk:][Pfad]\n\ +CHDIR[..|.]\n\ +CD [Laufwerk:][Pfad]\n\ +CD[..|.]\n\n\ + .. uebergeordnete Verzeichnis\n\ + . vorhergehende Verzeichnis\n\n\ +Geben Sie CD Laufwerk: ein, um das aktuelle Verzeichnis auf dem angegebenen\n\ +Laufwerk anzuzeigen.\n\ +Mit CD ohne Parameter wird das aktuelle Laufwerk und Verzeichnis angezeigt." + + +STRING_CHCP_HELP, "Zeigt die aktuelle Codepage oder wechselt sie.\n\n\ +CHCP [nnn]\n\n\ + nnn Codepage angeben.\n\n\ +Der Befehl CHCP ohne Parameter zeigt die Nummer der aktuellen Codepage an." + + +STRING_CHOICE_HELP, "Wartet auf den Benutzer, welcher aus einer Auswahl eine Option waehlen muss.\n\n\ +CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ + /C[:]choices Die erlaubten Tasten festlegen. Standard-Tasten sind Y und N.\n\ + /N Zeigt choices und ? am ende des Promt-Strings NICHT an.\n\ + /S Gross- und Kleinschreibung wird beachtet.\n\ + /T[:]c,nn Standard-Auswahl wird auf c gesetzt nach nn Secunden.\n\ + text Zeigt eine Beschreibung an.\n\n\ +ERRORLEVEL wird auf den offset der Taste welche der Benutzer gedrueckt hat gesetzt." + +STRING_CLS_HELP, "Loescht den Bildschirminhalt.\n\nCLS" + +STRING_CMD_HELP1, "\nIntere Befehle verfuegbar:\n" + +STRING_CMD_HELP2, "\nVerfuegbare Features:" + +STRING_CMD_HELP3," [aliases]" + +STRING_CMD_HELP4," [history]" + +STRING_CMD_HELP5," [unix filename completion]" + +STRING_CMD_HELP6," [directory stack]" + +STRING_CMD_HELP7," [redirections and piping]" + +STRING_CMD_HELP8, "Startet eine neue Instanz des ReactOS-Befehlsinterpreters.\n\n\ +CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ + /C command Fuehrt den Befehl in der Zeichenfolge aus und schliesst sich.\n\ + /K command Fuehrt den Befehl in der Zeichenfolge aus und laeuft weiter.\n\ + /P CMD wird permanent und fuehrt autoexec.bat aus\n\ + (kann nicht beendet werden).\n\ + /T:bf Setzt die Hintergrund-/Vordergrund-Farbe (siehe COLOR Befehl)." + + +STRING_COLOR_HELP1, "Legt die standard Hinter- und Vordergrundfarben fuer die Konsole fest.\n\n\ +COLOR [attr [/F]] \n\n\ + attr Gibt die Farbattribute fuer die Konsolenausgabe an.\n\ + /F fuellte die Konsoleausgabe mit dem Farbattribut\n\n\ +Es gibt 3 Moeglickeiten die Farbe festzulegen:\n\ +1) [bright] name on [bright] name (only the first three letters are required)\n\ +2) decimal on decimal\n\ +3) two hex digits\n\n\ +Farben:\n\ +dec hex name dec hex name\n\ +0 0 Black 8 8 Gray(Bright black)\n\ +1 1 Blue 9 9 Bright Blue\n\ +2 2 Green 10 A Bright Green\n\ +3 3 Cyan 11 B Bright Cyan\n\ +4 4 Red 12 C Bright Red\n\ +5 5 Magenta 13 D Bright Magenta\n\ +6 6 Yellow 14 E Bright Yellow\n\ +7 7 White 15 F Bright White" + +STRING_COPY_HELP1, " %s ueberschreiben (Yes/No/All)? " + +STRING_COPY_HELP2, "Kopiert eine oder mehrere Dateien an eine andere Position.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] Quelle [/A|/B]\n\ + [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ + source SBezeichnet die zu kopierende(n) Datei(en).\n\ + /A Weist auf eine ASCII-Textdatei hin.\n\ + /B Weist auf eine Binaerdatei hin.\n\ + destination Bezeichnet das Verzeichnis und/oder Dateinamen der neuen Datei(en).\n\ + /V Ueberprueft, ob die Dateien richtig geschrieben wurden.\n\ + /Y Unterdrueckt die Bestaetigungsaufforderung beim Ueberschreiben\n\ + vorhandener Zieldateien.\n\ + /-Y Fordert beim Ueberschreiben vorhandener Zieldateien zum\n\ + Bestaetigen auf.\n\n\ +Die Option /Y ist moeglicherweise in der Umgebungsvariablen COPYCMD.\n\ +..." + + +STRING_DATE_HELP1, "\nGeben Sie das neue Datum ein (mm%cdd%cyyyy): " + +STRING_DATE_HELP2, "\nGeben Sie das neue Datum ein (dd%cmm%cyyyy): " + +STRING_DATE_HELP3, "\nGeben Sie das neue Datum ein (yyyy%cmm%cdd): " + +STRING_DATE_HELP4, "Aendert das eingestellte Datum oder zeigt es an.\n\n\ +DATE [/T][date]\n\n\ + /T nur Datum anzeigen\n\n\ +Der Befehl DATE ohne Parameter zeigt das aktuelle Datum an und fragt nach\n\ +einem neuen. Druecken Sie die EINGABETASTE, um das bisherige Datum zu behalten." + +STRING_DEL_HELP1, "Loescht eine oder mehrere Dateien.\n\n\ +DEL [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ +DELETE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\ +ERASE [/N /P /T /Q /W /Y /Z] Dateinamen ...\n\n\ + file Geben Sie die Dateinamen an welche Sie loeschen moechten\n\n\ + /N Nothing.\n\ + /P Fordert Sie vor dem Loeschen jeder Datei zur Bestaetigung auf.\n\ + /T Zeigt die Anzahl der geloeschten Dateien und deren vorher belegter Speicherplatzbedarf an.\n\ + /Q Quiet.\n\ + /W Sicheres Loeschen. Dateien werden mit Zufallszahlen ueberschrieben bevor sie geloescht werden.\n\ + /Y Loescht alles (*.*) ohne Vorwarnung.\n\ + /Z Loescht versteckte, mit nur leserechten und Systemdateien.\n" + +STRING_DEL_HELP2, "Alle Dateien in diesem Verzeichnis werden geloescht!\nSind Sie sicher (Y/N)?" +STRING_DEL_HELP3, " %lu Datei(en) geloescht\n" +STRING_DEL_HELP4, " %lu Datei(en) geloescht\n" + +STRING_DELAY_HELP, "Pause fuer n Sekunden oder Millisekunden\n\ +DELAY [/m]n\n\n\ + /m Millisekunden ansonsten Sekunden\n" + +STRING_DIR_HELP1, "Listet die Dateien und Unterverzeichnisse eines Verzeichnisses auf.\n\n\ +DIR [Laufwerk:][Pfad][Dateiname] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ + [Laufwerk:][path][Dateiname]\n\ + Bezeichnet Laufwerk, Verzeichnis und/oder Dateien.\n\n\ + /A Listet Dateien mit angegebenen Attributen auf.\n\ + attributes D Verzeichnisse R Schreibgeschuetzte Dateien\n\ + H Versteckte Dateien A Zu archivierende Dateien\n\ + S Systemdateien - vorangestellt kehrt die Bedeutung um\n\ + /B Einfaches Format (keine Kopfdaten, keine Zusammenfassung).\n\ + /C Zeigt das Tausendertrennzeichen bei Dateigroessen an (Standard-\n\ + einstellung). Verwenden Sie /-C, um das Tausendertrennzeichen\n\ + nicht anzuzeigen.\n\ + /D Gleich wie Breitformat, jedoch nach Spalten sortiert.\n\ + /L Verwendet Kleinschreibung.\n\ + /N Neues, langes Listenformat (Dateinamen auf der rechten Seite).\n\ + /O Gibt die Liste sortiert aus.\n\ + sortorder N Name (alphabetisch) S Groesse (kleinere zuerst)\n\ + E Erweiterung (alphabetisch) D Datum/Zeit (aeltere zuerst)\n\ + G Verzeichnisse zuerst - vorangestellt kehrt die\n\ + /P Pausiert nach jeder vollen Bildschirmseite.\n\ + /Q Gibt den Besitzer der Datei aus.\n\ + /S Listet Dateien und alle Unterverzeichnisse auf.\n\ + /T Bestimmt welche Zeit verwendet wird.\n\ + timefield C Erstellung\n\ + A Letzter Zugriff\n\ + W Letzter Schreibzugriff\n\ + /W Verwendet Breitformat fuer die Auflistung.\n\ + /X Zeigt die Kurznamen fuer Dateien mit Nicht-8Punkt3-Namen an.\n\ + Das Format ist das gleiche wie bei /N, wobei der Kurzname vor\n\ + dem Langnamen eingefuegt wird. Wenn kein Kurzname vorhanden ist,\n\ + werden Leerzeichen angezeigt.\n\ + /4 Zeigt das Jahr vierstellig an.\n\n\ +Optionen koennen in der Umgebungsvariablen DIRCMD voreingestellt werden.\n\ +""-"" vor einer Option setzt die Voreinstellung ausser Kraft, z.B. DIR /-W." + + + +STRING_DIR_HELP2, " Volume in Laufwerk %c heisst %s" +STRING_DIR_HELP3, " Volume in Laufwerk %c hat keinen Namen" +STRING_DIR_HELP4, " Volume Serial Number ist %04X-%04X\n" +STRING_DIR_HELP5, "\n Gelistete Dateien:\n%16i Datei(en)% 14s bytes\n" +STRING_DIR_HELP6, "%16i VErzeichnis(se)% 15s bytes\n" +STRING_DIR_HELP7, "\n Verzeichnisse %s\n\n" +STRING_DIR_HELP8, "%16i Datei(en)% 14s bytes\n" + +STRING_DIRSTACK_HELP1, "Stores the current directory for use by the POPD command, then\n\ +changes to the specified directory.\n\n\ +PUSHD [path | ..]\n\n\ + path Specifies the directory to make the current directory" + +STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD command.\n\nPOPD" + +STRING_DIRSTACK_HELP3, "Prints the contents of the directory stack.\n\nDIRS" + +STRING_DIRSTACK_HELP4, "Directory stack empty" + +STRING_ECHO_HELP1, "Display a messages without trailing carridge return and line feed.\n\n\ + ECHOS message" + +STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n\ + ECHOERR message\n\ + ECHOERR. prints an empty line" + +STRING_ECHO_HELP3, "Prints a messages to standard error output without trailing carridge return and line feed.\n\n\ + ECHOSERR message" + +STRING_ECHO_HELP4, "Displays a message or switches command echoing on or off.\n\n\ + ECHO [ON | OFF]\n\ + ECHO [message]\n\ + ECHO. prints an empty line\n\n\ +Type ECHO without a parameter to display the current ECHO setting." + +STRING_ECHO_HELP5, "ECHO is %s\n" + +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" + +STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ +FOR %variable IN (set) DO command [parameters]\n\n\ + %variable Specifies a replaceable parameter.\n\ + (set) Specifies a set of one or more files. Wildcards may be used.\n\ + command Specifies the command to carry out for each file.\n\ + parameters Specifies parameters or switches for the specified command.\n\n\ +To use the FOR command in a batch program, specify %%variable instead of\n\ +%variable." + +STRING_FREE_HELP1, "\nVolume in drive %s is %-11s\n\ + Serial number is %s\n\ + %16s bytes total disk space\n\ + %16s bytes used\n\ + %16s bytes free\n" + +STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]" + +STRING_IF_HELP1, "Performs conditional processing in batch programs.\n\n\ + IF [NOT] ERRORLEVEL number command\n\ + IF [NOT] string1==string2 command\n\ + IF [NOT] EXIST filename command\n\ + IF [NOT] DEFINED variable command\n\n\ +NOT Specifies that CMD should carry out the command only if\n\ + the condition is false\n\ +ERRORLEVEL number Specifies a true condition if the last program run returned\n\ + an exit code equal or greater than the number specified.\n\ +command Specifies the command to carry out if the condition is met.\n\ +string1==string2 Specifies a true condition if the specified text strings\n\ + match.\n\ +EXIST filename Specifies a true condition if the specified filename exists.\n\ +DEFINED variable Specifies a true condition if the specified variable is\n\ + defined." + +STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch script.\n\n\ +GOTO label\n\n\ + label Specifies a text string used in a batch script as a label.\n\n\ +You type a label on a line by itself, beginning with a colon." + +STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL [drive:][label]" + +STRING_LABEL_HELP2, "Volume in drive %c: is %s\n" +STRING_LABEL_HELP3, "Volume in drive %c: has no label\n" +STRING_LABEL_HELP4, "Volume Serial Number is %04X-%04X\n" +STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " + +STRING_LOCALE_HELP1, "Current time is" + +STRING_MKDIR_HELP, "Creates a directory.\n\n\ +MKDIR [drive:]path\nMD [drive:]path" + +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ + %13s bytes total physical RAM.\n\ + %13s bytes available physical RAM.\n\n\ + %13s bytes total page file.\n\ + %13s bytes available page file.\n\n\ + %13s bytes total virtual memory.\n\ + %13s bytes available virtual memory.\n" + +STRING_MISC_HELP1, "Press a key to continue...\n" + +STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? " + +STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\ +To move one or more files:\n\ +MOVE [/N][drive:][path]filename1[,...] destination\n\n\ +To rename a directory:\n\ +MOVE [/N][drive:][path]dirname1 dirname2\n\n\ + [drive:][path]filename1 Specifies the location and name of the file\n\ + or files you want to move.\n\ + /N Nothing. Do everything but move files or directories.\n\n\ +Current limitations:\n\ + - You can't move a file or directory from one drive to another.\n" + +STRING_MSGBOX_HELP, "display a message box and return user responce\n\n\ +MSGBOX type ['title'] prompt\n\n\ +type button displayed\n\ + possible values are: OK, OKCANCEL,\n\ + YESNO, YESNOCANCEL\n\ +title title of message box\n\ +prompt text displayed by the message box\n\n\n\ +ERRORLEVEL is set according the button pressed:\n\n\ +YES : 10 | NO : 11\n\ +OK : 10 | CANCEL : 12\n" + +STRING_PATH_HELP1, "Displays or sets a search path for executable files.\n\n\ +PATH [[drive:]path[;...]]\nPATH ;\n\n\ +Type PATH ; to clear all search-path settings and direct the command shell\n\ +to search only in the current directory.\n\ +Type PATH without parameters to display the current path.\n" + +STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\ +PROMPT [text]\n\n\ + text Specifies a new command prompt.\n\n\ +Prompt can be made up of normal characters and the following special codes:\n\n\ + $A & (Ampersand)\n\ + $B | (pipe)\n\ + $C ( (Left parenthesis)\n\ + $D Current date\n\ + $E Escape code (ASCII code 27)\n\ + $F ) (Right parenthesis)\n\ + $G > (greater-than sign)\n\ + $H Backspace (erases previous character)\n\ + $L < (less-than sign)\n\ + $N Current drive\n\ + $P Current drive and path\n\ + $Q = (equal sign)\n\ + $T Current time\n\ + $V OS version number\n\ + $_ Carriage return and linefeed\n\ + $$ $ (dollar sign)" + +STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the following message:\n\ +'Press any key to continue...' or a user defined message.\n\n\ +PAUSE [message]" + +STRING_PROMPT_HELP2, " $+ Displays the current depth of the directory stack" + +STRING_PROMPT_HELP3, "\nType PROMPT without parameters to reset the prompt to the default setting." + +STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" + +STRING_RMDIR_HELP, "Removes a directory.\n\n\ +RMDIR [drive:]path\nRD [drive:]path" + +STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\ +RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ +REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ + /E No error messages.\n\ + /N Nothing.\n\ + /P Prompts for confirmation before renaming each file.\n\ + (Not implemented yet!)\n\ + /Q Quiet.\n\ + /S Rename subdirectories.\n\ + /T Display total number of renamed files.\n\n\ +Note that you cannot specify a new drive or path for your destination. Use\n\ +the MOVE command for that purpose." + +STRING_REN_HELP2, " %lu file renamed\n" + +STRING_REN_HELP3, " %lu files renamed\n" + +STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ +SHIFT [DOWN]" + +STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ +SCREEN row col [text]\n\n\ + row row to wich move the cursor\n\ + col column to wich move the cursor" + +STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ +SET [variable[=][string]]\n\n\ + variable Specifies the environment-variable name.\n\ + string Specifies a series of characters to assign to the variable.\n\n\ +Type SET without parameters to display the current environment variables.\n" + +STRING_START_HELP1, "Starts a command.\n\n\ +START command\n\n\ + command Specifies the command to run.\n\n\ +At the moment all commands are started asynchronously.\n" + +STRING_TITLE_HELP, "Sets the window title for the command prompt window.\n\n\ +TITLE [string]\n\n\ +string Specifies the title for the command prompt window." + +STRING_TIME_HELP1, "Displays or sets the system time.\n\n\ +TIME [/T][time]\n\n\ + /T display only\n\n\ +Type TIME with no parameters to display the current time setting and a prompt\n\ +for a new one. Press ENTER to keep the same time." + +STRING_TIME_HELP2, "Enter new time: " + +STRING_TIMER_HELP1, "Elapsed %d msecs\n" + +STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n" + +STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\ +TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ + ON set stopwach ON\n\ + OFF set stopwach OFF\n\ + /S Split time. Return stopwatch split\n\ + time without changing its value\n\ + /n Specifiy the stopwach number.\n\ + Stopwaches avaliable are 0 to 9\n\ + If it is not specified default is 1\n\ + /Fn Format for output\n\ + n can be:\n\ + 0 milliseconds\n\ + 1 hh%cmm%css%cdd\n\n\ +if none of ON, OFF or /S is specified the command\n\ +will toggle stopwach state\n\n" + +STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename" + +STRING_VERIFY_HELP1, "This command is just a dummy!!\n\ +Sets whether to verify that your files are written correctly to a\n\ +disk.\n\n\ +VERIFY [ON | OFF]\n\n\ +Type VERIFY without a parameter to display the current VERIFY setting." + +STRING_VERIFY_HELP2, "VERIFY is %s.\n" + +STRING_VERIFY_HELP3, "Must specify ON or OFF." + +STRING_VERSION_HELP1, "Zeigt Shell Informationen an.\n\n\ +VER [/C][/R][/W]\n\n\ + /C Zeigt die Credits an.\n\ + /R Zeigt die Redistribution Information an.\n\ + /W Zeigt die Warranty Information an." + +STRING_VERSION_HELP2, " kommt mit absolut keiner Garantie; fuer naehere\n\ + Informationen darueber tippen Sie: `ver /w'. Das ist eine freie Software,\n\ + und Sie sind koennen die Software unter bestimmten Bedingungen weiter\n\ + vertreiben; tippen Sie `ver /r' fuer naehere Informationen darueber.\n\ + Tippen Sie `ver /c' um die Mitwirkenden (Credits) aufzulisten." + +STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ + GNU General Public License for more details." + +STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ + (at your option) any later version." + +STRING_VERSION_HELP5, "\nSenden Sie Bug-Reports an <ros-dev(a)reactos.com>.\n\ +Updates sind auf der offiziellen ReactOS-Seite verfuegbar:\n\ +http://www.reactos.com" + +STRING_VERSION_HELP6, "\nFreeDOS version programmiert von:\n" + +STRING_VERSION_HELP7, "\nReactOS version programmiert von:\n" + +STRING_VOL_HELP1, " Volume in drive %c: is %s" +STRING_VOL_HELP2, " Volume in drive %c: has no label" +STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n" +STRING_VOL_HELP4, "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" + +STRING_WINDOW_HELP1, "change console window aspect\n\n\ +WINDOW [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window" + +STRING_WINDOW_HELP2, "change console window aspect\n\n\ +ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ + [MIN|MAX|RESTORE] ['title']\n\n\ +window tile of window on wich perform actions\n\ +/POS specify window placement and dimensions\n\ +MIN minimize the window\n\ +MAX maximize the window\n\ +RESTORE restore the window\n\ +title new title" + + +STRING_CHOICE_OPTION, "YN" +STRING_COPY_OPTION, "YNA" + + +STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" +STRING_BATCH_ERROR, "Error opening batch file\n" +STRING_CHCP_ERROR1, "Active code page: %u\n" +STRING_CHCP_ERROR4, "Invalid code page\n" +STRING_CHOICE_ERROR, "Ungueltige Option. Erwartetes Format: /C[:]options" +STRING_CHOICE_ERROR_TXT, "Ungueltige Option. Erwartetes Format: /T[:]c,nn" +STRING_CHOICE_ERROR_OPTION, "Illegal Option: %s" +STRING_CMD_ERROR1, "Can't redirect input from file %s\n" +STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" +STRING_CMD_ERROR3, "Can't redirect to file %s\n" +STRING_CMD_ERROR4, "Running %s...\n" +STRING_CMD_ERROR5, "Running cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" +STRING_COLOR_ERROR2, "error in color specification" +STRING_COLOR_ERROR3, "Farbe %x\n" +STRING_COLOR_ERROR4, "same colors error!" +STRING_CONSOLE_ERROR, "Unknown error: %d\n" +STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" +STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" +STRING_COPY_ERROR3, "Error writing destination!\n" +STRING_COPY_ERROR4, "Error: Not implemented yet!\n" +STRING_DATE_ERROR, "Invalid date." +STRING_DEL_ERROR5, "The file %s will be deleted! " +STRING_DEL_ERROR6, "Are you sure (Y/N)?" +STRING_DEL_ERROR7, "Deleting: %s\n" +STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n" +STRING_ERROR_ERROR2, "Syntax error" +STRING_FOR_ERROR1, "'in' missing in for statement." +STRING_FOR_ERROR2, "no brackets found." +STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR4, "no command after 'do'." +STRING_FREE_ERROR1, "Ungueltiges Laufwerk" +STRING_FREE_ERROR2, "unlabeled" +STRING_GOTO_ERROR1, "No label specified for GOTO" +STRING_GOTO_ERROR2, "Label '%s' not found\n" + +STRING_MOVE_ERROR1, "[OK]\n" +STRING_MOVE_ERROR2, "[Error]\n" + +STRING_REN_ERROR1, "MoveFile() failed. Error: %lu\n" + +STRING_START_ERROR1, "No batch support at the moment!" + +STRING_TIME_ERROR1, "Ungueltige Zeit." + +STRING_TYPE_ERROR1, "Invalid option '/%s'\n" + +STRING_WINDOW_ERROR1, "Fenster nicht gefunden" + + +STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" +STRING_ERROR_INVALID_SWITCH, "Ungueltiger Parameter - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "Zu viele Parameters - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Pfad wurde nicht gefunden\n" +STRING_ERROR_FILE_NOT_FOUND, "Datei wurde nicht gefunden\n" +STRING_ERROR_REQ_PARAM_MISSING, "Benoetigter Parameter fehlt\n" +STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" +STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" +STRING_ERROR_BADCOMMAND, "Ungueltiger Befehl oder Dateiname\n" +STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" +STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" +STRING_ERROR_D_PAUSEMSG, "Dr³cken Sie eine beliebige Taste . . ." +STRING_ERROR_DRIVER_NOT_READY, "Laufwerk ist nicht bereit" + +STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" + +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_VERSION_RUNVER, " running on %s" +STRING_COPY_FILE , " %d file(s) copied\n" +STRING_DELETE_WIPE, "wiped" +STRING_FOR_ERROR, "bad variable specification." +STRING_SCREEN_COL, "invalid value for col" +STRING_SCREEN_ROW, "invalid value for row" +STRING_TIMER_TIME "Timer %d is %s: " +} _____ Modified: trunk/reactos/subsys/system/cmd/cmd.rc --- trunk/reactos/subsys/system/cmd/cmd.rc 2005-06-03 17:28:53 UTC (rev 15752) +++ trunk/reactos/subsys/system/cmd/cmd.rc 2005-06-03 18:21:50 UTC (rev 15753) @@ -10,6 +10,7 @@ #include <reactos/version.rc> #include "En.rc" #include "Fr.rc" +#include "De.rc" STRINGTABLE DISCARDABLE

19 years, 5 months

[mbosma] 15752: Some new features like Login, Config.h and Idle message

by mbosma＠svn.reactos.com

Some new features like Login, Config.h and Idle message Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp Modified: trunk/irc/ArchBlackmann/ArchBlackmann.dsp Modified: trunk/irc/ArchBlackmann/IRCClient.cpp Modified: trunk/irc/ArchBlackmann/IRCClient.h Added: trunk/irc/ArchBlackmann/config.h Modified: trunk/irc/ArchBlackmann/curse.txt Added: trunk/irc/ArchBlackmann/idle.txt _____ Modified: trunk/irc/ArchBlackmann/ArchBlackmann.cpp --- trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/ArchBlackmann.cpp 2005-06-03 17:28:53 UTC (rev 15752) @@ -12,18 +12,11 @@ #include "trim.h" #include "IRCClient.h" +#include "config.h" using std::string; using std::vector; -#if defined(_DEBUG) && 0 -const char* BOTNAME = "RoyBot"; -const char* CHANNEL = "#RoyBotTest"; -#else -const char* BOTNAME = "ArchBlackmann"; -const char* CHANNEL = "#ReactOS"; -#endif - //vector<string> tech, module, dev, stru, period, status, type, func, irql, curse, cursecop; class List @@ -157,14 +150,46 @@ return false; } + // do custom stuff with the IRCClient from your subclass via the provided callbacks... class MyIRCClient : public IRCClient { File flog; + clock_t brake_silence; + + // wait another 30 mins to brake the silence + #define NOIDLE brake_silence = clock () + 30 * CLK_TCK * 60 + + void CheckIdle ( void ) + { + while (true) // _inRun + { + while (clock() < brake_silence) + Sleep(10000); + + string out = TaggedReply("idle"); + + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + Action ( CHANNEL, &out[4] ); + else + PrivMsg ( CHANNEL, out ); + + NOIDLE; + } + } + + static void THREADAPI CallMe ( MyIRCClient* irc ) + { + irc->CheckIdle(); + } + public: + MyIRCClient() { - flog.open ( "arch.log", "w+" ); + NOIDLE; + ThreadPool::Instance().Launch ( (ThreadPoolFunc*)MyIRCClient::CallMe, this ); + flog.open ( "arch.log", "r+" ); } // see IRCClient.h for documentation on these callbacks... bool OnConnected() @@ -173,7 +198,7 @@ } bool OnJoin ( const string& user, const string& channel ) { - printf ( "user '%s' joined channel '%s'\n", user.c_str(), channel.c_str() ); + //printf ( "user '%s' joined channel '%s'\n", user.c_str(), channel.c_str() ); return true; } bool OnPart ( const std::string& user, const std::string& channel ) @@ -207,11 +232,18 @@ } bool OnPrivMsg ( const string& from, const string& text ) { + //flog.flush(); printf ( "<%s> %s\n", from.c_str(), text.c_str() ); flog.printf ( "<%s> %s\n", from.c_str(), text.c_str() ); - if ( strnicmp ( text.c_str(), "!say ", 5 ) || !isop(from) ) + + if ( !isop(from) ) return PrivMsg ( from, "hey, your tongue doesn't belong there!" ); + + else if ( strnicmp ( text.c_str(), "!say ", 5 ) ) + return PrivMsg ( from, "Talk to me on normal Chanel" ); + string say = trim(&text[5]); + if ( !strnicmp ( say.c_str(), "/me ", 4 ) ) return Action ( CHANNEL, trim(&say[4]) ); else @@ -219,140 +251,176 @@ } bool OnChannelMsg ( const string& channel, const string& from, const string& text ) { + fflush ( flog ); printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() ); flog.printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() ); + NOIDLE; // add 30 mins till idle + bool found_name = false; string text2 ( text ); strlwr ( &text2[0] ); if ( !strnicmp ( text.c_str(), BOTNAME, strlen(BOTNAME) ) ) found_name = true; - else if ( !strnicmp ( text.c_str(), "arch ", 5 ) ) - found_name = true; + string s ( text ); + if ( found_name ) + gobble ( s, " \t" ); // remove bot name + + // command + if ( s[0] == '!' ) { - string s ( text ); - gobble ( s, " \t" ); // remove bot name - found_name = true; - if ( s[0] == '!' ) + bool from_op = isop(from); + string cmd = gobble ( s, " \t" ); + + // from all + if ( false && cmd == "!svn" && from == "TechBot" ) // || cmd == "!help" && !TechBotOnline { - bool from_op = isop(from); - string cmd = gobble ( s, " \t" ); - if ( !from_op ) + PrivMsg ( channel, "For my help try !what." ); + } + + // from normel user + else if ( !from_op ) + { + if ( cmd == "!grovel" ) { - if ( cmd == "!grovel" ) - { - string out = ssprintf(TaggedReply("nogrovel").c_str(),from.c_str()); - if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) - return Action ( channel, &out[4] ); - else - return PrivMsg ( channel, out ); - } - return PrivMsg ( channel, ssprintf("%s: I don't take commands from non-ops",from.c_str()) ); + string out = ssprintf(TaggedReply("nogrovel").c_str(),from.c_str()); + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + return Action ( channel, &out[4] ); + else + return PrivMsg ( channel, out ); } - if ( cmd == "!add" ) + + else if ( cmd == "!what" ) { - string listname = gobble ( s, " \t" ); - int i = GetListIndex ( listname.c_str() ); - if ( i == -1 ) - return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); - List& list = lists[i]; - if ( s[0] == '\"' || s[0] == '\'' ) - { - char delim = s[0]; - const char* p = &s[1]; - const char* p2 = strchr ( p, delim ); - if ( !p2 ) - return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); - s = string ( p, p2-p ); - } - for ( i = 0; i < list.list.size(); i++ ) - { - if ( list.list[i] == s ) - return PrivMsg ( channel, ssprintf("%s: entry already exists in list '%s'",from.c_str(),listname.c_str()) ); - } - if ( !stricmp ( listname.c_str(), "curse" ) ) - strlwr ( &s[0] ); - list.list.push_back ( s ); - { - File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); - for ( i = 0; i < list.list.size(); i++ ) - f.printf ( "%s\n", list.list[i].c_str() ); - } - return PrivMsg ( channel, ssprintf("%s: entry added to list '%s'",from.c_str(),listname.c_str()) ); + return PrivMsg ( channel, ssprintf("For you, %s, I only support the \"!grovel\" command.", from.c_str()).c_str() ); } - else if ( cmd == "!remove" ) + + else if ( cmd == "!grovel" || cmd == "!kiss" || cmd == "!hug" + || cmd == "!give" || cmd == "!what" || cmd == "!add" || cmd == "!remove" ) { - string listname = gobble ( s, " \t" ); - int i = GetListIndex ( listname.c_str() ); - if ( i == -1 ) - return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); - List& list = lists[i]; - if ( s[0] == '\"' || s[0] == '\'' ) - { - char delim = s[0]; - const char* p = &s[1]; - const char* p2 = strchr ( p, delim ); - if ( !p2 ) - return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); - s = string ( p, p2-p ); - } - for ( i = 0; i < list.list.size(); i++ ) - { - if ( list.list[i] == s ) - { - list.list.erase ( &list.list[i] ); - { - File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); - for ( i = 0; i < list.list.size(); i++ ) - f.printf ( "%s\n", list.list[i].c_str() ); - } - return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) ); - } - } - return PrivMsg ( channel, ssprintf("%s: entry doesn't exist in list '%s'",from.c_str(),listname.c_str()) ); + PrivMsg ( channel, ssprintf("%s: I only take commands from ops",from.c_str()) ); } - else if ( cmd == "!grovel" ) + } + + // from op + else if ( cmd == "!grovel" ) + { + string out = ssprintf(TaggedReply("grovel").c_str(),from.c_str()); + if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) + return Action ( channel, &out[4] ); + else + return PrivMsg ( channel, out ); + } + else if ( cmd == "!kiss" ) + { + if ( s.size() ) + return Action ( channel, ssprintf("kisses %s",s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else if ( cmd == "!hug" ) + { + if ( s.size() ) + return Action ( channel, ssprintf("hugs %s",s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else if ( cmd == "!give" ) + { + string who = gobble(s," \t"); + if ( who.size() && s.size() ) + return Action ( channel, ssprintf("gives %s a %s",who.c_str(),s.c_str()) ); + else + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + else if ( cmd == "!what" ) + { + PrivMsg ( channel, "For ops I support the following commands:" ); + PrivMsg ( channel, "!grovel" ); + PrivMsg ( channel, "!kiss" ); + PrivMsg ( channel, "!hug" ); + PrivMsg ( channel, "!give" ); + PrivMsg ( channel, "!say (the input is a private message)" ); + PrivMsg ( channel, "!add" ); + PrivMsg ( channel, "!remove" ); + PrivMsg ( channel, " - for more info see wiki" ); + } + else if ( cmd == "!add" ) + { + string listname = gobble ( s, " \t" ); + int i = GetListIndex ( listname.c_str() ); + if ( i == -1 ) + return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); + List& list = lists[i]; + if ( s[0] == '\"' || s[0] == '\'' ) { - string out = ssprintf(TaggedReply("grovel").c_str(),from.c_str()); - if ( !strnicmp ( out.c_str(), "/me ", 4 ) ) - return Action ( channel, &out[4] ); - else - return PrivMsg ( channel, out ); + char delim = s[0]; + const char* p = &s[1]; + const char* p2 = strchr ( p, delim ); + if ( !p2 ) + return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); + s = string ( p, p2-p ); } - else if ( cmd == "!kiss" ) + for ( i = 0; i < list.list.size(); i++ ) { - if ( s.size() ) - return Action ( channel, ssprintf("kisses %s",s.c_str()) ); - else - return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + if ( list.list[i] == s ) + return PrivMsg ( channel, ssprintf("%s: entry already exists in list '%s'",from.c_str(),listname.c_str()) ); } - else if ( cmd == "!hug" ) + if ( !stricmp ( listname.c_str(), "curse" ) ) + strlwr ( &s[0] ); + list.list.push_back ( s ); { - if ( s.size() ) - return Action ( channel, ssprintf("hugs %s",s.c_str()) ); - else - return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); + for ( i = 0; i < list.list.size(); i++ ) + f.printf ( "%s\n", list.list[i].c_str() ); } - else if ( cmd == "!give" ) + return PrivMsg ( channel, ssprintf("%s: entry added to list '%s'",from.c_str(),listname.c_str()) ); + } + else if ( cmd == "!remove" ) + { + string listname = gobble ( s, " \t" ); + int i = GetListIndex ( listname.c_str() ); + if ( i == -1 ) + return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) ); + List& list = lists[i]; + if ( s[0] == '\"' || s[0] == '\'' ) { - string who = gobble(s," \t"); - if ( who.size() && s.size() ) - return Action ( channel, ssprintf("gives %s a %s",who.c_str(),s.c_str()) ); - else - return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + char delim = s[0]; + const char* p = &s[1]; + const char* p2 = strchr ( p, delim ); + if ( !p2 ) + return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) ); + s = string ( p, p2-p ); } - else + for ( i = 0; i < list.list.size(); i++ ) { - return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + if ( list.list[i] == s ) + { + list.list.erase ( &list.list[i] ); + { + File f ( ssprintf("%s.txt",list.name.c_str()), "w" ); + for ( i = 0; i < list.list.size(); i++ ) + f.printf ( "%s\n", list.list[i].c_str() ); + } + return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) ); + } } + return PrivMsg ( channel, ssprintf("%s: entry doesn't exist in list '%s'",from.c_str(),listname.c_str()) ); } - } + else + { + if (found_name) + return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) ); + } + + } // if (command) bool found_curse = false; static vector<string>& curse = GetList("curse").list; - text2 = ssprintf(" %s ",text2.c_str()); + text2 = " " + text2 + " "; + for ( int i = 0; i < curse.size() && !found_curse; i++ ) { if ( strstr ( text2.c_str(), curse[i].c_str() ) ) @@ -363,7 +431,12 @@ static List& cursecop = GetList("cursecop"); return PrivMsg ( channel, ssprintf("%s: %s", from.c_str(), ListRand(cursecop)) ); } - else if ( found_name ) + + string botname (BOTNAME); + strlwr ( &botname[0] ); + //botname = " " + botname + " "; + + if ( strstr(text2.c_str(), botname.c_str()) || strstr(text2.c_str(), " arch ") || found_name ) { string out = ssprintf("%s: %s", from.c_str(), TaggedReply("tech").c_str()); flog.printf ( "TECH-REPLY: %s\n", out.c_str() ); @@ -373,7 +446,9 @@ return PrivMsg ( channel, out ); } return true; - } + + } // On Chanel Message + bool OnChannelMode ( const string& channel, const string& mode ) { //printf ( "OnChannelMode(%s,%s)\n", channel.c_str(), mode.c_str() ); @@ -439,6 +514,16 @@ //printf ( "\n" ); return true; } + bool OnKick ( void ) + { + Join(CHANNEL); + return true; + } + bool OnBanned ( const std::string& channel ) + { + Sleep(10000); + return Join(CHANNEL); + } }; int main ( int argc, char** argv ) @@ -461,50 +546,59 @@ ImportList ( "cursecop", false ); ImportList ( "grovel", false ); ImportList ( "nogrovel", false ); + ImportList ( "idle", false ); #ifdef _DEBUG printf ( "initializing IRCClient debugging\n" ); IRCClient::SetDebug ( true ); #endif//_DEBUG - printf ( "calling suStartup()\n" ); - suStartup(); - printf ( "creating IRCClient object\n" ); - MyIRCClient irc; - printf ( "connecting to freenode\n" ); - //const char* server = "212.204.214.114"; - const char* server = "irc.freenode.net"; + while (true) + { + printf ( "calling suStartup()\n" ); + suStartup(); + printf ( "creating IRCClient object\n" ); + MyIRCClient irc; + printf ( "connecting to freenode\n" ); - if ( !irc.Connect ( server ) ) // irc.freenode.net - { - printf ( "couldn't connect to server\n" ); - return -1; + if ( !irc.Connect ( SERVER ) ) // irc.freenode.net + { + printf ( "couldn't connect to server\n" ); + Sleep(10000); + continue; + } + printf ( "sending user command\n" ); + if ( !irc.User ( BOTNAME, "reactos.com", SERVER, "ArchBlackmann" ) ) + { + printf ( "USER command failed, retying ...\n" ); + Sleep(10000); + continue; + } + printf ( "sending nick\n" ); + if ( !irc.Nick ( BOTNAME ) ) + { + printf ( "NICK command failed, retying ...\n" ); + Sleep(10000); + continue; + } + printf ( "setting mode\n" ); + if ( !irc.Mode ( MODE ) ) + { + printf ( "MODE command failed, retying ...\n" ); + Sleep(10000); + continue; + } + printf ( "joining channel\n" ); + if ( !irc.Join ( CHANNEL ) ) + { + printf ( "JOIN command failed, retying ...\n" ); + Sleep(10000); + continue; + } + + printf ( "entering irc client processor\n" ); + irc.Run ( false ); // do the processing in this thread... } - printf ( "sending user command\n" ); - if ( !irc.User ( BOTNAME, "", "irc.freenode.net", BOTNAME ) ) - { - printf ( "USER command failed\n" ); - return -1; - } - printf ( "sending nick\n" ); - if ( !irc.Nick ( BOTNAME ) ) - { - printf ( "NICK command failed\n" ); - return -1; - } - printf ( "setting mode\n" ); - if ( !irc.Mode ( "+i" ) ) - { - printf ( "MODE command failed\n" ); - return -1; - } - printf ( "joining channel\n" ); - if ( !irc.Join ( CHANNEL ) ) - { - printf ( "JOIN command failed\n" ); - return -1; - } - printf ( "entering irc client processor\n" ); - irc.Run ( false ); // do the processing in this thread... + return 0; } _____ Modified: trunk/irc/ArchBlackmann/ArchBlackmann.dsp --- trunk/irc/ArchBlackmann/ArchBlackmann.dsp 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/ArchBlackmann.dsp 2005-06-03 17:28:53 UTC (rev 15752) @@ -110,6 +110,10 @@ # End Source File # Begin Source File +SOURCE=.\config.h +# End Source File +# Begin Source File + SOURCE=.\cram_md5.cpp # End Source File # Begin Source File _____ Modified: trunk/irc/ArchBlackmann/IRCClient.cpp --- trunk/irc/ArchBlackmann/IRCClient.cpp 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/IRCClient.cpp 2005-06-03 17:28:53 UTC (rev 15752) @@ -16,6 +16,7 @@ #include "chomp.h" #include "SplitJoin.h" #include "base64.h" +#include "config.h" using std::string; using std::stringstream; @@ -23,6 +24,8 @@ bool IRCClient::_debug = true; +// see rfc1459 for IRC-Protocoll Reference + IRCClient::IRCClient() : _timeout(10*60*1000), _inRun(false) { @@ -51,7 +54,9 @@ IRCClient::Nick ( const string& nick ) { _nick = nick; - return Send ( "NICK " + _nick + "\n" ); + Send ( "NICK " + _nick + "\n" ); + PrivMsg ("NickServ", "IDENTIFY " + (string)PASS); + return true; } bool @@ -75,7 +80,7 @@ bool IRCClient::Join ( const string& channel ) { - return Send ( "JOIN " + channel + "\n" ); + return Send("JOIN " + channel + "\n"); } bool @@ -145,7 +150,7 @@ { ThreadPool::Instance().Launch ( (ThreadPoolFunc*)IRCClient::Callback, this ); return 1; - } + } _inRun = true; if ( _debug ) printf ( "IRCClient::Run() - waiting for responses\n" ); string buf; @@ -296,6 +301,7 @@ } else if ( cmd == "join" ) { + mychannel = text; OnJoin ( src, text ); } else if ( cmd == "part" ) @@ -306,14 +312,20 @@ { OnNick ( src, text ); } + else if ( cmd == "kick" ) + { + OnKick (); + } else if ( isdigit(cmd[0]) ) { int i = atoi(cmd.c_str()); switch ( i ) { + case 1: // "Welcome!" - i.e. it's okay to issue commands now... OnConnected(); break; + case 353: // user list for channel.... { p = text.c_str(); @@ -336,6 +348,7 @@ OnChannelUsers ( channel, users ); } break; + case 366: // END of user list for channel { p = text.c_str(); @@ -345,6 +358,38 @@ OnEndChannelUsers ( channel ); } break; + + case 474: // You are banned + { + p = text.c_str(); + p2 = strpbrk ( p, " :" ); + if ( !p2 ) continue; + string channel ( p, p2-p ); + OnBanned ( channel ); + } + break; + + case 433: // Nick in Use + { + string nick = _nick; + Nick (nick + "_"); + + PrivMsg ("NickServ", "GHOST " + nick + " " + PASS); + + // HACK HACK HACK + Mode ( "+i" ); + Join ( CHANNEL ); // this is because IRC client does not review if his commands were sucessfull + + Sleep ( 1000 ); + Nick ( nick ); + } + break; + + case 2: //MOTD + case 376: //MOTD + case 372: + break; + default: if ( _debug ) printf ( "unknown command %i: %s", i, buf.c_str() ); break; _____ Modified: trunk/irc/ArchBlackmann/IRCClient.h --- trunk/irc/ArchBlackmann/IRCClient.h 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/IRCClient.h 2005-06-03 17:28:53 UTC (rev 15752) @@ -12,9 +12,11 @@ class IRCClient : public suBufferedRecvSocket { + public: IRCClient(); + std::string mychannel; static bool GetDebug() { return _debug; } static bool SetDebug ( bool debug ) { bool old = _debug; _debug = debug; return old; } @@ -99,6 +101,12 @@ virtual bool OnChannelUsers ( const std::string& channel, const std::vector<std::string>& users ) { return true; } + // OnKick: if the client has been kicked + virtual bool OnKick ( void ) { return true; } + + // OnKick: if the client has been kicked + virtual bool OnBanned ( const std::string& channel ) { return true; } + // notification that you have received the entire list of users for a channel virtual bool OnEndChannelUsers ( const std::string& channel ) { return true; } _____ Added: trunk/irc/ArchBlackmann/config.h --- trunk/irc/ArchBlackmann/config.h 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/config.h 2005-06-03 17:28:53 UTC (rev 15752) @@ -0,0 +1,7 @@ + + +#define SERVER "irc.freenode.net" +#define BOTNAME "ArchBlackmann" +#define CHANNEL "#ReactOS" +#define MODE "+i" +#define PASS "ilovebunnies" _____ Modified: trunk/irc/ArchBlackmann/curse.txt --- trunk/irc/ArchBlackmann/curse.txt 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/curse.txt 2005-06-03 17:28:53 UTC (rev 15752) @@ -24,3 +24,4 @@ ekush akshor poop +guten morgen _____ Added: trunk/irc/ArchBlackmann/idle.txt --- trunk/irc/ArchBlackmann/idle.txt 2005-06-03 17:09:47 UTC (rev 15751) +++ trunk/irc/ArchBlackmann/idle.txt 2005-06-03 17:28:53 UTC (rev 15752) @@ -0,0 +1 @@ +/me is bored

19 years, 5 months

[hpoussin] 15751: Wait the opening of mouclass device to connect the underlying mouse port driver

by hpoussin＠svn.reactos.com

Wait the opening of mouclass device to connect the underlying mouse port driver Modified: trunk/reactos/drivers/input/mouclass/mouclass.c _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-06-03 16:57:55 UTC (rev 15750) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-06-03 17:09:47 UTC (rev 15751) @@ -19,6 +19,8 @@ #define NDEBUG #include <debug.h> +PDEVICE_OBJECT MouclassDeviceObject; + BOOLEAN MouseClassCallBack( PDEVICE_OBJECT ClassDeviceObject, PMOUSE_INPUT_DATA MouseDataStart, PMOUSE_INPUT_DATA MouseDataEnd, PULONG ConsumedCount) @@ -160,7 +162,7 @@ switch (Stack->MajorFunction) { case IRP_MJ_CREATE: - Status = STATUS_SUCCESS; + Status = ConnectMousePortDriver(MouclassDeviceObject); break; case IRP_MJ_CLOSE: @@ -264,13 +266,7 @@ return Status; } - Status = ConnectMousePortDriver(DeviceObject); - if (!NT_SUCCESS(Status)) - { - IoDeleteSymbolicLink(&SymlinkName); - IoDeleteDevice(DeviceObject); - return Status; - } + MouclassDeviceObject = DeviceObject; return STATUS_SUCCESS; }

19 years, 5 months

[greatlrd] 15750: bitblt srcpy optimze it can be more optimze

by greatlrd＠svn.reactos.com

bitblt srcpy optimze it can be more optimze Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 16:56:27 UTC (rev 15749) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-03 16:57:55 UTC (rev 15750) @@ -308,6 +308,7 @@ switch (BltInfo->Rop4) { + case ROP4_BLACKNESS: //return(0x00000000); @@ -376,17 +377,39 @@ #endif return TRUE; break; + case ROP4_SRCCOPY: // return(Source); switch (BltInfo->SourceSurface->iBitmapFormat) { case BMF_1BPP: - break; - case BMF_4BPP: - break; + case BMF_4BPP: case BMF_16BPP: - break; case BMF_24BPP: + { + PBYTE byteaddr = BltInfo->SourceSurface->pvScan0 + BltInfo->DestRect.top * BltInfo->SourceSurface->lDelta; + PDWORD addr = (PDWORD)byteaddr + BltInfo->DestRect.left; + LONG xlDelta = BltInfo->SourceSurface->lDelta - (BltInfo->DestRect.right - BltInfo->DestRect.left) ; + + SourceY = BltInfo->SourcePoint.y; + + for (DestY=BltInfo->DestRect.top; DestY<BltInfo->DestRect.bottom; DestY++) + { + + if (SourceY > BltInfo->SourceSurface->sizlBitmap.cy) break; + + SourceX = BltInfo->SourcePoint.x; + + for (DestX=BltInfo->DestRect.left; DestX<BltInfo->DestRect.right; DestX++, SourceX++, addr++) + { + if (SourceX > BltInfo->SourceSurface->sizlBitmap.cx) break; + + *addr = DIB_GetSource(BltInfo->SourceSurface, SourceX, + SourceY, BltInfo->XlateSourceToDest); + } + } + addr+=xlDelta; + } break; case BMF_32BPP: {

19 years, 5 months

← Newer
1
...
58
59
60
61
62
63
64
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005