Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 31502: Bug 2926: Polish translation update part 1/x (olaf_siejka<AT>o2<DOT>pl)
by dreimer＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: dreimer Date: Sun Dec 30 20:02:14 2007 New Revision: 31502 URL: http://svn.reactos.org/svn/reactos?rev=31502&view=rev Log: Bug 2926: Polish translation update part 1/x (olaf_siejka<AT>o2<DOT>pl) Added: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc (with props) trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc (with props) trunk/reactos/base/applications/logoff/lang/pl-PL.rc (with props) trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc (with props) trunk/reactos/base/applications/mstsc/lang/pl-PL.rc (with props) trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc (with props) trunk/reactos/base/applications/shutdown/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/cmdutils/more/rsrc.rc trunk/reactos/base/applications/control/lang/pl-PL.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc trunk/reactos/base/applications/mstsc/lang/ca-ES.rc trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/lang/el-GR.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/es-ES.rc trunk/reactos/base/applications/mstsc/lang/fr-FR.rc trunk/reactos/base/applications/mstsc/lang/it-IT.rc trunk/reactos/base/applications/mstsc/lang/ru-RU.rc trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.rc trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/shutdown/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,24 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "FIND: Wywietla wszystkie linie danego pliku, zawieraj¹ce szukany ci¹g znaków.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ci¹g znaków\" [ plik... ]\n\ + /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ + /I Ignoruje wielkoæ liter\n\ + /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ + /V Wywietla te linie które nie zawieraj¹ szukanego ci¹gu znaków" + +IDS_NO_SUCH_FILE, "FIND: %s: Plik nie zosta³ znaleziony\n" + +IDS_CANNOT_OPEN, "FIND: %s: Nie mo¿na otworzyæ pliku\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -10,5 +10,6 @@ #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/lt-LT.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,22 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_USAGE, "Wywietla dane, podzielone na odcinki o d³ugoci ekranu.\n\n\ + MORE < [Napêd:][cie¿ka]Nazwa pliku\n\ + Polecenie | MORE \n\ + MORE [Napêd:][cie¿ka]Nazwa pliku\n\n\ + [Napêd:][cie¿ka]Nazwa pliku Plik, którego zawartoæ ma byæ wywietlona.\n\ + Polecenie\t\t Polecenie, którego wynik ma byæ wywietlony.\n\n\ + Po wywietleniu ""-- Kontynuuj --"" mo¿esz nacisn¹æ dowolny klawisz by przejæ na nastêpn¹ stronê.\n" + + IDS_CONTINUE, " -- Kontynuuj (100%) -- " + IDS_FILE_ACCESS, "Brak dostêpu do pliku: %s." +} Propchange: trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/more/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/more/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -6,8 +6,9 @@ #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/fr-FR.rc" #include "lang/lt-LT.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/ru-RU.rc" Modified: trunk/reactos/base/applications/control/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/control/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,4 +1,11 @@ -// Polish language resource file (Sebastian Gasiorek, 2005-07-06) +/* + * Polish language resource file (Sebastian Gasiorek, 2005-07-06) + * translation update by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -28,10 +35,10 @@ STRINGTABLE BEGIN - IDS_WINDOW_TITLE "Control Panel" - IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" - IDS_ABOUT_TITLE "About the Control Panel" - IDS_NO_ITEMS "No Items in ListView" - IDS_NAME "Name" - IDS_COMMENT "Comment" + IDS_WINDOW_TITLE "Panel Sterowania" + IDS_ABOUT "Podstawowy Panel Sterowania (nie oparty o Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rPodlega licencji GPL" + IDS_ABOUT_TITLE "O Panelu Sterowania" + IDS_NO_ITEMS "Brak sk³adników" + IDS_NAME "Nazwa" + IDS_COMMENT "Komentarz" END Added: trunk/reactos/base/applications/logoff/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/logoff/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,22 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Przerywa sesjê.\n\n\ + /v\t\tWywietla informacjê o wykonanej czynnoci.\n\ + /?\t\tWywietla niniejsz¹ pomoc.\n\n" + +IDS_LOGOFF_REMOTE, "Przeywanie sesji na maszynie zdalnej." +IDS_LOGOFF_LOCAL, "Przerywanie niniejszej sesji na maszynie lokalnej." + +IDS_ILLEGAL_PARAM, "Nieprawid³owy parametr\n" +} +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -11,6 +11,8 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" + Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -5,17 +5,19 @@ #include "lang/ca-ES.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" +#include "lang/en-US.rc" #include "lang/es-ES.rc" -#include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc" + + Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -19,11 +19,11 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" -#include "lang/nl-NL.rc" -#include "lang/nb-NO.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" Added: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,107 @@ +/* + * PROJECT: ReactOS Event Viewer + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/mscutils/eventvwr/lang/en-US.rc + * PURPOSE: English Language File for ReactOS Event Viewer + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDC_EVENTVWR MENU +BEGIN + POPUP "&Logi" + BEGIN + MENUITEM "&Aplikacja", ID_LOG_APPLICATION, CHECKED + MENUITEM "&Zabezpieczenia", ID_LOG_SECURITY + MENUITEM "&System", ID_LOG_SYSTEM + MENUITEM SEPARATOR + MENUITEM "&Wyjcie", IDM_EXIT + END + POPUP "&Podgl¹d" + BEGIN + MENUITEM "&Odwie¿", IDM_REFRESH + END + MENUITEM "Op&cje", ID_OPTIONS + POPUP "Po&moc" + BEGIN + MENUITEM "Pomo&c", IDM_HELP + MENUITEM SEPARATOR + MENUITEM "O &programie...", IDM_ABOUT + END +END + +IDC_EVENTVWR ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 + LTEXT "Podgl¹d zdarzeñ ReactOS wersja 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 + DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP +END + +IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER +CAPTION "Wait.." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CTEXT "£adowanie logów zdarzeñ. Proszê czekaæ ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX +END + +IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Event Detail" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Zamknij",IDOK,12,258,50,14 + PUSHBUTTON "&Poprzedni",IDPREVIOUS,78,258,50,14 + PUSHBUTTON "&Nastêpny",IDNEXT,144,258,50,14 + PUSHBUTTON "Po&moc",IDHELP,210,258,50,14 + EDITTEXT IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY + LTEXT "&Opis:",IDC_STATIC,15,70,39,8 + LTEXT "Data:",IDC_STATIC,14,14,36,8 + LTEXT "Statycznie",IDC_EVENTDATESTATIC,56,14,72,8 + LTEXT "Czas:",IDC_STATIC,14,27,36,8 + LTEXT "Statycznie",IDC_EVENTTIMESTATIC,56,27,72,8 + LTEXT "&U¿ytkownik:",IDC_STATIC,14,41,36,8 + LTEXT "Static",IDC_EVENTUSERSTATIC,56,41,72,8 + LTEXT "&Computer:",IDC_STATIC,14,54,36,8 + LTEXT "Statycznie",IDC_EVENTCOMPUTERSTATIC,56,54,72,8 + LTEXT "Numer ID:",IDC_STATIC,133,15,36,8 + LTEXT "Statycznie",IDC_EVENTIDSTATIC,175,15,87,8 + LTEXT "¯ród³o:",IDC_STATIC,133,28,36,8 + LTEXT "Static",IDC_EVENTSOURCESTATIC,175,28,87,8 + LTEXT "Typ:",IDC_STATIC,133,42,36,8 + LTEXT "Statycznie",IDC_EVENTTYPESTATIC,175,42,87,8 + LTEXT "Kategoria:",IDC_STATIC,133,55,36,8 + LTEXT "Statycznie",IDC_EVENTCATEGORYSTATIC,175,55,87,8 + EDITTEXT IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY + LTEXT "D&ane",IDC_STATIC,14,194,16,8 + CONTROL "&Bajty",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10 + CONTROL "&S³owa",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Podgl¹d zdarzeñ" + IDC_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zosta³ odnaleziony w ródle: ( %s ). Ten komputer mo¿e nie miec wystarczaj¹cych informacji w rejestrze albo bibliotek DLL by wywietliæ wiadomoci z komputera zdalnego." + IDC_EVENTLOG_ERROR_TYPE "B³¹d" + IDC_EVENTLOG_WARNING_TYPE "Ostrze¿enie" + IDC_EVENTLOG_INFORMATION_TYPE "Informacja" + IDC_EVENTLOG_AUDIT_SUCCESS "Udany Audyt" + IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audit" + IDC_EVENTLOG_SUCCESS "Sukces" + IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" +END Propchange: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -17,6 +17,8 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/it-IT.rc" + Modified: trunk/reactos/base/applications/mstsc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ca-ES.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "General" IDS_TAB_DISPLAY "Pantalla" IDS_256COLORS "256 Colors" - IDS_HIGHCOLOR15 "High Color (15 bit)" - IDS_HIGHCOLOR16 "High Color (16 bit)" - IDS_HIGHCOLOR24 "Color Real (24 bit)" + IDS_HIGHCOLOR15 "32,768 Colors (15 bit)" + IDS_HIGHCOLOR16 "65,536 Colors (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Colors (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Pantalla Complerta" IDS_BROWSESERVER "<Navega per més...>" Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "Allgemein" IDS_TAB_DISPLAY "Display" IDS_256COLORS "256 Farben" - IDS_HIGHCOLOR15 "High Color (15 bit)" - IDS_HIGHCOLOR16 "High Color (16 bit)" - IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_HIGHCOLOR15 "32,768 Farben (15 bit)" + IDS_HIGHCOLOR16 "65,536 Farben (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Farben (24 bit)" IDS_PIXEL "%lux%lu Pixel" IDS_FULLSCREEN "Vollbild" IDS_BROWSESERVER "<Nach mehr suchen...>" Modified: trunk/reactos/base/applications/mstsc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/el-GR.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "ÃåíéêÜ" IDS_TAB_DISPLAY "ÅìöÜíéóç" IDS_256COLORS "256 ÷ñþìáôá" - IDS_HIGHCOLOR15 "ÐïëëÜ ÷ñþìáôá (15 bit)" - IDS_HIGHCOLOR16 "ÐïëëÜ ÷ñþìáôá (16 bit)" - IDS_HIGHCOLOR24 "ÖõóéêÜ ÷ñþìáôá (24 bit)" + IDS_HIGHCOLOR15 "32,768 ÷ñþìáôá (15 bit)" + IDS_HIGHCOLOR16 "65,536 ÷ñþìáôá (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 ÷ñþìáôá (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "ÐëÞñçò ïèüíç" IDS_BROWSESERVER "<ÁíáæÞôçóç ãéá ðåñéóóüôåñá...>" Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "General" IDS_TAB_DISPLAY "Display" IDS_256COLORS "256 Colors" - IDS_HIGHCOLOR15 "High Color (15 bit)" - IDS_HIGHCOLOR16 "High Color (16 bit)" - IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_HIGHCOLOR15 "32,768 Colors (15 bit)" + IDS_HIGHCOLOR16 "65,536 Colors (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Colors (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Full Screen" IDS_BROWSESERVER "<Browse for more...>" Modified: trunk/reactos/base/applications/mstsc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/es-ES.rc Sun Dec 30 20:02:14 2007 @@ -57,9 +57,9 @@ IDS_TAB_GENERAL "General" IDS_TAB_DISPLAY "Pantalla" IDS_256COLORS "256 Colores" - IDS_HIGHCOLOR15 "Color de alta densidad (15 bit)" - IDS_HIGHCOLOR16 "Color de alta densidad (16 bit)" - IDS_HIGHCOLOR24 "Color Verdadero (24 bit)" + IDS_HIGHCOLOR15 "32,768 Colores (15 bit)" + IDS_HIGHCOLOR16 "65,536 Colores (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Colores (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Pantalla Completa" IDS_BROWSESERVER "<Buscar más...>" Modified: trunk/reactos/base/applications/mstsc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/fr-FR.rc Sun Dec 30 20:02:14 2007 @@ -51,10 +51,10 @@ BEGIN IDS_TAB_GENERAL "Général" IDS_TAB_DISPLAY "Affichage" - IDS_256COLORS "256 Coleurs" - IDS_HIGHCOLOR15 "Couleurs hautes (15 bit)" - IDS_HIGHCOLOR16 "Couleurs hautes (16 bit)" - IDS_HIGHCOLOR24 "Couleurs vraies (24 bit)" + IDS_256COLORS "256 Couleurs" + IDS_HIGHCOLOR15 "32,768 Couleurs (15 bit)" + IDS_HIGHCOLOR16 "65,536 Couleurs (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 Couleurs (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Plein écran" IDS_BROWSESERVER "<Parcourir pour plus...>" Modified: trunk/reactos/base/applications/mstsc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/it-IT.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "Generale" IDS_TAB_DISPLAY "Visualizza" IDS_256COLORS "256 Colori" - IDS_HIGHCOLOR15 "65.536 colori (15 bit)" + IDS_HIGHCOLOR15 "32,768 colori (15 bit)" IDS_HIGHCOLOR16 "65.536 colori (16 bit)" - IDS_HIGHCOLOR24 "16,8 milioni di colori (24 bit)" + IDS_HIGHCOLOR24 "16,777,216 colori (24 bit)" IDS_PIXEL "%lux%lu Pixel" IDS_FULLSCREEN "Schermo Intero" IDS_BROWSESERVER "<Cerca...>" Added: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,70 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ustawienia logowania",IDC_STATIC,7,7,228,89 + GROUPBOX "Ustawienia po³¹czenia",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "Wpisz adres serwera",IDC_STATIC,47,24,81,8 + LTEXT "Serwer:",IDC_STATIC,47,41,25,8 + LTEXT "Nazwa u¿ytkownika:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Zapisz",IDC_SAVE,67,139,50,14 + PUSHBUTTON "Zapisz jako...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Otwórz...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "Zapisz obecne po³¹czenie albo otwórz istniej¹cy ju¿ plik z ustawieniami",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Rozmiar pulpitu zdalnego",IDC_STATIC,7,7,228,68 + GROUPBOX "Liczba kolorów",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "Ustaw rozmiar twojego pulpitu zdalnego. Przesuñ suwak do koñca w prawo by uruchomiæ pulpit na pe³nym ekranie",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Uwaga: Ustawienia na komputerze zdalnym maj¹ pierwszeñstwo nad bierz¹cymi.",IDC_STATIC,56,143,165,18 + LTEXT "Mniej",IDC_STATIC,35,42,15,8 + LTEXT "Wiêcej",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Remote Desktop Connection" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Po³¹cz",IDOK,147,245,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "Ogólne" + IDS_TAB_DISPLAY "Ekran" + IDS_256COLORS "256 kolorów" + IDS_HIGHCOLOR15 "32,768 kolorów (15 bit)" + IDS_HIGHCOLOR16 "65,536 kolorów (16 bit)" + IDS_HIGHCOLOR24 "16,777,216 kolorów (24 bit)" + IDS_PIXEL "%lux%lu pikseli" + IDS_FULLSCREEN "Pe³ny ekran" + IDS_BROWSESERVER "<Wybierz inne...>" + IDS_HEADERTEXT1 "Pulpit zdalny" + IDS_HEADERTEXT2 "Po³¹czenie" +END Propchange: trunk/reactos/base/applications/mstsc/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/ru-RU.rc Sun Dec 30 20:02:14 2007 @@ -52,9 +52,9 @@ IDS_TAB_GENERAL "Îáùèå" IDS_TAB_DISPLAY "Ýêðàí" IDS_256COLORS "256 öâåòîâ" - IDS_HIGHCOLOR15 "Ðàçðåøåíèå (15 áèò)" - IDS_HIGHCOLOR16 "Ðàçðåøåíèå (16 áèò)" - IDS_HIGHCOLOR24 "Ðàçðåøåíèå (24 áèò)" + IDS_HIGHCOLOR15 "32,768 öâåòîâ (15 áèò)" + IDS_HIGHCOLOR16 "65,536 öâåòîâ (16 áèò)" + IDS_HIGHCOLOR24 "16,777,216 öâåòîâ (24 áèò)" IDS_PIXEL "%lux%lu ïèêñåëåé" IDS_FULLSCREEN "Ïîëíûé ýêðàí" IDS_BROWSESERVER "<Óêàçàòü ïóòü...>" Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc Sun Dec 30 20:02:14 2007 @@ -60,9 +60,9 @@ IDS_TAB_GENERAL "Çàãàëüí³" IDS_TAB_DISPLAY "Åêðàí" IDS_256COLORS "256 êîëüîð³â" - IDS_HIGHCOLOR15 "High Color (15 á³ò)" - IDS_HIGHCOLOR16 "High Color (16 á³ò)" - IDS_HIGHCOLOR24 "True Color (24 á³òà)" + IDS_HIGHCOLOR15 "32,768 êîëüîð³â (15 á³ò)" + IDS_HIGHCOLOR16 "65,536 êîëüîð³â (16 á³ò)" + IDS_HIGHCOLOR24 "16,777,216 êîëüîð³â (24 á³òà)" IDS_PIXEL "%lu íà %lu êðàïîê" IDS_FULLSCREEN "Íà âåñü åêðàí" IDS_BROWSESERVER "<Ïîøóê ³íøèõ...>" Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -21,5 +21,6 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Sun Dec 30 20:02:14 2007 @@ -10,7 +10,6 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" Modified: trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -19,12 +19,12 @@ STRINGTABLE DISCARDABLE BEGIN IDS_OTHER "inny rodzaj karty" - IDS_ETH "Ethernet karta" - IDS_TOKEN "Token Ring karta" - IDS_FDDI "FDDI karta" - IDS_PPP "PPP karta" - IDS_LOOP "Loopback karta" - IDS_SLIP "SLIP karta" + IDS_ETH "karta Ethernet" + IDS_TOKEN "karta Token Ring" + IDS_FDDI "karta FDDI" + IDS_PPP "karta PPP" + IDS_LOOP "karta Loopback" + IDS_SLIP "karta SLIP" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -2,6 +2,8 @@ * Regedit resources * * Copyright 2005 Sebastian Gasiorek + * + * Update by Caemyr (Dec,2007) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -398,7 +400,7 @@ /* *STRINGTABLE DISCARDABLE *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." + * ID_HELP_HELPTOPICS "Otwiera pomoc Edytora Rejestru." + * ID_HELP_ABOUT "Wywietla informacje o programie, wersji number, licencji." *END */ Added: trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,26 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_CONFIG DIALOGEX 0, 0, 273, 178 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D Text Screensaver Settings" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "W³asny tekst",IDC_STATIC_TEXT,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Wygaszacz ekranu Tekst 3d" + IDS_TITLE "O programie" + IDS_TEXT "Brak opcji." +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -18,6 +18,7 @@ #include "lang/fr-FR.rc" #include "lang/it-IT.rc" #include "lang/lt-LT.rc" +#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Wygaszacz ekranu Logon" + IDS_TITLE "O programie..." + IDS_TEXT "Brak opcji." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Sun Dec 30 20:02:14 2007 @@ -15,13 +15,10 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" #include "lang/en-US.rc" -#include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" -#include "lang/it-IT.rc" Added: trunk/reactos/base/applications/shutdown/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/pl-PL.rc Sun Dec 30 20:02:14 2007 @@ -1,0 +1,21 @@ +/* + * translated by Caemyr (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Sk³adnia: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Bez parametrów albo z -?\tWywietla niniejsz¹ pomoc\n\ + -l\t\t\tWylogowanie\n\ + -s\t\t\tWy³¹czenie komputera\n\ + -r\t\t\tRestart komputera\n\ + -f\t\t\tZamkniêcie wszystkich dzia³aj¹cych aplikacji, bez ostrze¿enia\n\ + \t\t\tBez podania innego parametru, ta opcja domylnie wyloguje \n\ + \t\t\tobecnego u¿ytkownika" +} Propchange: trunk/reactos/base/applications/shutdown/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc (original) +++ trunk/reactos/base/applications/shutdown/rsrc.rc Sun Dec 30 20:02:14 2007 @@ -3,11 +3,11 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" -#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" #include "lang/sk-SK.rc" -#include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

1 0

[dreimer] 31501: Bug 2925: Last Greek resource files updates for 2oo7 (djapal<AT>gmail<DOT>com)
by dreimer＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: dreimer Date: Sun Dec 30 18:25:09 2007 New Revision: 31501 URL: http://svn.reactos.org/svn/reactos?rev=31501&view=rev Log: Bug 2925: Last Greek resource files updates for 2oo7 (djapal<AT>gmail<DOT>com) Added: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc (with props) trunk/reactos/dll/cpl/telephon/lang/el-GR.rc (with props) trunk/reactos/dll/win32/msacm32/msacm_El.rc (with props) trunk/reactos/dll/win32/netid/lang/el-GR.rc (with props) Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/win32/msacm32/msacm.rc trunk/reactos/dll/win32/netid/netid.rc Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sun Dec 30 18:25:09 2007 @@ -60,7 +60,7 @@ }, { L"00000408", - L"00000408", + L"00000409", L"Greek", elGRPages }, Added: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc Sun Dec 30 18:25:09 2007 @@ -1,0 +1,166 @@ +// Greek (el) resources by Dj Apal (djapal at gmail dot com) + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 252, 237 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Óõíäõáóìïß ôñïöïäïóßáò" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 + LTEXT "ÅðéëÝîôå ôéò ñõèìßóåéò ìå ôïí ðéï êáôÜëëçëï óõíäõáóìü ôñïöïäïóßáò ãéá áõôüí ôïí õðïëïãéóôÞ. Óçìåéþóôå üôé áëëÜæïíôáò ôéò ðáñáêÜôù ñõèìßóåéò, èá ôñïðïðïéçèåß ï åðéëåãìÝíïò óõíäõáóìüò.", + -1,37, 6, 209, 36 + GROUPBOX "Ó&õíäõáóìïß ôñïöïäïóßáò", -1, 6, 43, 240, 50 + COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL + PUSHBUTTON "&ÁðïèÞêåõóç ùò...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED + PUSHBUTTON "&ÄéáãñáöÞ", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED + GROUPBOX "Unknown", IDC_GRPDETAIL, 6, 95, 240, 136 + LTEXT "¼ôáí ï õðïëïãéóôÞò:",IDC_SAT, 12, 109, 60, 12 + LTEXT "åßíáé óôçí ðñßæá",IDC_SAC, 123, 110, 45, 15 + ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 + LTEXT "ëåéôïõñãåß ìå ìðáôáñßåò",IDC_SDC, 195, 110, 45, 15 + ICON IDI_DC, IDC_IDC, 170, 108, 21, 20 + LTEXT "ÓâÞóéìï &ïèüíçò:",IDC_MONITOR, 13, 148, 84, 10 + COMBOBOX IDC_MONITORACLIST, 100, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 173, 145, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Áðåíåñãïðïßçóç &óêëçñþí äßóêùí:",IDC_DISK, 13, 171, 84, 10 + COMBOBOX IDC_DISKACLIST, 100, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 173, 167, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Óýóôçìá óå á&íáìïíÞ:",IDC_STANDBY, 13, 191, 84, 10 + COMBOBOX IDC_STANDBYACLIST, 100, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 173, 188, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Óýóôçìá óå á&äñÜíåéá:",IDC_HYBERNATE, 13, 212, 84, 10 + COMBOBOX IDC_HYBERNATEACLIST, 100, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 173, 209, 65, 150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 252, 237 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÅéäïðïéÞóåéò" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Åéäïðïßçóç ðåóìÝíçò ìðáôáñßáò",-1, 6, 7, 239, 104 + CONTROL "Åíåñãïðïßçóç åéäïðïßçóçò üôáí ç åíÝñãåéá öôÜóåé:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 + LTEXT "unknown",IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "0%",-1, 28, 43, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 + LTEXT "100%", -1, 214, 43, 25, 10 + PUSHBUTTON "Åéäïðïßçóç...",-1, 17, 69, 70, 14,WS_DISABLED + LTEXT "Åéäïðïßçóç:",-1, 95, 71, 57, 10 + LTEXT "¢ãíùóôï",IDC_ALARMMSG1, 154, 71, 84, 10 + LTEXT "ÅíÝñãåéá:",-1, 95, 83, 55, 10 + LTEXT "¢ãíùóôï",IDC_ALARMAKTION1, 154, 83, 84, 10 + LTEXT "ÅêôÝëåóç:",-1, 95, 95, 55, 10 + LTEXT "¢ãíùóôï",IDC_ALARMPROG1, 154, 95, 84, 10 + + GROUPBOX "Åéäïðïßçóç êñßóéìïõ óçìåßïõ ìðáôáñßáò",-1, 6, 120, 239, 106 + CONTROL "Åíåñãïðïßçóç åéäïðïßçóçò üôáí ç åíÝñãåéá öôÜóåé:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 + LTEXT "unknown",IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "0%",-1, 28, 154, 15, 10 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 + LTEXT "100%",-1, 214, 154, 25, 10 + PUSHBUTTON "Åéäïðïßçóç...",-1, 17, 183, 70, 14, WS_DISABLED + LTEXT "Åéäïðïßçóç:",-1, 95, 185, 50, 10 + LTEXT "Unknown",IDC_ALARMMSG2, 154, 185, 84, 10 + LTEXT "ÅíÝñãåéá:",-1, 95, 198, 45, 10 + LTEXT "Unknown",IDC_ALARMAKTION2, 154, 198, 84, 10 + LTEXT "ÅêôÝëåóç:",-1, 95, 211, 50, 10 + LTEXT "Unknown",IDC_ALARMPROG2, 154, 211, 84, 10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 252, 237 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ãéá ðñï÷ùñçìÝíïõò" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC,IDI_ACDC, 7, 7, 20, 20 + LTEXT "ÅðéëÝîôå ôéò ñõèìßóåéò åîïéêïíüìçóçò åíÝñãåéáò ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå.",-1, 37, 6, 207, 20 + GROUPBOX "ÅðéëïãÝò",-1, 6, 30, 240, 65 + CONTROL "ÅìöÜíéóç ôïõ åéêïíéäßïõ óôç ãñáììÞ åñãáóéþí",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 43, 220, 10 + CONTROL "&Êùäéêüò ðñüóâáóçò êáôÜ ôçí åðáíáöïñÜ áðü êáôÜóôáóç áíáìïíÞò",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 60, 220, 10 + CONTROL "&Dim display when running on batteries",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 78, 220, 10 + GROUPBOX "ÊïõìðéÜ ôñïöïäïóßáò",-1, 6, 101, 240, 127 + LTEXT "&ÊáôÜ ôï êëåßóéìï ôïõ êáëýììáôïò ôïõ öïñçôïý õðïëïãéóôÞ ìïõ:", IDC_SLIDCLOSE, 15, 115, 222, 10 + COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "ÊáôÜ ôï ê&ëåßóéìï ôïõ õðïëïãéóôÞ ìïõ:", IDC_SPOWERBUTTON, 15, 153, 222, 10 + COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "ÊáôÜ ôçí &áíáóôïëÞ ëåéôïõåãßáò ôïõ õðïëïãéóôÞ ìïõ:", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 252, 237 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Áäñáíïðïßçóç" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HIBERNATE,IDI_HIBERNATE, 7, 7, 20, 20 + LTEXT "¼ôáí ï õðïëïãéóôÞò áäñáíïðïéåßôáé, áðïèçêåýåé ü,ôé Ý÷åé óôç ìíÞìç óôï óêëçñü äßóêï êáé ìåôÜ ôåñìáôßæåôáé ç ëåéôïõñãßá ôïõ. ¼ôáí åðáíÝñ÷åôáé áðü ôçí áäñáíïðïßçóç, åðéóôñÝöåé óôï áñ÷éêü ôïõ åðßðåäï. ", + -1, 37, 6, 210, 35 + GROUPBOX "Áäñáíïðïßçóç",-1, 6, 41, 240, 32 + CONTROL "Åíå&ñãïðïßçóç áäñáíïðïßçóçò",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP, 17, 55, 210, 10 + GROUPBOX "×þñïò ôïõ äßóêïõ ãéá ëåéôïõñãßá áäñáíïðïßçóçò",-1, 6, 80, 240, 76 + LTEXT "ÄéáèÝóéìïò ÷þñïò óôï äßóêï:",-1, 15, 95, 140, 10 + LTEXT "Unknown",IDC_FREESPACE, 160, 95, 80, 10 + LTEXT "Áðáéôïýìåíïò ÷þñïò ãéá áäñáíïðïßçóç:",-1, 15, 115, 140, 10 + LTEXT "Unknown",IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 + LTEXT "Èá ðñÝðåé íá åëåõèåñþóåôå ÷þñï óôï äßóêï óáò ðñéí ï õðïëïãéóôÞò óáò ìðïñÝóåé áí ôåèåß óå êáôÜóôáóç áäñáíïðïßçóçò. ",IDC_TOLESSFREESPACE, 15, 135, 224, 20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "ÅðéëïãÝò ÅíÝñãåéáò" + IDS_CPLDESCRIPTION_1 "Configure energy-saving settings for your computer." + IDS_PROCENT "%i%%" + IDS_SOUND "¹÷ïò" + IDS_TEXT "Êåßìåíï" + IDS_CONFIG1 "Ñõèìßóåéò ãéá ôï %1 power scheme" + IDS_CONFIG2 "Ñõèìßóåéò ãéá ðñï÷ùñçìÝíïõò ãéá ôï %1" + + IDS_SIZEBYTS "%i bytes" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "Êáìßá åíÝñãåéá" + + IDS_PowerActionNone1 "Íá ìç ãßíåôáé êáìßá åíÝñãåéá" + IDS_PowerActionUnknown "Unknown" + IDS_PowerActionSleep "Stand by" + IDS_PowerActionHibernate "Áäñáíïðïßçóç" + IDS_PowerActionShutdown "Ôåñìáôéóìüò ëåéôïõñãßáò" + IDS_PowerActionRestart "Åðáíåêêßíçóç" + IDS_PowerActionShutdownOff "Shutdown and Turn the Power Off" + IDS_PowerActionWarmEject "Íá ãßíåôáé åñþôçóç ãéá åíÝñãåéá" + IDS_PowerActionNone2 "None" + + IDS_TIMEOUT1 "ÌåôÜ áðü 1 ëåðôü" + IDS_TIMEOUT2 "ÌåôÜ áðü 2 ëåðôÜ" + IDS_TIMEOUT3 "ÌåôÜ áðü 3 ëåðôÜ" + IDS_TIMEOUT4 "ÌåôÜ áðü 5 ëåðôÜ" + IDS_TIMEOUT5 "ÌåôÜ áðü 10 ëåðôÜ" + IDS_TIMEOUT6 "ÌåôÜ áðü 15 ëåðôÜ" + IDS_TIMEOUT7 "ÌåôÜ áðü 20 ëåðôÜ" + IDS_TIMEOUT8 "ÌåôÜ áðü 25 ëåðôÜ" + IDS_TIMEOUT9 "ÌåôÜ áðü 30 ëåðôÜ" + IDS_TIMEOUT10 "ÌåôÜ áðü 45 ëåðôÜ" + IDS_TIMEOUT11 "ÌåôÜ áðü 1 þñá" + IDS_TIMEOUT12 "ÌåôÜ áðü 2 þñåò" + IDS_TIMEOUT13 "ÌåôÜ áðü 3 þñåò" + IDS_TIMEOUT14 "ÌåôÜ áðü 4 þñåò" + IDS_TIMEOUT15 "ÌåôÜ áðü 5 þñåò" + IDS_TIMEOUT16 "ÐïôÝ" + + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" + IDS_DEL_SCHEME_TITLE "Delete Scheme" +END + + Propchange: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/rsrc.rc (original) +++ trunk/reactos/dll/cpl/powercfg/rsrc.rc Sun Dec 30 18:25:09 2007 @@ -4,6 +4,7 @@ #include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" Added: trunk/reactos/dll/cpl/telephon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/el-GR.rc Sun Dec 30 18:25:09 2007 @@ -1,0 +1,7 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "ÅðéëïãÝò Ôçëåöþíïõ êáé Ìüíôåì" + IDS_CPLSYSTEMDESCRIPTION "Ñõèìßæåé ôéò ðáñáìÝôñïõò ôùí êáíüíùí êëÞóåéò ôïõ ôçëåöþíïõ óáò êáé ôùí éäéïôÞôùí ôïõ ìüíôåì." +END Propchange: trunk/reactos/dll/cpl/telephon/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/telephon/rsrc.rc (original) +++ trunk/reactos/dll/cpl/telephon/rsrc.rc Sun Dec 30 18:25:09 2007 @@ -3,6 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm.rc (original) +++ trunk/reactos/dll/win32/msacm32/msacm.rc Sun Dec 30 18:25:09 2007 @@ -23,6 +23,7 @@ #include "winuser.h" #include "wineacm.h" +#include "msacm_El.rc" #include "msacm_En.rc" #include "msacm_De.rc" #include "msacm_Es.rc" Added: trunk/reactos/dll/win32/msacm32/msacm_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_El… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_El.rc (added) +++ trunk/reactos/dll/win32/msacm32/msacm_El.rc Sun Dec 30 18:25:09 2007 @@ -1,0 +1,56 @@ +/* + * Greek resource file for MS ACM + * + * Copyright 2007 Apostolos Alexiadis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÅðéëïãÞ Þ÷ïõ" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&¼íïìá:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&ÁðïèÞêåõóç ùò...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Áöáßñåóç", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&ÖïñìÜ:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Éäéüôçôåò:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "¢êõñï", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&ÂïÞèåéá", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END Propchange: trunk/reactos/dll/win32/msacm32/msacm_El.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netid/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/el-GR… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/el-GR.rc (added) +++ trunk/reactos/dll/win32/netid/lang/el-GR.rc Sun Dec 30 18:25:09 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "¼íïìá õðïëïãéóôÞ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "Ôï ReactOS ÷ñçóéìïðïéåß ôéò ðáñáêÜôù ðëçñïöïñßåò ãéá ôçí áíáãíþñéóç ôïõ õðïëïãéóôÞ óáò óôï äßêôõï.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "ÐåñéãñáöÞ õðïëïãéóôÞ:", IDC_STATIC, 6, 40, 70, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "ÐëÞñåò üíïìá õðïëïãéóôÞ:", IDC_STATIC, 6, 68, 64, 9 + LTEXT "(ÐñïåðéëåãìÝíï)", IDC_COMPUTERNAME, 98, 68, 144, 11 + LTEXT "ÏìÜäá åñãáóßáò:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + LTEXT "(Üäåéï)", IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 9 + LTEXT "Ãéá íá ÷ñçóéìïðïéÞóåôå ôï âïçèü Network Identfication ãéá íá ìðåßôå óå Ýíá domain êáé íá äçìéïõñãÞóåôå Ýíáí ôïðéêü ÷ñÞóôç, êÜíôå êëéê óôï ""Network ID"".", IDC_STATIC, 6, 108, 172, 24 + PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Ãéá íá ìåôïíïìÜóåôå áõôüí ôïí õðïëïãéóôÞ Þ íá óõììåôÜó÷åôå óå ìéá ïìÜäá åñãáóßáò, êÜíôå êëéê óôï êïõìðß ""ÁëëáãÞ"".", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&ÁëëáãÞ...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Óçìåßùóç: Ìüíï ïé äéá÷åéñéóôÝò óõóôÞìáôïò ìðïñïýí íá áëëÜîïõí ôï áíáãíùñéóôéêü áõôïý ôïõ õðïëïãéóôÞ.", IDC_STATIC, 6, 179, 300, 9 +END + Propchange: trunk/reactos/dll/win32/netid/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netid/netid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/netid.rc?r… ============================================================================== --- trunk/reactos/dll/win32/netid/netid.rc (original) +++ trunk/reactos/dll/win32/netid/netid.rc Sun Dec 30 18:25:09 2007 @@ -10,6 +10,7 @@ IDI_COMPNAME ICON "res/netid.ico" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/de-DE.rc"

1 0

[fireball] 31500: - Import and add to the bootcd msxml3.dll from Wine, but build it without libxml2 for now. It's not ready for autosyncing yet.
by fireball＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: fireball Date: Sun Dec 30 13:49:17 2007 New Revision: 31500 URL: http://svn.reactos.org/svn/reactos?rev=31500&view=rev Log: - Import and add to the bootcd msxml3.dll from Wine, but build it without libxml2 for now. It's not ready for autosyncing yet. Added: trunk/reactos/dll/win32/msxml3/ trunk/reactos/dll/win32/msxml3/attribute.c (with props) trunk/reactos/dll/win32/msxml3/comment.c (with props) trunk/reactos/dll/win32/msxml3/domdoc.c (with props) trunk/reactos/dll/win32/msxml3/element.c (with props) trunk/reactos/dll/win32/msxml3/factory.c (with props) trunk/reactos/dll/win32/msxml3/main.c (with props) trunk/reactos/dll/win32/msxml3/msxml3.rbuild (with props) trunk/reactos/dll/win32/msxml3/msxml3.spec (with props) trunk/reactos/dll/win32/msxml3/msxml_private.h (with props) trunk/reactos/dll/win32/msxml3/node.c (with props) trunk/reactos/dll/win32/msxml3/nodelist.c (with props) trunk/reactos/dll/win32/msxml3/nodemap.c (with props) trunk/reactos/dll/win32/msxml3/parseerror.c (with props) trunk/reactos/dll/win32/msxml3/pi.c (with props) trunk/reactos/dll/win32/msxml3/queryresult.c (with props) trunk/reactos/dll/win32/msxml3/regsvr.c (with props) trunk/reactos/dll/win32/msxml3/schema.c (with props) trunk/reactos/dll/win32/msxml3/text.c (with props) trunk/reactos/dll/win32/msxml3/uuid.c (with props) trunk/reactos/dll/win32/msxml3/version.rc (with props) trunk/reactos/dll/win32/msxml3/xmldoc.c (with props) trunk/reactos/dll/win32/msxml3/xmlelem.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=315… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… Added: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… Added: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Added: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Added: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c… Added: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… Added: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… Added: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… Added: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Added: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Added: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… Added: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… Added: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… Added: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… Added: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… Added: trunk/reactos/dll/win32/msxml3/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/regsvr.c?… Added: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… Added: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… Added: trunk/reactos/dll/win32/msxml3/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/uuid.c?re… Added: trunk/reactos/dll/win32/msxml3/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/version.r… Added: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… Added: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[fireball] 31499: - These will be needed soon.
by fireball＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: fireball Date: Sun Dec 30 13:23:01 2007 New Revision: 31499 URL: http://svn.reactos.org/svn/reactos?rev=31499&view=rev Log: - These will be needed soon. Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=31… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Sun Dec 30 13:23:01 2007 @@ -54,6 +54,8 @@ #include "urlmon.h" #include "objsel.h" #include "richole.h" +#include "xmldom.h" +#include "xmldso.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

[fireball] 31498: - ReactOS Specific! WIDL in ReactOS is called with a header name including the relative path to it. Thus, the generated #ifndef __WIDL directive also includes the tokenized path to the file, which doesn't conform to its usage in Wine (where it's just __WIDL_HEADERNAME_H). In order to solve this, a small piece of code was added, which omits the relative path from the string sent to the tokenizer. The only drawback is that the headername passed to the WIDL must never mix differen
by fireball＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: fireball Date: Sun Dec 30 13:21:51 2007 New Revision: 31498 URL: http://svn.reactos.org/svn/reactos?rev=31498&view=rev Log: - ReactOS Specific! WIDL in ReactOS is called with a header name including the relative path to it. Thus, the generated #ifndef __WIDL directive also includes the tokenized path to the file, which doesn't conform to its usage in Wine (where it's just __WIDL_HEADERNAME_H). In order to solve this, a small piece of code was added, which omits the relative path from the string sent to the tokenizer. The only drawback is that the headername passed to the WIDL must never mix different style path separators ('/' and '\\'). Modified: trunk/reactos/tools/widl/widl.c Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3149… ============================================================================== --- trunk/reactos/tools/widl/widl.c (original) +++ trunk/reactos/tools/widl/widl.c Sun Dec 30 13:21:51 2007 @@ -327,7 +327,12 @@ } if(do_header) { - header_token = make_token(header_name); + if (strrchr(header_name, '\\')) + header_token = make_token(strrchr(header_name, '\\') + 1); + else if (strrchr(header_name, '/')) + header_token = make_token(strrchr(header_name, '/') + 1); + else + header_token = make_token(header_name); if(!(header = fopen(header_name, "w"))) { fprintf(stderr, "Could not open %s for output\n", header_name);

1 0

[jimtabor] 31497: Fix redef of region attr. Add temp union for GDI_TABLE_ENTRY.
by jimtabor＠svn.reactos.org 30 Dec '07

30 Dec '07

Author: jimtabor Date: Sun Dec 30 08:34:11 2007 New Revision: 31497 URL: http://svn.reactos.org/svn/reactos?rev=31497&view=rev Log: Fix redef of region attr. Add temp union for GDI_TABLE_ENTRY. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Sun Dec 30 08:34:11 2007 @@ -176,7 +176,6 @@ #define LDC_INIT_PAGE 0x00000080 #define LDC_KILL_DOCUMENT 0x00010000 - /* DC_ATTR Xform Flags */ #define METAFILE_TO_WORLD_IDENTITY 0x00000001 #define WORLD_TO_PAGE_IDENTITY 0x00000002 @@ -194,13 +193,8 @@ #define PAGE_EXTENTS_CHANGED 0x00004000 #define WORLD_XFORM_CHANGED 0x00008000 - -/* RGN_ATTR Dirty Flags */ +/* RGN_ATTR Flags */ #define DIRTY_RGNATTR 0x00000020 - -/* RGN_ATTR Type Flags */ -#define RGNATTR_INIT 0x00000001 -#define RGNATTR_SET 0x00000002 /* TYPES *********************************************************************/ @@ -210,7 +204,12 @@ PVOID KernelData; /* Points to the kernel mode structure */ SHORT ProcessId; /* process id that created the object, 0 for stock objects */ SHORT nCount; /* usage count of object handles */ + union{ // temp union structure. LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ + SHORT nUpper:16; + CHAR ObjectType:8; + CHAR Flags:8; + }; PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; @@ -227,12 +226,12 @@ DWORD dwCsbSupported1; // OEM code-page bitfield. } GDI_SHARED_HANDLE_TABLE, *PGDI_SHARED_HANDLE_TABLE; -typedef struct _RGNATTR +typedef struct _RGN_ATTR { ULONG AttrFlags; - ULONG Flags; + ULONG Flags; // Clipping region's complexity. NULL, SIMPLE & COMPLEXREGION RECTL Rect; -} RGNATTR,*PRGNATTR; +} RGN_ATTR,*PRGN_ATTR; // Local DC structure (_DC_ATTR) PVOID pvLDC; typedef struct _LDC @@ -306,7 +305,7 @@ SIZEL szlVirtualDeviceMm; SIZEL szlVirtualDeviceSize; POINTL ptlBrushOrigin; - RGNATTR VisRectRegion; + RGN_ATTR VisRectRegion; } DC_ATTR, *PDC_ATTR; typedef struct _BRUSH_ATTR @@ -315,19 +314,11 @@ DWORD dwUnused[3]; } BRUSH_ATTR, *PBRUSH_ATTR; -typedef struct _REGION_ATTR -{ - FLONG flFlags; - DWORD dwType; - RECT rcBound; -} REGION_ATTR, *PREGION_ATTR; - typedef struct _FONT_ATTR { DWORD dwUnknown; void *pCharWidthData; } FONT_ATTR, *PFONT_ATTR; - typedef enum tagGdiPathState {

1 0

[weiden] 31496: Fix some handle leaks and warnings
by weiden＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: weiden Date: Sun Dec 30 00:40:31 2007 New Revision: 31496 URL: http://svn.reactos.org/svn/reactos?rev=31496&view=rev Log: Fix some handle leaks and warnings Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c trunk/reactos/dll/win32/iphlpapi/route_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Sun Dec 30 00:40:31 2007 @@ -99,6 +99,7 @@ if (!NT_SUCCESS(status)) { ERR("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status); + *tcpFile = INVALID_HANDLE_VALUE; } return status; @@ -106,7 +107,8 @@ void closeTcpFile( HANDLE h ) { TRACE("called.\n"); - NtClose( h ); + ASSERT(h != INVALID_HANDLE_VALUE); + ZwClose( h ); } /* A generic thing-getting function which interacts in the right way with @@ -462,6 +464,7 @@ if( !NT_SUCCESS(status) ) { WARN("getNumInterfaces: failed %08x\n", status ); + closeTcpFile( tcpFile ); return 0; } @@ -550,7 +553,7 @@ if( NT_SUCCESS(status) ) for( i = 0; i < numInterfaces; i++ ) { - if( !strcmp(ifInfo[i].if_info.ent.if_descr, name) ) { + if( !strcmp((PCHAR)ifInfo[i].if_info.ent.if_descr, name) ) { memcpy( info, &ifInfo[i], sizeof(*info) ); break; } @@ -575,14 +578,14 @@ status = getInterfaceInfoByIndex( tcpFile, index, &ifInfo ); if( NT_SUCCESS(status) ) { - adapter_name = ifInfo.if_info.ent.if_descr; + adapter_name = (char *)ifInfo.if_info.ent.if_descr; interfaceName = HeapAlloc( GetProcessHeap(), 0, strlen(adapter_name) + 1 ); strcpy( interfaceName, adapter_name ); - - closeTcpFile( tcpFile ); - } + } + + closeTcpFile( tcpFile ); } return interfaceName; @@ -603,8 +606,9 @@ if( NT_SUCCESS(status) ) { *index = ifInfo.if_info.ent.if_index; - closeTcpFile( tcpFile ); - } + } + + closeTcpFile( tcpFile ); } return status; @@ -688,7 +692,7 @@ DWORD getAddrByIndexOrName( char *name, DWORD index, IPHLPAddrType addrType ) { IFInfo ifInfo; - HANDLE tcpFile = INVALID_HANDLE_VALUE; + HANDLE tcpFile; NTSTATUS status = STATUS_SUCCESS; DWORD addrOut = INADDR_ANY; @@ -705,7 +709,7 @@ case IFStatus: addrOut = ifInfo.if_info.ent.if_operstatus; break; } } - closeTcpFile( &tcpFile ); + closeTcpFile( tcpFile ); } return addrOut; Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Sun Dec 30 00:40:31 2007 @@ -604,13 +604,13 @@ unsigned long addr; RegQueryValueExA(hKey, "WinsServer", NULL, NULL, - primaryWINS.String, &size); + (PBYTE)primaryWINS.String, &size); addr = inet_addr(primaryWINS.String); if (addr != INADDR_NONE && addr != INADDR_ANY) winsEnabled = TRUE; size = sizeof(secondaryWINS.String); RegQueryValueExA(hKey, "BackupWinsServer", NULL, NULL, - secondaryWINS.String, &size); + (PBYTE)secondaryWINS.String, &size); addr = inet_addr(secondaryWINS.String); if (addr != INADDR_NONE && addr != INADDR_ANY) winsEnabled = TRUE; @@ -1390,7 +1390,7 @@ { DWORD size = sizeof(pFixedInfo->ScopeId); - RegQueryValueExA(hKey, "ScopeID", NULL, NULL, pFixedInfo->ScopeId, &size); + RegQueryValueExA(hKey, "ScopeID", NULL, NULL, (PBYTE)pFixedInfo->ScopeId, &size); RegCloseKey(hKey); } Modified: trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ipstats… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c (original) +++ trunk/reactos/dll/win32/iphlpapi/ipstats_reactos.c Sun Dec 30 00:40:31 2007 @@ -404,6 +404,7 @@ if( !NT_SUCCESS(status) ) { TRACE("failure: %08x\n", (int)status ); + closeTcpFile( tcpFile ); return 0; } @@ -414,6 +415,7 @@ status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); if( !NT_SUCCESS(status) ) { tdiFreeThingSet( entitySet ); + closeTcpFile( tcpFile ); return status; } numRoutes += isnmp.ipsi_numroutes; @@ -504,6 +506,8 @@ routesAdded += snmpInfo.ipsi_numroutes; } + closeTcpFile( tcpFile ); + TRACE("Return: %08x, %08x\n", status, out_route_table); return out_route_table; @@ -606,6 +610,8 @@ if( AdapterArpTable ) tdiFreeThingSet( AdapterArpTable ); } } + + closeTcpFile( tcpFile ); tdiFreeThingSet( entitySet ); IpArpTable->dwNumEntries = row; Modified: trunk/reactos/dll/win32/iphlpapi/route_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/route_r… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/route_reactos.c (original) +++ trunk/reactos/dll/win32/iphlpapi/route_reactos.c Sun Dec 30 00:40:31 2007 @@ -53,7 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); DWORD createIpForwardEntry( PMIB_IPFORWARDROW pRoute ) { - HANDLE tcpFile = INVALID_HANDLE_VALUE; + HANDLE tcpFile; NTSTATUS status = openTcpFile( &tcpFile ); TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED req = TCP_REQUEST_SET_INFORMATION_INIT; @@ -63,45 +63,45 @@ TRACE("Called.\n"); - if( NT_SUCCESS(status) ) + if( NT_SUCCESS(status) ) { status = getNthIpEntity( tcpFile, 0, &id ); - if( NT_SUCCESS(status) ) { - req.Req.ID.toi_class = INFO_CLASS_PROTOCOL; - req.Req.ID.toi_type = INFO_TYPE_PROVIDER; - req.Req.ID.toi_id = IP_MIB_ROUTETABLE_ENTRY_ID; - req.Req.ID.toi_entity = id; - req.Req.BufferSize = sizeof(*rte); - rte = - (IPRouteEntry *)&req.Req.Buffer[0]; + if( NT_SUCCESS(status) ) { + req.Req.ID.toi_class = INFO_CLASS_PROTOCOL; + req.Req.ID.toi_type = INFO_TYPE_PROVIDER; + req.Req.ID.toi_id = IP_MIB_ROUTETABLE_ENTRY_ID; + req.Req.ID.toi_entity = id; + req.Req.BufferSize = sizeof(*rte); + rte = + (IPRouteEntry *)&req.Req.Buffer[0]; - // dwForwardPolicy - // dwForwardNextHopAS - rte->ire_dest = pRoute->dwForwardDest; - rte->ire_mask = pRoute->dwForwardMask; - rte->ire_gw = pRoute->dwForwardNextHop; - rte->ire_index = pRoute->dwForwardIfIndex; - rte->ire_type = IP_FORWARD_ADD; - rte->ire_proto = pRoute->dwForwardProto; - rte->ire_age = pRoute->dwForwardAge; - rte->ire_metric1 = pRoute->dwForwardMetric1; - rte->ire_metric2 = pRoute->dwForwardMetric2; - rte->ire_metric3 = pRoute->dwForwardMetric3; - rte->ire_metric4 = pRoute->dwForwardMetric4; - rte->ire_metric5 = pRoute->dwForwardMetric5; + // dwForwardPolicy + // dwForwardNextHopAS + rte->ire_dest = pRoute->dwForwardDest; + rte->ire_mask = pRoute->dwForwardMask; + rte->ire_gw = pRoute->dwForwardNextHop; + rte->ire_index = pRoute->dwForwardIfIndex; + rte->ire_type = IP_FORWARD_ADD; + rte->ire_proto = pRoute->dwForwardProto; + rte->ire_age = pRoute->dwForwardAge; + rte->ire_metric1 = pRoute->dwForwardMetric1; + rte->ire_metric2 = pRoute->dwForwardMetric2; + rte->ire_metric3 = pRoute->dwForwardMetric3; + rte->ire_metric4 = pRoute->dwForwardMetric4; + rte->ire_metric5 = pRoute->dwForwardMetric5; - status = DeviceIoControl( tcpFile, - IOCTL_TCP_SET_INFORMATION_EX, - &req, - sizeof(req), - NULL, - 0, - &returnSize, - NULL ); + status = DeviceIoControl( tcpFile, + IOCTL_TCP_SET_INFORMATION_EX, + &req, + sizeof(req), + NULL, + 0, + &returnSize, + NULL ); + } + + closeTcpFile( tcpFile ); } - - if( tcpFile != INVALID_HANDLE_VALUE ) - closeTcpFile( tcpFile ); TRACE("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX); @@ -117,7 +117,7 @@ } DWORD deleteIpForwardEntry( PMIB_IPFORWARDROW pRoute ) { - HANDLE tcpFile = INVALID_HANDLE_VALUE; + HANDLE tcpFile; NTSTATUS status = openTcpFile( &tcpFile ); TCP_REQUEST_SET_INFORMATION_EX_SAFELY_SIZED req = TCP_REQUEST_SET_INFORMATION_INIT; @@ -127,45 +127,45 @@ TRACE("Called.\n"); - if( NT_SUCCESS(status) ) + if( NT_SUCCESS(status) ) { status = getNthIpEntity( tcpFile, 0, &id ); - if( NT_SUCCESS(status) ) { - req.Req.ID.toi_class = INFO_CLASS_PROTOCOL; - req.Req.ID.toi_type = INFO_TYPE_PROVIDER; - req.Req.ID.toi_id = IP_MIB_ROUTETABLE_ENTRY_ID; - req.Req.ID.toi_entity = id; - req.Req.BufferSize = sizeof(*rte); - rte = - (IPRouteEntry *)&req.Req.Buffer[0]; + if( NT_SUCCESS(status) ) { + req.Req.ID.toi_class = INFO_CLASS_PROTOCOL; + req.Req.ID.toi_type = INFO_TYPE_PROVIDER; + req.Req.ID.toi_id = IP_MIB_ROUTETABLE_ENTRY_ID; + req.Req.ID.toi_entity = id; + req.Req.BufferSize = sizeof(*rte); + rte = + (IPRouteEntry *)&req.Req.Buffer[0]; - // dwForwardPolicy - // dwForwardNextHopAS - rte->ire_dest = pRoute->dwForwardDest; - rte->ire_mask = INADDR_NONE; - rte->ire_gw = pRoute->dwForwardNextHop; - rte->ire_index = pRoute->dwForwardIfIndex; - rte->ire_type = IP_FORWARD_DEL; - rte->ire_proto = pRoute->dwForwardProto; - rte->ire_age = pRoute->dwForwardAge; - rte->ire_metric1 = pRoute->dwForwardMetric1; - rte->ire_metric2 = INADDR_NONE; - rte->ire_metric3 = INADDR_NONE; - rte->ire_metric4 = INADDR_NONE; - rte->ire_metric5 = INADDR_NONE; + // dwForwardPolicy + // dwForwardNextHopAS + rte->ire_dest = pRoute->dwForwardDest; + rte->ire_mask = INADDR_NONE; + rte->ire_gw = pRoute->dwForwardNextHop; + rte->ire_index = pRoute->dwForwardIfIndex; + rte->ire_type = IP_FORWARD_DEL; + rte->ire_proto = pRoute->dwForwardProto; + rte->ire_age = pRoute->dwForwardAge; + rte->ire_metric1 = pRoute->dwForwardMetric1; + rte->ire_metric2 = INADDR_NONE; + rte->ire_metric3 = INADDR_NONE; + rte->ire_metric4 = INADDR_NONE; + rte->ire_metric5 = INADDR_NONE; - status = DeviceIoControl( tcpFile, - IOCTL_TCP_SET_INFORMATION_EX, - &req, - sizeof(req), - NULL, - 0, - &returnSize, - NULL ); + status = DeviceIoControl( tcpFile, + IOCTL_TCP_SET_INFORMATION_EX, + &req, + sizeof(req), + NULL, + 0, + &returnSize, + NULL ); + } + + closeTcpFile( tcpFile ); } - - if( tcpFile != INVALID_HANDLE_VALUE ) - closeTcpFile( tcpFile ); TRACE("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX);

1 0

[fireball] 31495: - Partially revert 31467 to unbreak devices installation.
by fireball＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: fireball Date: Sun Dec 30 00:39:15 2007 New Revision: 31495 URL: http://svn.reactos.org/svn/reactos?rev=31495&view=rev Log: - Partially revert 31467 to unbreak devices installation. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sun Dec 30 00:39:15 2007 @@ -405,13 +405,12 @@ case DevicePropertyLocationInformation: case DevicePropertyUINumber: { - LPCWSTR RegistryPropertyName; - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); - UNICODE_STRING ValueName; + LPWSTR RegistryPropertyName, KeyNameBuffer; + UNICODE_STRING KeyName, ValueName; OBJECT_ATTRIBUTES ObjectAttributes; KEY_VALUE_PARTIAL_INFORMATION *ValueInformation; ULONG ValueInformationLength; - HANDLE hEnum, KeyHandle; + HANDLE KeyHandle; NTSTATUS Status; switch (DeviceProperty) @@ -437,70 +436,62 @@ case DevicePropertyUINumber: RegistryPropertyName = L"UINumber"; break; default: - /* Should not happen */ - ASSERT(FALSE); - return STATUS_UNSUCCESSFUL; + RegistryPropertyName = NULL; break; } - DPRINT("Registry property %S\n", RegistryPropertyName); - - /* Open Enum key */ - InitializeObjectAttributes(&ObjectAttributes, &EnumU, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - /* Open instance key */ - InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->InstancePath, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hEnum, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); - ZwClose(hEnum); - if (!NT_SUCCESS(Status)) - return Status; - - /* Allocate buffer to read as much data as required by the caller */ - ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, - Data[0]) + BufferLength; - ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength); - if (!ValueInformation) - { - ZwClose(KeyHandle); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Read the value */ - RtlInitUnicodeString(&ValueName, RegistryPropertyName); - Status = ZwQueryValueKey(KeyHandle, &ValueName, - KeyValuePartialInformation, ValueInformation, - ValueInformationLength, - &ValueInformationLength); - ZwClose(KeyHandle); - - if (!NT_SUCCESS(Status)) - { - ExFreePool(ValueInformation); - if (Status == STATUS_BUFFER_OVERFLOW) - { - *ResultLength = ValueInformation->DataLength; - return STATUS_BUFFER_TOO_SMALL; - } - else - { - *ResultLength = 0; - return Status; - } - } - - /* Return data */ - *ResultLength = ValueInformation->DataLength; - /* FIXME: Verify the value (NULL-terminated, correct format). */ - RtlCopyMemory(PropertyBuffer, ValueInformation->Data, - ValueInformation->DataLength); - ExFreePool(ValueInformation); - - return STATUS_SUCCESS; - } + KeyNameBuffer = ExAllocatePool(PagedPool, + (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); + + DPRINT("KeyNameBuffer: 0x%p, value %S\n", KeyNameBuffer, RegistryPropertyName); + + if (KeyNameBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyNameBuffer, DeviceNode->InstancePath.Buffer); + RtlInitUnicodeString(&KeyName, KeyNameBuffer); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, + OBJ_CASE_INSENSITIVE, NULL, NULL); + + Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + ExFreePool(KeyNameBuffer); + if (!NT_SUCCESS(Status)) + return Status; + + RtlInitUnicodeString(&ValueName, RegistryPropertyName); + ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, + Data[0]) + BufferLength; + ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength); + if (ValueInformation == NULL) + { + ZwClose(KeyHandle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ZwQueryValueKey(KeyHandle, &ValueName, + KeyValuePartialInformation, ValueInformation, + ValueInformationLength, + &ValueInformationLength); + *ResultLength = ValueInformation->DataLength; + ZwClose(KeyHandle); + + if (!NT_SUCCESS(Status)) + { + ExFreePool(ValueInformation); + if (Status == STATUS_BUFFER_OVERFLOW) + return STATUS_BUFFER_TOO_SMALL; + else + return Status; + } + + /* FIXME: Verify the value (NULL-terminated, correct format). */ + + RtlCopyMemory(PropertyBuffer, ValueInformation->Data, + ValueInformation->DataLength); + ExFreePool(ValueInformation); + + return STATUS_SUCCESS; + } case DevicePropertyBootConfiguration: Length = 0; @@ -521,36 +512,43 @@ Data = &DeviceNode->BootResources; break; - case DevicePropertyEnumeratorName: - /* A buffer overflow can't happen here, since InstancePath - * always contains the enumerator name followed by \\ */ - Ptr = wcschr(DeviceNode->InstancePath.Buffer, L'\\'); - ASSERT(Ptr); - Length = (Ptr - DeviceNode->InstancePath.Buffer + 1) * sizeof(WCHAR); - Data = DeviceNode->InstancePath.Buffer; - break; - - case DevicePropertyPhysicalDeviceObjectName: - /* InstancePath buffer is NULL terminated, so we can do this */ - Length = DeviceNode->InstancePath.MaximumLength; - Data = DeviceNode->InstancePath.Buffer; - break; - - default: - return STATUS_INVALID_PARAMETER_2; - } - - /* Prepare returned values */ - *ResultLength = Length; - if (BufferLength < Length) - return STATUS_BUFFER_TOO_SMALL; - RtlCopyMemory(PropertyBuffer, Data, Length); - - /* NULL terminate the string (if required) */ - if (DeviceProperty == DevicePropertyEnumeratorName) - ((LPWSTR)PropertyBuffer)[Length / sizeof(WCHAR)] = UNICODE_NULL; - - return STATUS_SUCCESS; + case DevicePropertyEnumeratorName: + Ptr = wcschr(DeviceNode->InstancePath.Buffer, L'\\'); + if (Ptr != NULL) + { + Length = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)DeviceNode->InstancePath.Buffer) + sizeof(WCHAR); + Data = DeviceNode->InstancePath.Buffer; + } + else + { + Length = 0; + Data = NULL; + } + break; + + case DevicePropertyPhysicalDeviceObjectName: + Length = DeviceNode->InstancePath.Length + sizeof(WCHAR); + Data = DeviceNode->InstancePath.Buffer; + break; + + default: + return STATUS_INVALID_PARAMETER_2; + } + + *ResultLength = Length; + if (BufferLength < Length) + return STATUS_BUFFER_TOO_SMALL; + RtlCopyMemory(PropertyBuffer, Data, Length); + + /* Terminate the string */ + if (DeviceProperty == DevicePropertyEnumeratorName + || DeviceProperty == DevicePropertyPhysicalDeviceObjectName) + { + Ptr = (PWSTR)PropertyBuffer; + Ptr[(Length / sizeof(WCHAR)) - 1] = 0; + } + + return STATUS_SUCCESS; } /* @@ -1603,98 +1601,98 @@ IopGetParentIdPrefix(PDEVICE_NODE DeviceNode, PUNICODE_STRING ParentIdPrefix) { - ULONG BufferLength; - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); - PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation; - UNICODE_STRING KeyValue; - UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"ParentIdPrefix"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hEnum, hKey = NULL; - ULONG crc32; - NTSTATUS Status; - - /* Allocate a buffer big enough to read a MAX_PATH prefix */ - BufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); - ParentIdPrefixInformation = ExAllocatePool(PagedPool, BufferLength + sizeof(WCHAR)); - - /* Check if allocation succeeded */ - if (!ParentIdPrefixInformation) - { - Status = STATUS_NO_MEMORY; - goto cleanup; - } - - /* Open enum key */ - InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - goto cleanup; - - /* Open instance key */ - InitializeObjectAttributes(&ObjectAttributes, &DeviceNode->Parent->InstancePath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, hEnum, NULL); - Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); - ZwClose(hEnum); - if (!NT_SUCCESS(Status)) - goto cleanup; - - /* Read the prefix */ - Status = ZwQueryValueKey( - hKey, &ValueName, - KeyValuePartialInformation, ParentIdPrefixInformation, - BufferLength, &BufferLength); - if (NT_SUCCESS(Status)) - { - /* Yes, we read something */ - if (ParentIdPrefixInformation->Type != REG_SZ) - /* Hm, it was of the wrong type. Fail */ - Status = STATUS_UNSUCCESSFUL; - else - { - /* OK, value is correct ; prepare to return it */ - KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; - KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; - if (KeyValue.Length && KeyValue.Buffer[KeyValue.Length / sizeof(WCHAR) - 1] == UNICODE_NULL); - KeyValue.Length -= sizeof(WCHAR); - } - - /* We're done */ - goto cleanup; - } - - /* Check if we failed due to value not calculated */ - if (Status != STATUS_OBJECT_NAME_NOT_FOUND) - /* Another reason, fail */ - goto cleanup; - - /* Compute the prefix string of the parent */ - crc32 = RtlComputeCrc32(0, - (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, - DeviceNode->Parent->InstancePath.Length); - - /* Prepare the value to return */ - /* (yes, it's safe to reuse ParentIdPrefixInformation buffer, which is at least MAX_PATH WCHARs long */ - swprintf((PWSTR)ParentIdPrefixInformation, L"%lx&%lx", DeviceNode->Parent->Level, crc32); - RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation); - - /* 3. Try to write the ParentIdPrefix to registry */ - Status = ZwSetValueKey(hKey, - &ValueName, - 0, - REG_SZ, - (PVOID)KeyValue.Buffer, - KeyValue.MaximumLength); + ULONG KeyNameBufferLength; + PWSTR KeyNameBuffer = NULL; + PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; + UNICODE_STRING KeyName; + UNICODE_STRING KeyValue; + UNICODE_STRING ValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hKey = NULL; + ULONG crc32; + NTSTATUS Status; + + /* HACK: As long as some devices have a NULL device + * instance path, the following test is required :( + */ + if (DeviceNode->Parent->InstancePath.Length == 0) + { + DPRINT1("Parent of %wZ has NULL Instance path, please report!\n", + &DeviceNode->InstancePath); + return STATUS_UNSUCCESSFUL; + } + + /* 1. Try to retrieve ParentIdPrefix from registry */ + KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); + ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); + if (!ParentIdPrefixInformation) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); + if (!KeyNameBuffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); + RtlInitUnicodeString(&KeyName, KeyNameBuffer); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + goto cleanup; + RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); + Status = ZwQueryValueKey( + hKey, &ValueName, + KeyValuePartialInformation, ParentIdPrefixInformation, + KeyNameBufferLength, &KeyNameBufferLength); + if (NT_SUCCESS(Status)) + { + if (ParentIdPrefixInformation->Type != REG_SZ) + Status = STATUS_UNSUCCESSFUL; + else + { + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; + KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + } + goto cleanup; + } + if (Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength; + KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data; + goto cleanup; + } + + /* 2. Create the ParentIdPrefix value */ + crc32 = RtlComputeCrc32(0, + (PUCHAR)DeviceNode->Parent->InstancePath.Buffer, + DeviceNode->Parent->InstancePath.Length); + + swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32); + RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data); + + /* 3. Try to write the ParentIdPrefix to registry */ + Status = ZwSetValueKey(hKey, + &ValueName, + 0, + REG_SZ, + (PVOID)KeyValue.Buffer, + (wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR)); cleanup: - if (NT_SUCCESS(Status)) - { - /* Duplicate the string to return it */ - Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); - } - /* General cleanup */ - ExFreePool(ParentIdPrefixInformation); - if (hKey != NULL) - ZwClose(hKey); - return Status; + if (NT_SUCCESS(Status)) + { + /* Duplicate the string to return it */ + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix); + } + ExFreePool(ParentIdPrefixInformation); + ExFreePool(KeyNameBuffer); + if (hKey != NULL) + ZwClose(hKey); + return Status; } @@ -1724,9 +1722,9 @@ IO_STATUS_BLOCK IoStatusBlock; PDEVICE_NODE ParentDeviceNode; WCHAR InstancePath[MAX_PATH]; - UNICODE_STRING InstancePathU = { 0, sizeof(InstancePath), InstancePath }; IO_STACK_LOCATION Stack; NTSTATUS Status; + PWSTR KeyBuffer; PWSTR Ptr; USHORT Length; USHORT TotalLength; @@ -1788,7 +1786,12 @@ if (NT_SUCCESS(Status)) { /* Copy the device id string */ - RtlAppendUnicodeToString(&InstancePathU, (PWSTR)IoStatusBlock.Information); + wcscpy(InstancePath, (PWSTR)IoStatusBlock.Information); + + /* + * FIXME: Check for valid characters, if there is invalid characters + * then bugcheck. + */ } else { @@ -1826,16 +1829,21 @@ if (NT_SUCCESS(Status)) { /* Append the instance id string */ - RtlAppendUnicodeToString(&InstancePathU, L"\\"); + wcscat(InstancePath, L"\\"); if (ParentIdPrefix.Length > 0) { /* Add information from parent bus device to InstancePath */ - RtlAppendUnicodeStringToString(&InstancePathU, &ParentIdPrefix); + wcscat(InstancePath, ParentIdPrefix.Buffer); if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information) - RtlAppendUnicodeToString(&InstancePathU, L"&"); + wcscat(InstancePath, L"&"); } if (IoStatusBlock.Information) - RtlAppendUnicodeToString(&InstancePathU, (PWSTR)IoStatusBlock.Information); + wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); + + /* + * FIXME: Check for valid characters, if there is invalid characters + * then bugcheck + */ } else { @@ -1843,25 +1851,29 @@ } RtlFreeUnicodeString(&ParentIdPrefix); - /* - * FIXME: Check for valid characters, if there is invalid characters - * then bugcheck. - */ - - Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &InstancePathU, &DeviceNode->InstancePath); - if (!NT_SUCCESS(Status)) - { - DPRINT("No resources\n"); - /* FIXME: Cleanup and disable device */ - } - - DPRINT("InstancePath is %wZ\n", &DeviceNode->InstancePath); - - /* Create registry key for the instance id, if it doesn't exist yet */ - Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey); - if (!NT_SUCCESS(Status)) - DPRINT1("IopCreateDeviceKeyPath('%wZ') failed (Status 0x%08lx)\n", &DeviceNode->InstancePath, Status); + if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) + { + DPRINT("No resources\n"); + /* FIXME: Cleanup and disable device */ + } + + DPRINT("InstancePath is %S\n", DeviceNode->InstancePath.Buffer); + + /* + * Create registry key for the instance id, if it doesn't exist yet + */ + KeyBuffer = ExAllocatePool( + PagedPool, + (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); + wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); + Status = IopCreateDeviceKeyPath(/*KeyBuffer*/&DeviceNode->InstancePath, &InstanceKey); + ExFreePool(KeyBuffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); + } + { /* Set 'Capabilities' value */ @@ -2312,106 +2324,102 @@ IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, PVOID Context) { - RTL_QUERY_REGISTRY_TABLE QueryTable[4]; - PDEVICE_NODE ParentDeviceNode; - PUNICODE_STRING Service; - UNICODE_STRING ClassGUID; - NTSTATUS Status; - - DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); - - ParentDeviceNode = (PDEVICE_NODE)Context; - - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } - - /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument - */ - ASSERT(DeviceNode->Parent == ParentDeviceNode); - - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT); - HANDLE hEnum; - - /* Open Enum key */ - InitializeObjectAttributes(&ObjectAttributes, &EnumU, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL) - Status = ZwOpenKey(&hEnum, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return Status; - } - - /* Prepare query table */ - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - Service = &DeviceNode->ServiceName; - RtlInitUnicodeString(Service, NULL); - RtlInitUnicodeString(&ClassGUID, NULL); - - /* Hopefully, this string is always NULL terminated */ - QueryTable[0].Name = DeviceNode->InstancePath.Buffer; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_SUBKEY; - - QueryTable[1].Name = L"Service"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].EntryContext = Service; - - QueryTable[2].Name = L"ClassGUID"; - QueryTable[2].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[2].EntryContext = &ClassGUID; - QueryTable[2].DefaultType = REG_SZ; - QueryTable[2].DefaultData = L""; - QueryTable[2].DefaultLength = 0; - - /* Read registry */ - Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, (PWSTR)hEnum, - QueryTable, NULL, NULL); - ZwClose(hEnum); - - /* Check for an error */ - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", - &DeviceNode->InstancePath, Status); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_SUCCESS; - } - - /* Check for a NULL service */ - if (Service->Length == 0) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - - if (ClassGUID.Length != 0) - { - /* Device has a ClassGUID value, but no Service value. - * Suppose it is using the NULL driver, so state the - * device is started */ - DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - DeviceNode->Flags |= DN_STARTED; - } - return STATUS_SUCCESS; - } - - DPRINT("Got Service %wZ\n", Service); - } - - return STATUS_SUCCESS; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + PDEVICE_NODE ParentDeviceNode; + PUNICODE_STRING Service; + UNICODE_STRING ClassGUID; + NTSTATUS Status; + + DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); + + ParentDeviceNode = (PDEVICE_NODE)Context; + + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } + + /* + * Make sure this device node is a direct child of the parent device node + * that is given as an argument + */ + if (DeviceNode->Parent != ParentDeviceNode) + { + /* Stop the traversal immediately and indicate successful operation */ + DPRINT("Stop\n"); + return STATUS_UNSUCCESSFUL; + } + + if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) + { + WCHAR RegKeyBuffer[MAX_PATH]; + UNICODE_STRING RegKey; + + RegKey.Length = 0; + RegKey.MaximumLength = sizeof(RegKeyBuffer); + RegKey.Buffer = RegKeyBuffer; + + /* + * Retrieve configuration from Enum key + */ + + Service = &DeviceNode->ServiceName; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + RtlInitUnicodeString(Service, NULL); + RtlInitUnicodeString(&ClassGUID, NULL); + + QueryTable[0].Name = L"Service"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = Service; + + QueryTable[1].Name = L"ClassGUID"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ClassGUID; + QueryTable[1].DefaultType = REG_SZ; + QueryTable[1].DefaultData = L""; + QueryTable[1].DefaultLength = 0; + + RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegKey.Buffer, QueryTable, NULL, NULL); + + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + &DeviceNode->InstancePath, Status); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_SUCCESS; + } + + if (Service->Buffer == NULL) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + + if (ClassGUID.Length != 0) + { + /* Device has a ClassGUID value, but no Service value. + * Suppose it is using the NULL driver, so state the + * device is started */ + DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + DeviceNode->Flags |= DN_STARTED; + } + return STATUS_SUCCESS; + } + + DPRINT("Got Service %S\n", Service->Buffer); + } + + return STATUS_SUCCESS; } /* @@ -2463,11 +2471,16 @@ * Make sure this device node is a direct child of the parent device node * that is given as an argument */ +#if 0 if (DeviceNode->Parent != ParentDeviceNode) { - DPRINT("Not a direct child\n"); - return STATUS_UNSUCCESSFUL; - } + /* + * Stop the traversal immediately and indicate unsuccessful operation + */ + DPRINT("Stop\n"); + return STATUS_UNSUCCESSFUL; + } +#endif if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) && @@ -2545,8 +2558,8 @@ IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ - DPRINT("Initialization of service %wZ failed (Status %x)\n", - &DeviceNode->ServiceName, Status); + CPRINT("Initialization of service %S failed (Status %x)\n", + DeviceNode->ServiceName.Buffer, Status); } } }

1 0

[dchapyshev] 31494: Add 8 bits and 16 bits icons
by dchapyshev＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: dchapyshev Date: Sat Dec 29 19:02:48 2007 New Revision: 31494 URL: http://svn.reactos.org/svn/reactos?rev=31494&view=rev Log: Add 8 bits and 16 bits icons Modified: trunk/reactos/base/shell/cmd/res/terminal.ico Modified: trunk/reactos/base/shell/cmd/res/terminal.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/res/termina… ============================================================================== Binary files - no diff available.

1 0

[fireball] 31493: - Slightly reformat GetETM's code.
by fireball＠svn.reactos.org 29 Dec '07

29 Dec '07

Author: fireball Date: Sat Dec 29 18:27:19 2007 New Revision: 31493 URL: http://svn.reactos.org/svn/reactos?rev=31493&view=rev Log: - Slightly reformat GetETM's code. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Dec 29 18:27:19 2007 @@ -1591,10 +1591,10 @@ EXTTEXTMETRIC *petm) { BOOL Ret = NtGdiGetETM(hdc, petm); - if ( Ret ) - { - if ( petm ) petm->emKernPairs = GetKerningPairsA(hdc, 0, 0); - } + + if (Ret && petm) + petm->emKernPairs = GetKerningPairsA(hdc, 0, 0); + return Ret; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs