Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 14746: Correct install name
by chorns＠svn.reactos.com 22 Apr '05

22 Apr '05

Correct install name Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-22 14:58:22 UTC (rev 14745) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-04-22 15:03:28 UTC (rev 14746) @@ -1,4 +1,4 @@ -<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="debugout.sys"> +<module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> <bootstrap base="reactos" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library>

1 0

[navaraf] 14745: Fix a typo. Spotted by Potapnik.
by navaraf＠svn.reactos.com 22 Apr '05

22 Apr '05

Fix a typo. Spotted by Potapnik. Modified: trunk/reactos/subsys/system/reactos/Cz.rc _____ Modified: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 14:58:22 UTC (rev 14745) @@ -6,7 +6,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CAPTION "Instalace ReactOS" - IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohot CD!\n\n"\ + IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohoto CD!\n\n"\ "ProsÝm restartujte poÞÝtaÞ z tohoto CD aby jste nainstalovali ReactOS." END

1 0

[navaraf] 14744: Denzil <d3nzil@gmail.com>
by navaraf＠svn.reactos.com 22 Apr '05

22 Apr '05

Denzil <d3nzil(a)gmail.com> Czech translation of Calc, SndVol32, WineFile and Autorun applications. Added: trunk/reactos/subsys/system/calc/Cz.rc Modified: trunk/reactos/subsys/system/calc/rsrc.rc Added: trunk/reactos/subsys/system/reactos/Cz.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc Added: trunk/reactos/subsys/system/sndvol32/Cz.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Added: trunk/reactos/subsys/system/winefile/cz.rc Modified: trunk/reactos/subsys/system/winefile/winefile.rc _____ Added: trunk/reactos/subsys/system/calc/Cz.rc --- trunk/reactos/subsys/system/calc/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/calc/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,157 @@ +/* + * Czech language support + * + * WineCalc (En.rc) + * + * Copyright 2005 Denzil <d3nzil(a)gmail.com> + * + * 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 + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulßtor" + + IDS_COPYRIGHT1, "Kalkulßtor 5.0. Licencovßn pod LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Zpýt" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_ERR_INVALID_INPUT, "Neplatn² vstup pro funkci." + IDS_ERR_DIVIDE_BY_ZERO, "Nelze dýlit nulou." + IDS_ERR_UNDEFINED, "V²sledek funkce nenÝ definovßn." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "èestnßctkovÚ\tF5", ID_CALC_NS_HEX + MENUITEM "DesÝtkovÚ\tF6", ID_CALC_NS_DEC + MENUITEM "OsmiÞkovÚ\tF7", ID_CALC_NS_OCT + MENUITEM "DvojkovÚ\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Stupný\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radißny\tF3", ID_CALC_MS_RADIANS + MENUITEM "Grady\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Editace" { + MENUITEM "&KopÝrovat Ctrl+C", IDM_COPY + MENUITEM "&Vlo×it Ctrl+V", IDM_PASTE + } + POPUP "&ZobrazenÝ" { + MENUITEM "StandartnÝ", IDM_MODE_STANDARD + MENUITEM "VýdeckÚ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "èestnßctkovÚ\tF5", ID_CALC_NS_HEX + MENUITEM "DesÝtkovÚ\tF6", ID_CALC_NS_DEC + MENUITEM "OsmiÞkovÚ\tF7", ID_CALC_NS_OCT + MENUITEM "DvojkovÚ\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "SeskupovßnÝ ÞÝslic", IDM_DIGIT_GROUPING + } + POPUP "&Pomoc" { + MENUITEM "TÚmata nßpovýdy", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "O Kalkulßtoru", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "O GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Co je toto?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END _____ Modified: trunk/reactos/subsys/system/calc/rsrc.rc --- trunk/reactos/subsys/system/calc/rsrc.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/calc/rsrc.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -22,6 +22,7 @@ #include "resource.h" #include "En.rc" +#include "Cz.rc" #include "De.rc" #include "Es.rc" #include "Fr.rc" _____ Added: trunk/reactos/subsys/system/reactos/Cz.rc --- trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/reactos/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,13 @@ +/* $Id: En.rc 12852 2005-01-06 13:58:04Z denzil $ */ + +LANGUAGE LANG_CZECH, SUBLANG_DFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Instalace ReactOS" + IDS_TEXT "ReactOS nelze instalovat p°Ýmo z tohot CD!\n\n"\ + "ProsÝm restartujte poÞÝtaÞ z tohoto CD aby jste nainstalovali ReactOS." +END + +/* EOF */ _____ Modified: trunk/reactos/subsys/system/reactos/reactos.rc --- trunk/reactos/subsys/system/reactos/reactos.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/reactos/reactos.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -16,8 +16,9 @@ /* Language-specific resources */ +#include "En.rc" +#include "Cz.rc" #include "De.rc" -#include "En.rc" #include "Sv.rc" /* EOF */ _____ Added: trunk/reactos/subsys/system/sndvol32/Cz.rc --- trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/sndvol32/Cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,41 @@ +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&NastavenÝ" + BEGIN + MENUITEM "&Mo×nosti", IDC_PROPERTIES + MENUITEM "&RozÜÝ°enÚ nastevenÝ", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "&Konec", IDC_EXIT + END + POPUP "&Pomoc" + BEGIN + MENUITEM "&TÚmata nßpovýdy", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&O ovlßdßnÝ hlasitosti ...", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "OvlßdßnÝ hlasitosti" + IDS_NOMIXERDEVICES "Nejsou dostupnÚ ×ßdnÚ smýÜovacÝ za°ÝzenÝ! Aplikace se nynÝ ukonÞÝ." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Mo×nosti" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&SmýÜovacÝ za°ÝzenÝ:", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "Upravit hlasitost pro:", -1, 7,25,211,77 + PUSHBUTTON "&P°ehrßvßnÝ", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&Zßznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "&JinÚ:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + + PUSHBUTTON "OK", IDOK, 114,226,50,14 + PUSHBUTTON "ZruÜit", IDCANCEL, 168,226,50,14 +END _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -15,5 +15,6 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico #include "En.rc" +#include "Cz.rc" #include "De.rc" #include "Sv.rc" _____ Added: trunk/reactos/subsys/system/winefile/cz.rc --- trunk/reactos/subsys/system/winefile/cz.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/winefile/cz.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -0,0 +1,211 @@ +/* + * WineFile + * Czech Language Support + * + * Copyright 2005 Denzil <d3nzil(a)gmail.com> + * + * 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_CZECH, SUBLANG_DEFAULT +#pragma code_page(1250) + + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Soubor" { + MENUITEM "&Otev°Ýt\tEnter" , 101 + MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE + MENUITEM "&KopÝrovat...\tF8" , 107 + MENUITEM "&Ve schrßnce...\tF9" , 118 + MENUITEM "&Smazat\tDel" , 108 + MENUITEM "P°&ejmenovat..." , 109 + MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprese..." , 119 + MENUITEM "&Dekomprese..." , 120 + MENUITEM SEPARATOR + MENUITEM "&Spustit..." , ID_EXECUTE + MENUITEM "&Tisknout..." , 102 + MENUITEM "Asociovat..." , 103 + MENUITEM SEPARATOR + MENUITEM "V&ytvo°it adresß°..." , 111 + MENUITEM "&Hledat..." , 104 + MENUITEM "&Zvolit voubory..." , 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "K&onec\tAlt+X" , ID_FILE_EXIT +#else + MENUITEM "K&onec", ID_FILE_EXIT +#endif + } + + POPUP "&Disk" { + MENUITEM "&KopÝrovat disk..." , 201 + MENUITEM "&Jmenovka disk..." , 202 + MENUITEM SEPARATOR + MENUITEM "&Formßtovat disk..." , 203 +#ifdef _WIN95 + MENUITEM "&Vytvo°it systemov² disk...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "P°ipojit &sÝØovÚ za°ÝzenÝ" , 252 + MENUITEM "&Odpojit &sÝØovÚ za°ÝzenÝ" , 253 + MENUITEM SEPARATOR + MENUITEM "SdÝlet jako..." , 254 + MENUITEM "&Odstranit sdÝlenÝ..." , 255 + MENUITEM SEPARATOR + MENUITEM "&Zvolit za°ÝzenÝ..." , 251 + } + + POPUP "&Adresß°e" { + MENUITEM "&DalÜÝ ·rove?\t+" , 301 + MENUITEM "Rozbalit &strom\t*" , 302 + MENUITEM "Rozbalit &vÜe\tStrg+*" , 303 + MENUITEM "Sbalit &strom\t-" , 304 + MENUITEM SEPARATOR + MENUITEM "&OznaÞit potomky" , 505 + } + + POPUP "&ZobrazenÝ" { + MENUITEM "&Strom a adresß°e" , 413 + MENUITEM "&Jen strom" , 411 + MENUITEM "Jen &adresß°e" , 412 + MENUITEM SEPARATOR + MENUITEM "&Rozdýlit" , 414 + MENUITEM SEPARATOR + MENUITEM "&JmÚno" , ID_VIEW_NAME + MENUITEM "&Detaily vÜech soubor¨" , ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "?ß&steÞnÚ detaily..." , ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&T°Ýdit podle jmÚna" , 404 + MENUITEM "T°Ýdit &podle typu" , 405 + MENUITEM "T°Ýdit podle &velikosti" , 406 + MENUITEM "T°Ýdit podle &data" , 407 + MENUITEM SEPARATOR + MENUITEM "T°Ýdit podle &..." , 409 + } + + POPUP "&NastavenÝ" { + MENUITEM "&PotvrzovßnÝ..." , -1 + MENUITEM "&PÝsmo..." , ID_SELECT_FONT + MENUITEM "Upravit panel &nßstroj¨..." , -1 + MENUITEM SEPARATOR + MENUITEM "&Panel nßstroj¨" , ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Panel za°ÝenÝ" , ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Stavov² °ßdek" , ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "&Celaß obrazovka\tCtrl+Shift+S" , ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&Minimalizovat p°i spuÜtýnÝ" , -1 + MENUITEM "&Ulo×it nastavenÝ p°i vypnutÝ" , 511 + } + + + POPUP "&ZabezpeÞenÝ" { + MENUITEM "&P°Ýstup..." , 605 + MENUITEM "&LogovßnÝ..." , 606 + MENUITEM "&VlastnÝk..." , 607 + } + + POPUP "&Okno" { + MENUITEM "NovÚ &okno" , ID_WINDOW_NEW + MENUITEM "KaskßdovßnÝ\tCtrl+F5" , ID_WINDOW_CASCADE + MENUITEM "Uspo°ßdat &horizontßlný" , ID_WINDOW_TILE_HORZ + MENUITEM "Uspo°ßdat &vertikßlný\tCtrl+F4" , ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Zarovnat automaticky" , ID_WINDOW_AUTOSORT +#endif + MENUITEM "Zarovnat &symboly" , ID_WINDOW_ARRANGE + MENUITEM "&Aktualizovat\tF5" , ID_REFRESH + } + + POPUP "&?" { + MENUITEM "&TÚmata nßpovýdy\tF1" , ID_HELP + MENUITEM "HledßnÝ v &nßpovýdý...\tF1" , ID_HELP + MENUITEM "&Jak pou×Ývat nßpovýdu\tF1" , ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Informace o &Winefile..." , ID_ABOUT +/* POPUP "Info..." { + MENUITEM "Informace o &Wine..." , ID_ABOUT_WINE +// MENUITEM "&Licence..." ID_LICENSE +// MENUITEM "&BEZ Z?RUKY" ID_NO_WARRANTY + } */ + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Spustit" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&P°Ýkaz:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "Jako &Symbol" , 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Pomoc" , 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Zvolte cÝl" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Cesta:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK" , 1, 158, 6, 47, 14 + PUSHBUTTON "ZruÜit" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Prochßzet" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "AplikovßnÝ nastavenÝ pÝsma" + IDS_FONT_SEL_ERROR "Chyba p°i volbý novÚho pÝsma." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Chyba" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Plocha" + IDS_SHELL "P°Ýkazov² °ßdek" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "ZatÝm neimplementovßno" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "JmÚno" + IDS_COL_SIZE "Velikost" + IDS_COL_CDATE "CDatum" + IDS_COL_ADATE "ADatum" + IDS_COL_MDATE "MDatum" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "Links" + IDS_COL_ATTR "Atributy" + IDS_COL_SEC "ZabezpeÞenÝ" +} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.rc --- trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-22 13:17:35 UTC (rev 14743) +++ trunk/reactos/subsys/system/winefile/winefile.rc 2005-04-22 13:54:08 UTC (rev 14744) @@ -27,8 +27,9 @@ /* include localised resources */ +#include "en.rc" +#include "cz.rc" #include "de.rc" -#include "en.rc" #include "es.rc" #include "fr.rc" #include "hu.rc"

1 0

[ion] 14743: Fix win32k building
by ion＠svn.reactos.com 22 Apr '05

22 Apr '05

Fix win32k building Modified: trunk/reactos/ntoskrnl/include/internal/mm.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-22 12:52:25 UTC (rev 14742) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-22 13:17:35 UTC (rev 14743) @@ -508,7 +508,7 @@ STDCALL MmCreatePeb(PEPROCESS Process); -PTEB +struct _TEB* STDCALL MmCreateTeb(PEPROCESS Process, PCLIENT_ID ClientId, @@ -517,7 +517,7 @@ VOID STDCALL MmDeleteTeb(PEPROCESS Process, - PTEB Teb); + struct _TEB* Teb); /* i386/pfault.c *************************************************************/

1 0

[ion] 14742: Thread Creation and Context Switching re-write, plus Idle/First Thread minimization attempt. Full changelog on ML, too large to post here
by ion＠svn.reactos.com 22 Apr '05

22 Apr '05

Thread Creation and Context Switching re-write, plus Idle/First Thread minimization attempt. Full changelog on ML, too large to post here Modified: trunk/reactos/ntoskrnl/Makefile.i386 Modified: trunk/reactos/ntoskrnl/include/internal/arch/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c Modified: trunk/reactos/ntoskrnl/kd/kdebug.c Modified: trunk/reactos/ntoskrnl/ke/i386/bios.c Deleted: trunk/reactos/ntoskrnl/ke/i386/bthread.S Added: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c Modified: trunk/reactos/ntoskrnl/ke/i386/idt.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c Deleted: trunk/reactos/ntoskrnl/ke/i386/tskswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/main.c Modified: trunk/reactos/ntoskrnl/ps/debug.c Modified: trunk/reactos/ntoskrnl/ps/idle.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/Makefile.i386 --- trunk/reactos/ntoskrnl/Makefile.i386 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/Makefile.i386 2005-04-22 12:52:25 UTC (rev 14742) @@ -17,9 +17,8 @@ ke/i386/thread.o \ ke/i386/usercall.o \ ke/i386/trap.o \ - ke/i386/bthread.o \ ke/i386/syscall.o \ - ke/i386/tskswitch.o \ + ke/i386/ctxswitch.o \ ke/i386/v86m.o \ ke/i386/v86m_sup.o \ ke/i386/vdm.o \ _____ Modified: trunk/reactos/ntoskrnl/include/internal/arch/ps.h --- trunk/reactos/ntoskrnl/include/internal/arch/ps.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/arch/ps.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -21,8 +21,7 @@ #ifdef i386 #include <internal/i386/ps.h> -#define KiArchContextSwitch Ki386ContextSwitch -#define KiArchInitThread Ke386InitThread +#define KiArchContextSwitch KiSwapContext #define KiArchInitThreadWithContext Ke386InitThreadWithContext #else #error "Unknown processor" _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -203,6 +203,28 @@ VOID KeCreateApplicationProcessorIdleThread(ULONG Id); +typedef +VOID +STDCALL +(*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, + PVOID StartContext); + +VOID +STDCALL +Ke386InitThreadWithContext(PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context); + +VOID +STDCALL +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame); + #ifdef CONFIG_SMP #define LOCK "lock ; " #else _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -27,8 +27,12 @@ #define KTHREAD_TEB 0x20 #define KTHREAD_KERNEL_STACK 0x28 #define KTHREAD_NPX_STATE 0x31 +#define KTHREAD_STATE 0x2D +#define KTHREAD_APCSTATE_PROCESS 0x34 + 0x10 #define KTHREAD_PENDING_USER_APC 0x34 + 0x16 -#define KTHREAD_APCSTATE_PROCESS 0x44 +#define KTHREAD_PENDING_KERNEL_APC 0x34 + 0x15 +#define KTHREAD_CONTEXT_SWITCHES 0x4C +#define KTHREAD_WAIT_IRQL 0x54 #define KTHREAD_SERVICE_TABLE 0xDC #define KTHREAD_PREVIOUS_MODE 0x137 #define KTHREAD_TRAP_FRAME 0x128 @@ -44,7 +48,9 @@ #define KPCR_EXCEPTION_LIST 0x0 #define KPCR_INITIAL_STACK 0x4 +#define KPCR_STACK_LIMIT 0x8 #define KPCR_SELF 0x1C +#define KPCR_GDT 0x3C #define KPCR_TSS 0x40 #define KPCR_CURRENT_THREAD 0x124 #define KPCR_NPX_THREAD 0x2A4 @@ -298,17 +304,6 @@ #endif /* __USE_W32API */ -VOID -Ki386ContextSwitch(struct _KTHREAD* NewThread, - struct _KTHREAD* OldThread); -NTSTATUS -Ke386InitThread(struct _KTHREAD* Thread, PKSTART_ROUTINE fn, - PVOID StartContext); -NTSTATUS -Ke386InitThreadWithContext(struct _KTHREAD* Thread, PCONTEXT Context); -NTSTATUS -Ki386ValidateUserContext(PCONTEXT Context); - #endif /* __ASM__ */ #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_PS_H */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -114,6 +114,10 @@ NTSTATUS STDCALL KeSuspendThread(PKTHREAD Thread); + +NTSTATUS +FASTCALL +KiSwapContext(PKTHREAD NewThread); /* gmutex.c ********************************************************************/ @@ -238,9 +242,16 @@ VOID inline FASTCALL KeReleaseDispatcherDatabaseLock(KIRQL Irql); VOID inline FASTCALL KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID); -VOID +VOID STDCALL -KeInitializeThread(struct _KPROCESS* Process, PKTHREAD Thread, BOOLEAN First); +KeInitializeThread(struct _KPROCESS* Process, + PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context, + PVOID Teb, + PVOID KernelStack); VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -508,6 +508,17 @@ STDCALL MmCreatePeb(PEPROCESS Process); +PTEB +STDCALL +MmCreateTeb(PEPROCESS Process, + PCLIENT_ID ClientId, + PINITIAL_TEB InitialTeb); + +VOID +STDCALL +MmDeleteTeb(PEPROCESS Process, + PTEB Teb); + /* i386/pfault.c *************************************************************/ NTSTATUS MmPageFault(ULONG Cs, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-22 12:52:25 UTC (rev 14742) @@ -497,7 +497,18 @@ PEPROCESS Parent OPTIONAL); - +VOID +STDCALL +PspSystemThreadStartup(PKSTART_ROUTINE StartRoutine, + PVOID StartContext); + +NTSTATUS +PsInitializeIdleOrFirstThread ( + PEPROCESS Process, + PETHREAD* ThreadPtr, + PKSTART_ROUTINE StartRoutine, + KPROCESSOR_MODE AccessMode, + BOOLEAN First); /* * Internal thread priorities, added by Phillip Susi * TODO: rebalence these to make use of all priorities... the ones above 16 _____ Modified: trunk/reactos/ntoskrnl/kd/gdbstub.c --- trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/kd/gdbstub.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -131,6 +131,20 @@ #define EIP_REGNO 8 +typedef +VOID +STDCALL_FUNC +(*PKSYSTEM_ROUTINE)(PKSTART_ROUTINE StartRoutine, + PVOID StartContext); + +VOID +STDCALL +KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + BOOLEAN UserThread, + KTRAP_FRAME TrapFrame); + static CPU_REGISTER GspRegisters[NUMREGS] = { { 4, FIELD_OFFSET (KTRAP_FRAME_X86, Eax), FIELD_OFFSET (CONTEXT, Eax), TRUE }, @@ -582,7 +596,7 @@ * This thread has not been sheduled yet so assume it * is still in PsBeginThreadWithContextInternal(). */ - Value = (ULONG) PsBeginThreadWithContextInternal; + Value = (ULONG)KiThreadStartup; } else { _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -426,7 +426,7 @@ VOID STDCALL KdSystemDebugControl(ULONG Code) { - extern VOID PsDumpThreads(BOOLEAN IncludeSystem); + extern VOID STDCALL PspDumpThreads(BOOLEAN IncludeSystem); /* A - Dump the entire contents of the non-paged pool. */ if (Code == 0) @@ -462,12 +462,12 @@ /* F */ else if (Code == 5) { - PsDumpThreads(TRUE); + PspDumpThreads(TRUE); } /* G */ else if (Code == 6) { - PsDumpThreads(FALSE); + PspDumpThreads(FALSE); } /* H */ else if (Code == 7) _____ Modified: trunk/reactos/ntoskrnl/ke/i386/bios.c --- trunk/reactos/ntoskrnl/ke/i386/bios.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/bios.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/bthread.S --- trunk/reactos/ntoskrnl/ke/i386/bthread.S 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/bthread.S 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,146 +0,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2000 David Welch <welch(a)cwcom.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/bthread.S - * PURPOSE: Trap handlers - * PROGRAMMER: David Welch (david.welch(a)seh.ox.ac.uk) - */ - -/* INCLUDES ******************************************************************/ - -#include <ddk/status.h> -#include <internal/i386/segment.h> -#include <internal/ps.h> -#include <ddk/defines.h> - -/* Values for contextflags */ -#define CONTEXT_i386 0x10000 -#ifndef CONTEXT_CONTROL -#define CONTEXT_CONTROL (CONTEXT_i386 | 1) -#endif -#ifndef CONTEXT_INTEGER -#define CONTEXT_INTEGER (CONTEXT_i386 | 2) -#endif -#ifndef CONTEXT_SEGMENTS -#define CONTEXT_SEGMENTS (CONTEXT_i386 | 4) -#endif -#ifndef CONTEXT_FLOATING_POINT -#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 8) -#endif -#ifndef CONTEXT_DEBUG_REGISTERS -#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x10) -#endif -#ifndef CONTEXT_FULL -#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) -#endif - -/* FUNCTIONS *****************************************************************/ - -/* - * - */ - -.globl _PsBeginThreadWithContextInternal -.globl _PsBeginThread - -_PsBeginThread: - /* - * This isn't really a function, we are called as the return address - * of the context switch function - */ - - /* - * Do the necessary prolog after a context switch - */ - call _PiBeforeBeginThread - - /* - * Call the actual start of the thread - */ - movl 4(%esp), %ebx /* Start routine */ - movl 8(%esp), %eax /* Start context */ - pushl %eax - call *%ebx /* Call the start routine */ - addl $4, %esp - - /* - * Terminate the thread - */ - pushl %eax - call _PsTerminateSystemThread@4 - addl $4, %esp - - /* - * If that fails then bug check - */ - pushl $0 - call _KeBugCheck@4 - addl $4, %esp - - /* - * And if that fails then loop - */ -.1: - jmp .1 - - -_PsBeginThreadWithContextInternal: - /* - * This isn't really a function, we are called as the return - * address of a context switch - */ - - /* - * Do the necessary prolog before the context switch - */ - call _PiBeforeBeginThread - - /* - * Load the context flags. - */ - popl %ebx - - /* - * Load the debugging registers - */ - testl $(CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386), %ebx - jz .L1 - popl %eax /* Dr0 */ - movl %eax, %dr0 - popl %eax /* Dr1 */ - movl %eax, %dr1 - popl %eax /* Dr2 */ - movl %eax, %dr2 - popl %eax /* Dr3 */ - movl %eax, %dr3 - popl %eax /* Dr6 */ - movl %eax, %dr6 - popl %eax /* Dr7 */ - movl %eax, %dr7 - jmp .L3 -.L1: - addl $24, %esp -.L3: - - /* Load the rest of the thread's user mode context. */ - movl $0, %eax - jmp _KiServiceExit _____ Added: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-04-22 12:52:25 UTC (rev 14742) @@ -0,0 +1,290 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ke/i386/ctxswitch.S + * PURPOSE: Thread Context Switching + * + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <roscfg.h> +#include <internal/i386/segment.h> +#include <internal/i386/ke.h> +#include <internal/i386/fpu.h> +#include <internal/ps.h> +#include <ntos/tss.h> +#include <internal/ntoskrnl.h> +.intel_syntax noprefix + +#define Running 2 +#define SIZEOF_TRAP_FRAME 0x8c +#define APC_LEVEL 1 + +/* GLOBALS ****************************************************************/ + +/* FUNCTIONS ****************************************************************/ + +/*++ + * KiThreadStartup + * + * The KiThreadStartup routine is the beginning of any thread. + * + * Params: + * SystemRoutine - Pointer to the System Startup Routine. Either + * PspUserThreadStartup or PspSystemThreadStartup + * + * StartRoutine - For Kernel Threads only, specifies the starting execution + * point of the new thread. + * + * StartContext - For Kernel Threads only, specifies a pointer to variable + * context data to be sent to the StartRoutine above. + * + * UserThread - Indicates whether or not this is a user thread. This tells + * us if the thread has a context or not. + * + * TrapFrame - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * Returns: + * Should never return for a system thread. Returns through the System Call + * Exit Dispatcher for a user thread. + * + * Remarks: + * If a return from a system thread is detected, a bug check will occur. + * + *--*/ +.globl _KiThreadStartup@156 +_KiThreadStartup@156: + + /* + * Clear all the non-volatile registers, so the thread won't be tempted to + * expect any static data (like some badly coded usermode/win9x apps do) + */ + xor ebx, ebx + xor esi, edi + xor edi, edi + xor ebp, ebp + + /* It's now safe to go to APC */ + mov ecx, APC_LEVEL + call @KfLowerIrql@4 + + /* + * Call the System Routine which is right on our stack now. + * After we pop the pointer, the Start Routine/Context will be on the + * stack, as parameters to the System Routine + */ + pop eax + call eax + + /* The thread returned... was it a user-thread? */ + pop ecx + or ecx, ecx + jz BadThread + + /* Yes it was, set our trapframe for the System Call Exit Dispatcher */ + mov ebp, esp + + /* Exit back to user-mode */ + jmp _KiServiceExit + +BadThread: + + /* A system thread returned...this is very bad! */ + int 3 + +/*++ + * KiSwapContextInternal + * + * The KiSwapContextInternal routine switches context to another thread. + * + * Params: + * ESI - Pointer to the KTHREAD to which the caller wishes to + * switch to. + * EDI - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * Returns: + * None. + * + * Remarks: + * Absolutely all registers except ESP can be trampled here for maximum code flexibility. + * + *--*/ +.globl @KiSwapContextInternal@0 +@KiSwapContextInternal@0: + + /* Get the PCR. It's faster to use ebx+offset then fs:offset */ + mov ebx, [fs:0x1C] + + /* Set the Thread to running */ + mov byte ptr [esi+KTHREAD_STATE], Running + + /* Save the Exception list */ + push [ebx+KPCR_EXCEPTION_LIST] + + /* Switching, disable interrupts now */ + cli + +#ifdef CONFIG_SMP + /* Save FPU state if the thread has used it. */ + mov [ebx+KPCR_NPX_THREAD], 0 + test byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_DIRTY + jz 3f + mov eax, [edi+KTHREAD_INITIAL_STACK] + cmp _FxsrSupport, 0 + je 1f + fxsave [eax-SIZEOF_FX_SAVE_AREA] + jmp 2f +1: + fnsave [eax-SIZEOF_FX_SAVE_AREA] +2: + mov byte ptr [edi+KTHREAD_INITIAL_STACK], NPX_STATE_VALID +3: +#endif /* CONFIG_SMP */ + + /* Save the stack pointer in this processors TSS */ + mov ebp, [ebx+KPCR_TSS] + push ss:[ebp+KTSS_ESP0] + + /* Switch stacks */ + mov [edi+KTHREAD_KERNEL_STACK], esp + mov esp, [esi+KTHREAD_KERNEL_STACK] + + /* Stack is OK, safe to enable interrupts now */ + sti + + /* Check if address space switch is needed */ + mov eax, [edi+KTHREAD_APCSTATE_PROCESS] + cmp eax, [esi+KTHREAD_APCSTATE_PROCESS] + + /* If they match, then use the fast-path and skip all this */ + jz SameProcess + + /* Get the new Process. */ + mov edi, [esi+KTHREAD_APCSTATE_PROCESS] + + /* Check if we need an LDT */ + xor eax, eax + cmp [edi+KPROCESS_LDT_DESCRIPTOR0], eax + jz NoLdt + + /* Write the LDT Selector */ + mov ebp, [ebx+KPCR_GDT] + mov eax, [edi+KPROCESS_LDT_DESCRIPTOR0] + mov [ebp+LDT_SELECTOR], eax + mov eax, [edi+KPROCESS_LDT_DESCRIPTOR1] + mov [ebp+LDT_SELECTOR+4], eax + + /* Save LDT Selector */ + mov eax, LDT_SELECTOR + +NoLdt: + + /* Load LDT */ + lldt ax + + /* Get the IOPM */ + mov ecx, [edi+KPROCESS_IOPM_OFFSET] + + /* Set current IOPM offset in the TSS */ + mov [ebp+KTSS_IOMAPBASE], cx + + /* Change the address space */ + mov eax, [edi+KPROCESS_DIRECTORY_TABLE_BASE] + mov cr3, eax + +SameProcess: + + /* Set the TEB */ + mov eax, [esi+KTHREAD_TEB] + mov ecx, [ebx+KPCR_GDT] + mov [ecx+0x3A], ax + shr eax, 16 + mov [ecx+0x3C], al + mov [ecx+0x3F], ah + + /* Increase context switches */ + inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] + + /* Set TS in cr0 to catch FPU code and load the FPU state when needed */ +#ifndef CONFIG_SMP + cmp [ebx+KPCR_NPX_THREAD], esi + je 4f +#endif /* !CONFIG_SMP */ + mov eax, cr0 + or eax, X86_CR0_TS + mov cr0, eax +4: + + /* Restore the stack pointer in this processors TSS */ + pop ss:[ebp+KTSS_ESP0] + + /* Restore exception list */ + pop [ebx+KPCR_EXCEPTION_LIST] + + call @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 + + /* Return */ + ret + +/*++ + * KiSwapContext + * + * The KiSwapContext routine switches context to another thread. + * + * Params: + * TargetThread - Pointer to the KTHREAD to which the caller wishes to + * switch to. + * + * Returns: + * The WaitStatus of the Target Thread. NOT YET SUPPORTED. + * + * Remarks: + * This is a wrapper around KiSwapContextInternal which will save all the + * non-volatile registers so that the Internal function can use all of + * them. It will also save the old current thread and set the new one. + * + * The calling thread does not return after KiSwapContextInternal until + * another thread switches to IT. + * + *--*/ +.globl @KiSwapContext@4 +@KiSwapContext@4: + + /* Note, we CANNOT touch ebp */ + + /* Save 4 registers */ + sub esp, 4 * 4 + + /* Save all the non-volatile ones */ + mov [esp+12], ebx + mov [esp+8], esi + mov [esp+4], edi + mov [esp+0], ebp + + /* Get the Current Thread */ + mov edi, fs:[KPCR_CURRENT_THREAD] + + /* Get the New Thread */ + mov esi, ecx + + /* Save it as Current thread */ + mov fs:[KPCR_CURRENT_THREAD], esi + + /* Do the swap with the registers correctly setup */ + call @KiSwapContextInternal@0 + + /* Return the registers */ + mov ebp, [esp+0] + mov esi, [esp+4] + mov edi, [esp+8] + mov ebx, [esp+12] + + /* Clean stack */ + add esp, 4 * 4 + + ret + _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -502,6 +502,7 @@ */ if (Tf->Eflags & (1 << 17)) { + DPRINT("Tf->Eflags, %x, Tf->Eip %x, ExceptionNr: %d\n", Tf->Eflags, Tf->Eip, ExceptionNr); return(KeV86Exception(ExceptionNr, Tf, cr2)); } @@ -511,7 +512,7 @@ if (PsGetCurrentThread() != NULL && Esp0 < (ULONG)PsGetCurrentThread()->Tcb.StackLimit) { - DbgPrint("Stack underflow (tf->esp %x Limit %x)\n", + DPRINT1("Stack underflow (tf->esp %x Limit %x)\n", Esp0, (ULONG)PsGetCurrentThread()->Tcb.StackLimit); ExceptionNr = 12; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c --- trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/ntoskrnl/ke/i386/idt.c --- trunk/reactos/ntoskrnl/ke/i386/idt.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/idt.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -133,7 +133,7 @@ IdleProcessorMask |= (1 << KeGetCurrentProcessorNumber()); KeReleaseDispatcherDatabaseLock(oldIrql); } - + VOID INIT_FUNCTION KeCreateApplicationProcessorIdleThread(ULONG Id) @@ -141,11 +141,11 @@ PETHREAD IdleThread; PKPRCB Prcb = ((PKPCR)((ULONG_PTR)KPCR_BASE + Id * PAGE_SIZE))->Prcb; - PsInitializeThread(PsIdleProcess, + PsInitializeIdleOrFirstThread(PsIdleProcess, &IdleThread, NULL, - KernelMode, - FALSE); + KernelMode, + FALSE); IdleThread->Tcb.State = Running; IdleThread->Tcb.FreezeCount = 0; IdleThread->Tcb.Affinity = 1 << Id; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c --- trunk/reactos/ntoskrnl/ke/i386/ldt.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c --- trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-04-22 12:46:27 UTC (rev 14741) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c 2005-04-22 12:52:25 UTC (rev 14742) @@ -1,11 +1,10 @@ -/* $Id:$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/thread.c - * PURPOSE: Architecture multitasking functions + * PURPOSE: i386 Thread Context Creation * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ****************************************************************/ @@ -13,172 +12,177 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +typedef struct _KSHARED_CTXSWITCH_FRAME { + ULONG Esp0; + PVOID ExceptionList; + PVOID RetEip; +} KSHARED_CTXSWITCH_FRAME, *PKSHARED_CTXSWITCH_FRAME; -/* FUNCTIONS *****************************************************************/ +typedef struct _KSTART_FRAME { + PKSYSTEM_ROUTINE SystemRoutine; + PKSTART_ROUTINE StartRoutine; + PVOID StartContext; + BOOLEAN UserThread; +} KSTART_FRAME, *PKSTART_FRAME; -NTSTATUS -Ki386ValidateUserContext(PCONTEXT Context) /* - * FUNCTION: Validates a processor context - * ARGUMENTS: - * Context = Context to validate - * RETURNS: Status - * NOTE: This only validates the context as not violating system security, it - * doesn't guararantee the thread won't crash at some point - * NOTE2: This relies on there only being two selectors which can access - * system space + * This is the Initial Thread Stack Frame on i386. + * + * It is composed of : + * + * - A shared Thread Switching frame so that we can use + * the context-switching code when initializing the thread. + * + * - The Stack Frame for KiThreadStartup, which are the parameters + * that it will receive (System/Start Routines & Context) + * + * - A Trap Frame with the Initial Context *IF AND ONLY IF THE THREAD IS USER* + * + * - The FPU Save Area, theoretically part of the Trap Frame's "ExtendedRegisters" + * + * This Initial Thread Stack Frame starts at Thread->InitialStack and it spans + * a total size of 0x2B8 bytes. */ -{ - if (Context->Eip >= KERNEL_BASE) - { - return(STATUS_UNSUCCESSFUL); - } - if (Context->SegCs == KERNEL_CS) - { - return(STATUS_UNSUCCESSFUL); - } - if (Context->SegDs == KERNEL_DS) - { - return(STATUS_UNSUCCESSFUL); - } - if (Context->SegEs == KERNEL_DS) - { - return(STATUS_UNSUCCESSFUL); - } - if (Context->SegFs == KERNEL_DS) - { - return(STATUS_UNSUCCESSFUL); - } - if (Context->SegGs == KERNEL_DS) - { - return(STATUS_UNSUCCESSFUL); - } - if ((Context->EFlags & X86_EFLAGS_IOPL) != 0 || - (Context->EFlags & X86_EFLAGS_NT) || - (Context->EFlags & X86_EFLAGS_VM) || - (!(Context->EFlags & X86_EFLAGS_IF))) - { - return(STATUS_UNSUCCESSFUL); - } - return(STATUS_SUCCESS); -} +typedef struct _KUINIT_FRAME { + KSHARED_CTXSWITCH_FRAME CtxSwitchFrame; /* -0x2B8 */ + KSTART_FRAME StartFrame; /* -0x2AC */ + KTRAP_FRAME TrapFrame; /* -0x29C */ + FX_SAVE_AREA FxSaveArea; /* -0x210 */ +} KUINIT_FRAME, *PKUINIT_FRAME; -NTSTATUS -Ke386InitThreadWithContext(PKTHREAD Thread, PCONTEXT Context) -{ - PULONG KernelStack; - ULONG InitSize; - PKTRAP_FRAME TrapFrame; - PFX_SAVE_AREA FxSaveArea; +typedef struct _KKINIT_FRAME { + KSHARED_CTXSWITCH_FRAME CtxSwitchFrame; /* -0x22C */ + KSTART_FRAME StartFrame; /* -0x220 */ + FX_SAVE_AREA FxSaveArea; /* -0x210 */ +} KKINIT_FRAME, *PKKINIT_FRAME; - /* - * Setup a stack frame for exit from the task switching routine - */ - - InitSize = 6 * sizeof(DWORD) + sizeof(DWORD) + 6 * sizeof(DWORD) + - + sizeof(KTRAP_FRAME) + sizeof (FX_SAVE_AREA); - KernelStack = (PULONG)((char*)Thread->KernelStack - InitSize); +/* FUNCTIONS *****************************************************************/ - /* Set up the initial frame for the return from the dispatcher. */ - KernelStack[0] = (ULONG)Thread->InitialStack - sizeof(FX_SAVE_AREA); /* TSS->Esp0 */ - KernelStack[1] = 0; /* EDI */ - KernelStack[2] = 0; /* ESI */ - KernelStack[3] = 0; /* EBX */ - KernelStack[4] = 0; /* EBP */ - KernelStack[5] = (ULONG)&PsBeginThreadWithContextInternal; /* EIP */ +VOID +STDCALL +Ke386InitThreadWithContext(PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context) +{ + PFX_SAVE_AREA FxSaveArea; + PKSTART_FRAME StartFrame; + PKSHARED_CTXSWITCH_FRAME CtxSwitchFrame; + PKTRAP_FRAME TrapFrame = NULL; + + /* Check if this is a With-Context Thread */ + DPRINT("Ke386InitThreadContext\n"); + if (Context) { + + /* Set up the Initial Frame */ + PKUINIT_FRAME InitFrame; + InitFrame = (PKUINIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KUINIT_FRAME)); + DPRINT("Setting up a user-mode thread with the Frame at: %x\n", InitFrame); + + /* Setup the Fx Area */ + FxSaveArea = &InitFrame->FxSaveArea; + DPRINT("Fx Save Area: %x\n", FxSaveArea); + + /* Setup the Initial Fx State */ + if (KiContextToFxSaveArea(FxSaveArea, Context)) { - /* Save the context flags. */ - KernelStack[6] = Context->ContextFlags; - - /* Set up the initial values of the debugging registers. */ - KernelStack[7] = Context->Dr0; - KernelStack[8] = Context->Dr1; - KernelStack[9] = Context->Dr2; - KernelStack[10] = Context->Dr3; - KernelStack[11] = Context->Dr6; - KernelStack[12] = Context->Dr7; - - /* Set up a trap frame from the context. */ - TrapFrame = (PKTRAP_FRAME)(&KernelStack[13]); - TrapFrame->DebugEbp = (PVOID)Context->Ebp; - TrapFrame->DebugEip = (PVOID)Context->Eip; - TrapFrame->DebugArgMark = 0; - TrapFrame->DebugPointer = 0; - TrapFrame->TempCs = 0; - TrapFrame->TempEip = 0; - TrapFrame->Gs = (USHORT)Context->SegGs; - TrapFrame->Es = (USHORT)Context->SegEs; - TrapFrame->Ds = (USHORT)Context->SegDs; - TrapFrame->Edx = Context->Edx; - TrapFrame->Ecx = Context->Ecx; - TrapFrame->Eax = Context->Eax; - TrapFrame->PreviousMode = UserMode; - TrapFrame->ExceptionList = (PVOID)0xFFFFFFFF; - TrapFrame->Fs = TEB_SELECTOR; - TrapFrame->Edi = Context->Edi; - TrapFrame->Esi = Context->Esi; - TrapFrame->Ebx = Context->Ebx; - TrapFrame->Ebp = Context->Ebp; - TrapFrame->ErrorCode = 0; - TrapFrame->Cs = Context->SegCs; - TrapFrame->Eip = Context->Eip; - TrapFrame->Eflags = Context->EFlags | X86_EFLAGS_IF; - TrapFrame->Eflags &= ~(X86_EFLAGS_VM | X86_EFLAGS_NT | X86_EFLAGS_IOPL); - TrapFrame->Esp = Context->Esp; - TrapFrame->Ss = (USHORT)Context->SegSs; - /* FIXME: Should check for a v86 mode context here. */ - - /* Set up the initial floating point state. */ - /* FIXME: Do we have to zero the FxSaveArea or is it already? */ - FxSaveArea = (PFX_SAVE_AREA)((ULONG_PTR)KernelStack + InitSize - sizeof(FX_SAVE_AREA)); - if (KiContextToFxSaveArea(FxSaveArea, Context)) - { - Thread->NpxState = NPX_STATE_VALID; + Thread->NpxState = NPX_STATE_VALID; + + } else { [truncated at 1000 lines; 2134 more skipped]

1 0

[arty] 14741: Removed a useless temporary from router setting.
by arty＠svn.reactos.com 22 Apr '05

22 Apr '05

Removed a useless temporary from router setting. Use option 6, DHO_DOMAIN_NAME_SERVERS to get name servers from dhcp server. Fix wrong variable in nameserver setting. Router and Nameserver now correctly acquired from DHCP. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-22 12:43:16 UTC (rev 14740) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-22 12:46:27 UTC (rev 14741) @@ -437,12 +437,12 @@ } void set_name_servers( struct client_lease *new_lease ) { - if( new_lease->options[DHO_NAME_SERVERS].len ) { + if( new_lease->options[DHO_DOMAIN_NAME_SERVERS].len ) { HKEY RegKey; struct iaddr nameserver; char *nsbuf; int i, addrs = - new_lease->options[DHO_NAME_SERVERS].len / sizeof(ULONG); + new_lease->options[DHO_DOMAIN_NAME_SERVERS].len / sizeof(ULONG); nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); nsbuf[0] = 0; @@ -452,9 +452,10 @@ "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, KEY_WRITE, &RegKey ) ) { for( i = 0; i < addrs; i++ ) { + nameserver.len = sizeof(ULONG); memcpy( nameserver.iabuf, - new_lease->options[DHO_NAME_SERVERS].data + - (addrs * sizeof(ULONG)), sizeof(ULONG) ); + new_lease->options[DHO_DOMAIN_NAME_SERVERS].data + + (i * sizeof(ULONG)), sizeof(ULONG) ); strcat( nsbuf, piaddr(nameserver) ); if( i != addrs-1 ) strcat( nsbuf, "," ); } @@ -475,6 +476,7 @@ if( Adapter->NteContext ) DeleteIPAddress( Adapter->NteContext ); + /* Set up our default router if we got one from the DHCP server */ if( new_lease->options[DHO_SUBNET_MASK].len ) { NTSTATUS Status; @@ -496,22 +498,19 @@ if( new_lease->options[DHO_ROUTERS].len ) { MIB_IPFORWARDROW RouterMib; NTSTATUS Status; - struct iaddr router; - memcpy( netmask.iabuf, - new_lease->options[DHO_ROUTERS].data, - new_lease->options[DHO_ROUTERS].len ); - RouterMib.dwForwardDest = 0; /* Default route */ RouterMib.dwForwardMask = 0; RouterMib.dwForwardMetric1 = 1; if( old_default_route ) { + /* If we set a default route before, delete it before continuing */ RouterMib.dwForwardDest = old_default_route; DeleteIpForwardEntry( &RouterMib ); } - RouterMib.dwForwardNextHop = *((ULONG*)router.iabuf); + RouterMib.dwForwardNextHop = + *((ULONG*)new_lease->options[DHO_ROUTERS].data); Status = CreateIpForwardEntry( &RouterMib );

1 0

[ion] 14740: Switch to NT5
by ion＠svn.reactos.com 22 Apr '05

22 Apr '05

Switch to NT5 Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-04-22 12:42:35 UTC (rev 14739) +++ trunk/reactos/bootdata/hivesft.inf 2005-04-22 12:43:16 UTC (rev 14740) @@ -13,9 +13,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"4.0" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 6" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"1381" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.0" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 3" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"2195" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe)

1 0

[ion] 14739: Put back GUI Shell
by ion＠svn.reactos.com 22 Apr '05

22 Apr '05

Put back GUI Shell Modified: trunk/reactos/bootdata/hivesft.inf _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-04-22 10:12:37 UTC (rev 14738) +++ trunk/reactos/bootdata/hivesft.inf 2005-04-22 12:42:35 UTC (rev 14739) @@ -725,8 +725,8 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x 00,0x00 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" -;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" +;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe"

1 0

[chorns] 14738: * Remove empty line
by chorns＠svn.reactos.com 22 Apr '05

22 Apr '05

* Remove empty line * Rearrange some dependencies Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 09:45:17 UTC (rev 14737) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 10:12:37 UTC (rev 14738) @@ -1403,12 +1403,14 @@ fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); fprintf ( fMakefile, - "\t%s -rc $@ %s\n\n", + "\t%s -rc $@ %s\n", ar.c_str (), objs_macro.c_str ()); GenerateCleanObjectsAsYouGoCode (); + fprintf ( fMakefile, "\n" ); + return archiveFilename; } @@ -2037,8 +2039,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.entrypoint.c_str (), @@ -2085,7 +2086,7 @@ { GenerateRules (); - string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.entrypoint.c_str (), @@ -2131,8 +2132,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", module.entrypoint.c_str (), @@ -2178,8 +2178,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", module.entrypoint.c_str (), @@ -2249,7 +2248,7 @@ { GenerateRules (); - string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linker; if ( module.cplusplus ) @@ -2301,8 +2300,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linker; if ( module.cplusplus ) @@ -2354,8 +2352,7 @@ { GenerateRules (); - string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linker; if ( module.cplusplus ) @@ -2836,7 +2833,7 @@ { GenerateRules (); - string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro; string linker; if ( module.cplusplus )

1 0

[arty] 14737: tcpmisc.h:
by arty＠svn.reactos.com 22 Apr '05

22 Apr '05

tcpmisc.h: - Correct wrongly sized struct IPAddrEntry. dhcp: dhclient.c and dispatch.c - remove lots of #if 0 - remove instances of script_go and associated stuff - write stub check_arp pending ARP api functions being implemented - introduced S_STATIC state for adapters dhcp: api.c: - Do add_protocol and send_discover when telling an adapter to lease. - Do remove_protocol when we make an adapter static. dhcp: adapter.c: - Add infrastructure for finding the adapter key in the registry - Check for IP address settings and apply as static if set, otherwise dynamic tcpip: *info and lan: - Set info types to DEBUG_INFO and DEBUG_DATALINK everywhere tcpip: lan: - Remove kernel IP configuration. bootdata: - Added dhcp service and make it start. - Removed static IP address settings from the default configuration - Removed old JS bootcode Modified: trunk/reactos/bootdata/hivesft.inf Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/drivers/lib/ip/network/loopback.c Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/net/tcpip/include/debug.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/iinfo.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c Modified: trunk/reactos/subsys/system/dhcp/Makefile Modified: trunk/reactos/subsys/system/dhcp/adapter.c Modified: trunk/reactos/subsys/system/dhcp/api.c Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/dispatch.c Modified: trunk/reactos/subsys/system/dhcp/include/dhcpd.h Modified: trunk/reactos/subsys/system/dhcp/include/rosdhcp.h _____ Modified: trunk/reactos/bootdata/hivesft.inf --- trunk/reactos/bootdata/hivesft.inf 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/bootdata/hivesft.inf 2005-04-22 09:45:17 UTC (rev 14737) @@ -725,8 +725,8 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x 00,0x00 -;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" +HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\system32\cm d.exe" +;HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.ex e" HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartGUI",0x00010001,0x00000000 HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32 \userinit.exe" _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-22 09:45:17 UTC (rev 14737) @@ -293,9 +293,9 @@ HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Linkage","Route",0x000100 00,"3c90x1" HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters","SlotNumber", 0x00000000,"10" HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters","BusNumber",0 x00000000,"0" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Defau ltGateway",0x00010000,"10.0.0.1" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","IPAdd ress",0x00010000,"10.0.0.100" -HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Subne tMask",0x00010000,"255.255.255.0" +HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Defau ltGateway",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","IPAdd ress",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\3c90x1\Parameters\Tcpip","Subne tMask",0x00010000,"0.0.0.0" ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0 x00000001 @@ -446,6 +446,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x0 0000002 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00 000010 +; DHCP client service +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001 ,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Netwo rk" +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"% SystemRoot%\system32\dhcp.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x0000 0002 +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000 010 + ; Floppy driver HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x0001000 1,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Prim ary Disk" @@ -572,9 +579,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001","Port",0x00000000,"280" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001","Irq",0x00000000,"9" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001","NetworkAddress",0x00000000,"001122334455" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Defa ultGateway",0x00010000,"10.0.0.1" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","IPAd dress",0x00010000,"10.0.0.100" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Subn etMask",0x00010000,"255.255.255.0" +HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Defa ultGateway",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","IPAd dress",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Subn etMask",0x00010000,"0.0.0.0" ; one day this will happen automatically; until then we need this since ndis5 drivers ; rely on the fact that their resources are handed to them by ndis, so we have to find @@ -663,9 +670,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0000","BusNumber",0x00000000,"0" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}",,0x00000000,"Network Adapters" HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}\{RANDOMCFGGUIDFOR_PCNET1}\Connection","Name",0x00000000,"A MD PCNet (static Registry entry)" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"10.0.0.1" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"10.0.0.100" -HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Subne tMask",0x00010000,"255.255.255.0" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Defau ltGateway",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","IPAdd ress",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet1\Parameters\Tcpip","Subne tMask",0x00010000,"0.0.0.0" ; Named Pipe filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001, 0x00000000 @@ -867,100 +874,4 @@ HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000001 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Part ition1" HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000000 - -; ----------------------------- KJS Init ---------------------------- -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","kjsinit",0x00010000,\ -"function init(v) { var rk = '\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Kdb'; eval(System.regread(rk,v)); } for( i = 1; i <= 45; i++ ) { init((new Number(i)).toString()); }" - -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","1",0x00010000,\ -"function write(x) { System.print(x); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","2",0x00010000,\ -"function regs(n) { return System.regs(n); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","3",0x00010000,\ -"function debugebp() { return regs(0); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","4",0x00010000,\ -"function debugeip() { return regs(1); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","5",0x00010000,\ -"function tf_argmark() { return regs(2); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","6",0x00010000,\ -"function tf_pointer() { return regs(3); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","7",0x00010000,\ -"function tf_tempcs() { return regs(4); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","8",0x00010000,\ -"function tf_tempeip() { return regs(5); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","9",0x00010000,\ -"function dr0() { return regs(6); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","10",0x00010000,\ -"function dr1() { return regs(7); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","11",0x00010000,\ -"function dr2() { return regs(8); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","12",0x00010000,\ -"function dr3() { return regs(9); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","13",0x00010000,\ -"function dr6() { return regs(10); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","14",0x00010000,\ -"function dr7() { return regs(11); } " -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","15",0x00010000,\ -"function gs() { return regs(12) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","16",0x00010000,\ -"function es() { return regs(13) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","17",0x00010000,\ -"function ds() { return regs(14) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","18",0x00010000,\ -"function edx() { return regs(15); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","19",0x00010000,\ -"function ecx() { return regs(16); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","20",0x00010000,\ -"function eax() { return regs(17); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","21",0x00010000,\ -"function tf_pmode() { return regs(18); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","22",0x00010000,\ -"function tf_exl() { return regs(19); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","23",0x00010000,\ -"function fs() { return regs(20) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","24",0x00010000,\ -"function edi() { return regs(21); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","25",0x00010000,\ -"function esi() { return regs(22); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","26",0x00010000,\ -"function ebx() { return regs(23); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","27",0x00010000,\ -"function ebp() { return regs(24); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","28",0x00010000,\ -"function error_code() { return regs(25); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","29",0x00010000,\ -"function eip() { return regs(26); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","30",0x00010000,\ -"function cs() { return regs(27) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","31",0x00010000,\ -"function eflags() { return regs(28); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","32",0x00010000,\ -"function esp() { return regs(29); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","33",0x00010000,\ -"function ss() { return regs(30) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","34",0x00010000,\ -"function v86_es() { return regs(31) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","35",0x00010000,\ -"function v86_ds() { return regs(32) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","36",0x00010000,\ -"function v86_fs() { return regs(33) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","37",0x00010000,\ -"function v86_gs() { return regs(34) & 0xffff; }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","38",0x00010000,\ -"function peekl(a) { return System.mread(4,a); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","39",0x00010000,\ -"function pokel(a,b) { return System.mwrite(4,a,b); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","40",0x00010000,\ -"function peekw(a) { return System.mread(2,a); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","41",0x00010000,\ -"function pokew(a,b) { return System.mwrite(2,a,b); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","42",0x00010000,\ -"function peek(a) { return System.mread(1,a); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","43",0x00010000,\ -"function poke(a,b) { return System.mwrite(1,a,b); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","44",0x00010000,\ -"function regread(x,y) { return System.regread(x,y); }" -HKLM,"SYSTEM\CurrentControlSet\Control\Kdb","45",0x00010000,\ -"write('JS Registry Init Complete. Welcome to ReactOS kernel scripting');" - ; EOF _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-04-22 09:45:17 UTC (rev 14737) @@ -167,6 +167,7 @@ subsys\system\vmwinst\vmwinst.exe 1 subsys\system\winlogon\winlogon.exe 1 subsys\system\winefile\winefile.exe 1 +subsys\system\dhcp\dhcp.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 services\umpnpmgr\umpnpmgr.exe 1 _____ Modified: trunk/reactos/drivers/lib/ip/network/loopback.c --- trunk/reactos/drivers/lib/ip/network/loopback.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/lib/ip/network/loopback.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -189,6 +189,10 @@ Loopback = IPCreateInterface(&BindInfo); + Loopback->Name.Buffer = L"Loopback"; + Loopback->Name.MaximumLength = Loopback->Name.Length = + wcslen(Loopback->Name.Buffer) * sizeof(WCHAR); + AddrInitIPv4(&Loopback->Unicast, LOOPBACK_ADDRESS_IPv4); AddrInitIPv4(&Loopback->Netmask, LOOPBACK_ADDRMASK_IPv4); _____ Modified: trunk/reactos/drivers/net/tcpip/datalink/lan.c --- trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/net/tcpip/datalink/lan.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -366,6 +366,8 @@ PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; KIRQL OldIrql; + TI_DbgPrint(DEBUG_DATALINK,("called\n")); + TcpipAcquireSpinLock( &LanWorkLock, &OldIrql ); WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); @@ -408,6 +410,8 @@ { ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + TI_DbgPrint(DEBUG_DATALINK,("called\n")); + TransferDataCompleteCalled++; ASSERT(TransferDataCompleteCalled <= TransferDataCalled); @@ -736,59 +740,6 @@ return Status; } -static NTSTATUS ReadIPAddressFromRegistry( HANDLE RegHandle, - PWCHAR RegistryValue, - PIP_ADDRESS Address ) { - UNICODE_STRING ValueName; - UNICODE_STRING UnicodeAddress; - NTSTATUS Status; - ULONG ResultLength; - UCHAR buf[1024]; - PKEY_VALUE_PARTIAL_INFORMATION Information = (PKEY_VALUE_PARTIAL_INFORMATION)buf; - ANSI_STRING AnsiAddress; - ULONG AnsiLen; - - RtlInitUnicodeString(&ValueName, RegistryValue); - Status = - ZwQueryValueKey(RegHandle, - &ValueName, - KeyValuePartialInformation, - Information, - sizeof(buf), - &ResultLength); - - if (!NT_SUCCESS(Status)) - return Status; - /* IP address is stored as a REG_MULTI_SZ - we only pay attention to the first one though */ - TI_DbgPrint(MIN_TRACE, ("Information DataLength: 0x%x\n", Information->DataLength)); - - UnicodeAddress.Buffer = (PWCHAR)&Information->Data; - UnicodeAddress.Length = Information->DataLength; - UnicodeAddress.MaximumLength = Information->DataLength; - - AnsiLen = RtlUnicodeStringToAnsiSize(&UnicodeAddress); - if(!AnsiLen) - return STATUS_NO_MEMORY; - - AnsiAddress.Buffer = exAllocatePoolWithTag(PagedPool, AnsiLen, 0x01020304); - if(!AnsiAddress.Buffer) - return STATUS_NO_MEMORY; - - AnsiAddress.Length = AnsiLen; - AnsiAddress.MaximumLength = AnsiLen; - - Status = RtlUnicodeStringToAnsiString(&AnsiAddress, &UnicodeAddress, FALSE); - if (!NT_SUCCESS(Status)) { - exFreePool(AnsiAddress.Buffer); - return STATUS_UNSUCCESSFUL; - } - - AnsiAddress.Buffer[AnsiAddress.Length] = 0; - AddrInitIPv4(Address, inet_addr(AnsiAddress.Buffer)); - - return STATUS_SUCCESS; -} - static NTSTATUS ReadStringFromRegistry( HANDLE RegHandle, PWCHAR RegistryValue, PUNICODE_STRING String ) { @@ -1001,7 +952,7 @@ PIP_INTERFACE IF; NDIS_STATUS NdisStatus; LLIP_BIND_INFO BindInfo; - IP_ADDRESS DefaultGateway, DefaultMask = { 0 }; + IP_ADDRESS DefaultMask = { 0 }; ULONG Lookahead = LOOKAHEAD_SIZE; NTSTATUS Status; HANDLE RegHandle = 0; @@ -1055,20 +1006,10 @@ TI_DbgPrint(DEBUG_DATALINK,("Adapter Name: %wZ\n", &IF->Name)); } - if(NT_SUCCESS(Status)) - Status = ReadIPAddressFromRegistry( RegHandle, L"DefaultGateway", - &DefaultGateway ); - if(!NT_SUCCESS(Status)) { - Status = STATUS_SUCCESS; - RtlZeroMemory( &DefaultGateway, sizeof(DefaultGateway) ); - } + DefaultMask.Type = IP_ADDRESS_V4; - if(NT_SUCCESS(Status)) - Status = ReadIPAddressFromRegistry( RegHandle, L"IPAddress", - &IF->Unicast ); - if(NT_SUCCESS(Status)) - Status = ReadIPAddressFromRegistry( RegHandle, L"SubnetMask", - &IF->Netmask ); + IF->Unicast = DefaultMask; + IF->Netmask = DefaultMask; IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address = @@ -1077,33 +1018,6 @@ TI_DbgPrint(DEBUG_DATALINK,("BCAST(IF) %s\n", A2S(&IF->Broadcast))); - if(NT_SUCCESS(Status)) { - /* It's ok to fail some of the above. We'll just use DHCP. */ - TI_DbgPrint - (DEBUG_DATALINK, - ("--> Our IP address on this interface: '%s'\n", - A2S(&IF->Unicast))); - - TI_DbgPrint - (DEBUG_DATALINK, - ("--> Our net mask on this interface: '%s'\n", - A2S(&IF->Netmask))); - - if( DefaultGateway.Address.IPv4Address ) { - TI_DbgPrint - (DEBUG_DATALINK, - ("--> Our gateway is: '%s'\n", - A2S(&DefaultGateway))); - - /* Create a default route */ - RouterCreateRoute( &DefaultMask, /* Zero */ - &DefaultMask, /* Zero */ - &DefaultGateway, - IF, - 1 ); - } - } - /* Get maximum link speed */ NdisStatus = NDISCall(Adapter, NdisRequestQueryInformation, _____ Modified: trunk/reactos/drivers/net/tcpip/include/debug.h --- trunk/reactos/drivers/net/tcpip/include/debug.h 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/net/tcpip/include/debug.h 2005-04-22 09:45:17 UTC (rev 14737) @@ -32,6 +32,7 @@ #define DEBUG_NCACHE 0x00400000 #define DEBUG_CPOINT 0x00800000 #define DEBUG_LOCK 0x01000000 +#define DEBUG_INFO 0x02000000 #define DEBUG_ULTRA 0xFFFFFFFF #ifdef DBG _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/iinfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/iinfo.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/net/tcpip/tcpip/iinfo.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -21,7 +21,7 @@ ULONG Size; UINT DescrLenMax = MAX_IFDESCR_LEN - 1; - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("Getting IFEntry MIB (IF %08x LA %08x) (%04x:%d)\n", Interface, IF, ID->tei_entity, ID->tei_instance)); @@ -38,7 +38,7 @@ OutData->Type = Interface == Loopback ? MIB_IF_TYPE_LOOPBACK : MIB_IF_TYPE_ETHERNET; OutData->Mtu = Interface->MTU; - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("Getting interface speed\n")); OutData->PhysAddrLen = Interface->AddressLength; OutData->AdminStatus = MIB_IF_ADMIN_STATUS_UP; @@ -53,27 +53,28 @@ if( IF ) { GetInterfaceSpeed( Interface, (PUINT)&OutData->Speed ); - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("IF Speed = %d * 100bps\n", OutData->Speed)); memcpy(OutData->PhysAddr,Interface->Address,Interface->AddressLength); - TI_DbgPrint(MAX_TRACE, ("Got HWAddr\n")); - GetInterfaceName( Interface, IFDescr, MAX_IFDESCR_LEN - 1 ); - DescrLenMax = strlen( IFDescr ) + 1; + TI_DbgPrint(DEBUG_INFO, ("Got HWAddr\n")); } - IFDescr[DescrLenMax] = 0; /* Terminate ifdescr string */ + GetInterfaceName( Interface, IFDescr, MAX_IFDESCR_LEN - 1 ); + DescrLenMax = strlen( IFDescr ) + 1; - TI_DbgPrint(MAX_TRACE, ("Copied in name %s\n", IFDescr)); + TI_DbgPrint(DEBUG_INFO, ("Copied in name %s\n", IFDescr)); OutData->DescrLen = DescrLenMax; IFDescr += DescrLenMax; Size = IFDescr - (PCHAR)OutData + 1; - TI_DbgPrint(MAX_TRACE, ("Finished IFEntry MIB (%04x:%d) size %d\n", + TI_DbgPrint(DEBUG_INFO, ("Finished IFEntry MIB (%04x:%d) size %d\n", ID->tei_entity, ID->tei_instance, Size)); Status = InfoCopyOut( (PCHAR)OutData, Size, Buffer, BufferSize ); ExFreePool( OutData ); + TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status)); + return Status; } @@ -104,7 +105,7 @@ TDIEntityID *id, PCHAR Buffer, UINT BufferSize ) { - TI_DbgPrint(MAX_TRACE, ("Got Request: Class %x Type %x Id %x, EntityID %x:%x\n", + TI_DbgPrint(DEBUG_INFO, ("Got Request: Class %x Type %x Id %x, EntityID %x:%x\n", InfoClass, InfoId, id->tei_entity, id->tei_instance)); return TDI_INVALID_REQUEST; } _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c --- trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -28,7 +28,7 @@ KIRQL OldIrql; UINT Count = 0, i; - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("Inserting interface %08x (%d entities already)\n", Interface, EntityCount)); @@ -38,7 +38,7 @@ for( i = 0; i < EntityCount; i++ ) if( EntityList[i].tei_entity == IF_ENTITY ) { Count++; - TI_DbgPrint(MAX_TRACE, ("Entity %d is an IF. Found %d\n", + TI_DbgPrint(DEBUG_INFO, ("Entity %d is an IF. Found %d\n", i, Count)); } @@ -80,7 +80,7 @@ UINT Count, Size, BufSize = *BufferSize; KIRQL OldIrql; - TI_DbgPrint(MAX_TRACE,("About to copy %d TDIEntityIDs to user\n", + TI_DbgPrint(DEBUG_INFO,("About to copy %d TDIEntityIDs to user\n", EntityCount)); TcpipAcquireSpinLock(&EntityListLock, &OldIrql); @@ -134,7 +134,7 @@ BOOL FoundEntity = FALSE; InfoRequest_f InfoRequest = NULL; - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("InfoEx Req: %x %x %x!%04x:%d\n", ID->toi_class, ID->toi_type, @@ -148,7 +148,7 @@ if ((ID->toi_class != INFO_CLASS_GENERIC) || (ID->toi_type != INFO_TYPE_PROVIDER) || (ID->toi_id != ENTITY_LIST_ID)) { - TI_DbgPrint(MAX_TRACE,("Invalid parameter\n")); + TI_DbgPrint(DEBUG_INFO,("Invalid parameter\n")); Status = TDI_INVALID_PARAMETER; } else Status = InfoTdiQueryListEntities(Buffer, BufferSize); @@ -168,7 +168,7 @@ TcpipReleaseSpinLock( &EntityListLock, OldIrql ); if( FoundEntity ) { - TI_DbgPrint(MAX_TRACE, + TI_DbgPrint(DEBUG_INFO, ("Calling Entity %d (%04x:%d) InfoEx (%x,%x,%x)\n", i, ID->toi_entity.tei_entity, ID->toi_entity.tei_instance, @@ -183,7 +183,7 @@ } } - TI_DbgPrint(MAX_TRACE,("Status: %08x\n", Status)); + TI_DbgPrint(DEBUG_INFO,("Status: %08x\n", Status)); return Status; } _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c --- trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/drivers/net/tcpip/tcpip/ninfo.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -25,7 +25,7 @@ ExAllocatePool( NonPagedPool, sizeof( IPADDR_ENTRY ) * IfCount ); PIPADDR_ENTRY IpCurrent = IpAddress; - TI_DbgPrint(MAX_TRACE, ("Called.\n")); + TI_DbgPrint(DEBUG_INFO, ("Called.\n")); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); @@ -56,7 +56,7 @@ ExFreePool( IpAddress ); - TI_DbgPrint(MAX_TRACE, ("Returning %08x\n", Status)); + TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); return Status; } @@ -73,7 +73,7 @@ PIPROUTE_ENTRY RouteEntries = ExAllocatePool( NonPagedPool, Size ), RtCurrent = RouteEntries; - TI_DbgPrint(MAX_TRACE, ("Called, routes = %d, RCache = %08x\n", + TI_DbgPrint(DEBUG_INFO, ("Called, routes = %d, RCache = %08x\n", RtCount, RCache)); if( !RCache || !RouteEntries ) { @@ -106,7 +106,7 @@ RtCurrent->Type = TDI_ADDRESS_TYPE_IP; TI_DbgPrint - (MAX_TRACE, + (DEBUG_INFO, ("%d: NA %08x NM %08x GW %08x MT %x\n", RtCurrent - RouteEntries, RtCurrent->Dest, @@ -132,7 +132,7 @@ ExFreePool( RouteEntries ); ExFreePool( RCache ); - TI_DbgPrint(MAX_TRACE, ("Returning %08x\n", Status)); + TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); return Status; } @@ -144,7 +144,7 @@ UINT RouteCount = CountFIBs( NULL ); TDI_STATUS Status = TDI_INVALID_REQUEST; - TI_DbgPrint(MAX_TRACE, ("Called.\n")); + TI_DbgPrint(DEBUG_INFO, ("Called.\n")); RtlZeroMemory(&SnmpInfo, sizeof(IPSNMP_INFO)); @@ -155,7 +155,7 @@ Status = InfoCopyOut( (PCHAR)&SnmpInfo, sizeof(SnmpInfo), Buffer, BufferSize ); - TI_DbgPrint(MAX_TRACE, ("Returning %08x\n", Status)); + TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); return Status; } @@ -169,7 +169,7 @@ PUINT BufferSize ) { TDI_STATUS Status = TDI_INVALID_REQUEST; - TI_DbgPrint(MAX_TRACE, ("Called.\n")); + TI_DbgPrint(DEBUG_INFO, ("Called.\n")); switch( InfoClass ) { case INFO_CLASS_GENERIC: @@ -200,7 +200,7 @@ } } - TI_DbgPrint(MAX_TRACE, ("Returning %08x\n", Status)); + TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); return Status; } @@ -218,7 +218,7 @@ IP_ADDRESS Router; PNEIGHBOR_CACHE_ENTRY NCE; - TI_DbgPrint(MID_TRACE,("Called\n")); + TI_DbgPrint(DEBUG_INFO,("Called\n")); OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize ); @@ -232,7 +232,7 @@ AddrInitIPv4( &Router, Route->Gw ); if( Route->Type == IP_ROUTE_TYPE_ADD ) { /* Add the route */ - TI_DbgPrint(MID_TRACE,("Adding route (%s)\n", A2S(&Address))); + TI_DbgPrint(DEBUG_INFO,("Adding route (%s)\n", A2S(&Address))); /* Find the existing route this belongs to */ NCE = RouterGetRoute( &Router ); /* Really add the route */ @@ -243,12 +243,12 @@ else Status = STATUS_UNSUCCESSFUL; } else if( Route->Type == IP_ROUTE_TYPE_DEL ) { - TI_DbgPrint(MID_TRACE,("Removing route (%s)\n", A2S(&Address))); + TI_DbgPrint(DEBUG_INFO,("Removing route (%s)\n", A2S(&Address))); Status = RouterRemoveRoute( &Address, &Router ); } else Status = TDI_INVALID_REQUEST; } - TI_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status)); return Status; } _____ Modified: trunk/reactos/subsys/system/dhcp/Makefile --- trunk/reactos/subsys/system/dhcp/Makefile 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/subsys/system/dhcp/Makefile 2005-04-22 09:45:17 UTC (rev 14737) @@ -16,6 +16,8 @@ TARGET_SDKLIBS = iphlpapi.a ws2_32.a ntdll.a +TARGET_INSTALLDIR = system32 + TARGET_RC_SRCS = dhcp.rc TARGET_RC_BINSRC = _____ Modified: trunk/reactos/subsys/system/dhcp/adapter.c --- trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/subsys/system/dhcp/adapter.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -5,34 +5,212 @@ static WSADATA wsd; extern struct interface_info *ifi; -DWORD GetAddress( PDHCP_ADAPTER Adapter ) { - PMIB_IPADDRTABLE AddressTable = NULL; - ULONG i, Size = 0, NumAddressRows; - DWORD Error = GetIpAddrTable( AddressTable, &Size, FALSE ); +PCHAR *GetSubkeyNames( PCHAR MainKeyName, PCHAR Append ) { + int i = 0; + DWORD Error; + HKEY MainKey; + PCHAR *Out, OutKeyName; + DWORD CharTotal = 0, ThisKey, AppendLen = 1 + strlen(Append); + DWORD MaxSubKeyLen = 0, MaxSubKeys = 0; - while( Error == ERROR_INSUFFICIENT_BUFFER ) { - free( AddressTable ); - AddressTable = malloc( Size ); - if( AddressTable ) - Error = GetIpAddrTable( AddressTable, &Size, FALSE ); + Error = RegOpenKey( HKEY_LOCAL_MACHINE, MainKeyName, &MainKey ); + + if( Error ) return NULL; + + Error = RegQueryInfoKey + ( MainKey, + NULL, NULL, NULL, + &MaxSubKeys, &MaxSubKeyLen, + NULL, NULL, NULL, NULL, NULL, NULL ); + + DH_DbgPrint(MID_TRACE,("MaxSubKeys: %d, MaxSubKeyLen %d\n", + MaxSubKeys, MaxSubKeyLen)); + + CharTotal = (sizeof(PCHAR) + MaxSubKeyLen + AppendLen) * (MaxSubKeys + 1); + + DH_DbgPrint(MID_TRACE,("AppendLen: %d, CharTotal: %d\n", + AppendLen, CharTotal)); + + Out = malloc( CharTotal ); + OutKeyName = ((PCHAR)&Out[MaxSubKeys+1]); + + if( !Out ) { RegCloseKey( MainKey ); return NULL; } + + i = 0; + do { + Out[i] = OutKeyName; + Error = RegEnumKey( MainKey, i, OutKeyName, MaxSubKeyLen ); + if( !Error ) { + strcat( OutKeyName, Append ); + DH_DbgPrint(MID_TRACE,("[%d]: %s\n", i, OutKeyName)); + OutKeyName += strlen(OutKeyName) + 1; + i++; + } else Out[i] = 0; + } while( Error == ERROR_SUCCESS ); + + RegCloseKey( MainKey ); + + return Out; +} + +PCHAR RegReadString( HKEY Root, PCHAR Subkey, PCHAR Value ) { + PCHAR SubOut = NULL; + DWORD SubOutLen = 0, Error = 0; + HKEY ValueKey = NULL; + + DH_DbgPrint(MID_TRACE,("Looking in %x:%s:%s\n", Root, Subkey, Value )); + + if( Subkey && strlen(Subkey) ) { + if( RegOpenKey( Root, Subkey, &ValueKey ) != ERROR_SUCCESS ) + goto regerror; + } else ValueKey = Root; + + DH_DbgPrint(MID_TRACE,("Got Key %x\n", ValueKey)); + + if( (Error = RegQueryValueEx( ValueKey, Value, NULL, NULL, + SubOut, &SubOutLen )) != ERROR_SUCCESS ) + goto regerror; + + DH_DbgPrint(MID_TRACE,("Value %s has size %d\n", Value, SubOutLen)); + + if( !(SubOut = malloc(SubOutLen)) ) + goto regerror; + + if( (Error = RegQueryValueEx( ValueKey, Value, NULL, NULL, + SubOut, &SubOutLen )) != ERROR_SUCCESS ) + goto regerror; + + DH_DbgPrint(MID_TRACE,("Value %s is %s\n", Value, SubOut)); + + goto cleanup; + +regerror: + if( SubOut ) free( SubOut ); +cleanup: + if( ValueKey && ValueKey != Root ) { + DH_DbgPrint(MID_TRACE,("Closing key %x\n", ValueKey)); + RegCloseKey( ValueKey ); } - if( Error != ERROR_SUCCESS ) { - free( AddressTable ); - return Error; + + DH_DbgPrint(MID_TRACE,("Returning %x with error %d\n", SubOut, Error)); + + return SubOut; +} + +HKEY FindAdapterKey( PDHCP_ADAPTER Adapter ) { + int i = 0; + PCHAR EnumKeyName = + "SYSTEM\\CurrentControlSet\\Control\\Class\\" + "{4D36E972-E325-11CE-BFC1-08002BE10318}"; + PCHAR TargetKeyNameStart = + "SYSTEM\\CurrentControlSet\\Services\\"; + PCHAR TargetKeyNameEnd = "\\Parameters\\Tcpip"; + PCHAR TargetKeyName = NULL; + PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); + PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); + PCHAR RootDevice = NULL, DriverDesc = NULL; + HKEY EnumKey, OutKey = NULL; + DWORD Error = ERROR_SUCCESS; + + if( !EnumKeysLinkage || !EnumKeysTop ) goto cleanup; + + Error = RegOpenKey( HKEY_LOCAL_MACHINE, EnumKeyName, &EnumKey ); + + if( Error ) goto cleanup; + + for( i = 0; EnumKeysLinkage[i]; i++ ) { + RootDevice = RegReadString + ( EnumKey, EnumKeysLinkage[i], "RootDevice" ); + DriverDesc = RegReadString + ( EnumKey, EnumKeysTop[i], "DriverDesc" ); + + if( DriverDesc && + !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) { + TargetKeyName = + malloc( strlen( TargetKeyNameStart ) + + strlen( RootDevice ) + + strlen( TargetKeyNameEnd ) + 1 ); + if( !TargetKeyName ) goto cleanup; + sprintf( TargetKeyName, "%s%s%s", + TargetKeyNameStart, RootDevice, TargetKeyNameEnd ); + Error = RegOpenKey( HKEY_LOCAL_MACHINE, TargetKeyName, &OutKey ); + break; + } else { + free( RootDevice ); RootDevice = 0; + free( DriverDesc ); DriverDesc = 0; + } } - NumAddressRows = Size / sizeof(MIB_IPADDRTABLE); - for( i = 0; i < AddressTable->dwNumEntries; i++ ) { - DH_DbgPrint(MID_TRACE, - ("Finding address for adapter %d: (%d -> %x)\n", - Adapter->IfMib.dwIndex, - AddressTable->table[i].dwIndex, - AddressTable->table[i].dwAddr)); - if( Adapter->IfMib.dwIndex == AddressTable->table[i].dwIndex ) { - memcpy( &Adapter->IfAddr, &AddressTable->table[i], - sizeof( MIB_IPADDRROW ) ); +cleanup: + if( RootDevice ) free( RootDevice ); + if( DriverDesc ) free( DriverDesc ); + if( EnumKeysLinkage ) free( EnumKeysLinkage ); + if( EnumKeysTop ) free( EnumKeysTop ); + if( TargetKeyName ) free( TargetKeyName ); + + return OutKey; +} + +BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) { + HKEY AdapterKey = NULL; + PCHAR IPAddress = NULL, Netmask = NULL, DefaultGateway = NULL; + NTSTATUS Status = STATUS_SUCCESS; + DWORD Error = ERROR_SUCCESS; + MIB_IPFORWARDROW DefGatewayRow; + + Adapter->DhclientState.config = &Adapter->DhclientConfig; + strncpy(Adapter->DhclientInfo.name, Adapter->IfMib.bDescr, + sizeof(Adapter->DhclientInfo.name)); + + AdapterKey = FindAdapterKey( Adapter ); + if( AdapterKey ) + IPAddress = RegReadString( AdapterKey, NULL, "IPAddress" ); + + if( IPAddress && strcmp( IPAddress, "0.0.0.0" ) ) { + /* Non-automatic case */ + DH_DbgPrint + (MID_TRACE,("Adapter Name: [%s] (Bind Status %x) (static %s)\n", + Adapter->DhclientInfo.name, + Adapter->BindStatus, + IPAddress)); + + Adapter->DhclientState.state = S_STATIC; + + Netmask = RegReadString( AdapterKey, NULL, "Subnetmask" ); + if( !Netmask ) Netmask = "255.255.255.0"; + + Status = AddIPAddress( inet_addr( IPAddress ), + inet_addr( Netmask ), + Adapter->IfMib.dwIndex, + &Adapter->NteContext, + &Adapter->NteInstance ); + + DefaultGateway = RegReadString( AdapterKey, NULL, "DefaultGateway" ); + + if( DefaultGateway ) { + DefGatewayRow.dwForwardDest = 0; + DefGatewayRow.dwForwardMask = 0; + DefGatewayRow.dwForwardMetric1 = 1; + DefGatewayRow.dwForwardNextHop = inet_addr(DefaultGateway); + Error = CreateIpForwardEntry( &DefGatewayRow ); + if( Error ) + warning("Failed to set default gateway %s: %d\n", + DefaultGateway, Error); } + + if( DefaultGateway ) free( DefaultGateway ); + if( Netmask ) free( Netmask ); + } else { + /* Automatic case */ + DH_DbgPrint + (MID_TRACE,("Adapter Name: [%s] (Bind Status %x) (dynamic)\n", + Adapter->DhclientInfo.name, + Adapter->BindStatus)); } + + if( IPAddress ) free( IPAddress ); + + return TRUE; } /* @@ -66,20 +244,23 @@ Table->table[i].dwIndex)); Adapter = calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); - if( Adapter && Table->table[i].dwType ) { + if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET ) { memcpy( &Adapter->IfMib, &Table->table[i], sizeof(Adapter->IfMib) ); - GetAddress( Adapter ); - InsertTailList( &AdapterList, &Adapter->ListEntry ); - Adapter->DhclientInfo.next = ifi; Adapter->DhclientInfo.client = &Adapter->DhclientState; Adapter->DhclientInfo.rbuf = Adapter->recv_buf; Adapter->DhclientInfo.rbuf_max = Table->table[i].dwMtu; Adapter->DhclientInfo.rbuf_len = Adapter->DhclientInfo.rbuf_offset = 0; + memcpy(Adapter->DhclientInfo.hw_address.haddr, + Adapter->IfMib.bPhysAddr, + Adapter->IfMib.dwPhysAddrLen); + Adapter->DhclientInfo.hw_address.hlen = + Adapter->IfMib.dwPhysAddrLen; + if( DhcpSocket == INVALID_SOCKET ) { DhcpSocket = - Adapter->DhclientInfo.rfdesc = + Adapter->DhclientInfo.rfdesc = Adapter->DhclientInfo.wfdesc = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); Adapter->ListenAddr.sin_family = AF_INET; @@ -93,7 +274,7 @@ Adapter->DhclientInfo.rfdesc = Adapter->DhclientInfo.wfdesc = DhcpSocket; } - Adapter->DhclientState.config = &Adapter->DhclientConfig; + Adapter->DhclientConfig.timeout = DHCP_PANIC_TIMEOUT; Adapter->DhclientConfig.initial_interval = DHCP_DISCOVER_INTERVAL; Adapter->DhclientConfig.retry_interval = DHCP_DISCOVER_INTERVAL; @@ -102,13 +283,17 @@ Adapter->DhclientConfig.backoff_cutoff = DHCP_BACKOFF_MAX; Adapter->DhclientState.interval = Adapter->DhclientConfig.retry_interval; - strncpy(Adapter->DhclientInfo.name, Adapter->IfMib.bDescr, - sizeof(Adapter->DhclientInfo.name)); - DH_DbgPrint(MID_TRACE,("Adapter Name: [%s] (Bind Status %x)\n", - Adapter->DhclientInfo.name, - Adapter->BindStatus)); - ifi = &Adapter->DhclientInfo; - } + + if( PrepareAdapterForService( Adapter ) ) { + Adapter->DhclientInfo.next = ifi; + ifi = &Adapter->DhclientInfo; + InsertTailList( &AdapterList, &Adapter->ListEntry ); + } else { free( Adapter ); Adapter = 0; } + } else { free( Adapter ); Adapter = 0; } + + if( !Adapter ) + DH_DbgPrint(MID_TRACE,("Adapter %d was rejected\n", + Table->table[i].dwIndex)); } DH_DbgPrint(MID_TRACE,("done with AdapterInit\n")); _____ Modified: trunk/reactos/subsys/system/dhcp/api.c --- trunk/reactos/subsys/system/dhcp/api.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/subsys/system/dhcp/api.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -38,8 +38,11 @@ Reply.Reply = Adapter ? 1 : 0; if( Adapter ) { - Adapter->DhclientState.state = S_REBOOTING; - send_discover( &Adapter->DhclientInfo ); + add_protocol( Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, got_one, + &Adapter->DhclientInfo ); + Adapter->DhclientInfo.client->state = S_INIT; + state_reboot(&Adapter->DhclientInfo); } ApiUnlock(); @@ -77,6 +80,7 @@ if( Adapter ) { DeleteIPAddress( Adapter->NteContext ); + remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); } ApiUnlock(); @@ -101,6 +105,7 @@ Adapter->DhclientState.state = S_BOUND; + send_discover( &Adapter->DhclientInfo ); state_bound( &Adapter->DhclientInfo ); ApiUnlock(); @@ -121,7 +126,8 @@ if( Adapter ) { DeleteIPAddress( Adapter->NteContext ); - Adapter->DhclientState.state = S_BOUND; + Adapter->DhclientState.state = S_STATIC; + remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); Status = AddIPAddress( Req->Body.StaticRefreshParams.IPAddress, Req->Body.StaticRefreshParams.Netmask, Req->AdapterIndex, _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-22 09:19:18 UTC (rev 14736) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-22 09:45:17 UTC (rev 14737) @@ -108,6 +108,7 @@ int res_hnok(const char *dn); char *option_as_string(unsigned int code, unsigned char *data, int len); int fork_privchld(int, int); +int check_arp( struct interface_info *ip, struct client_lease *lp ); #define ROUNDUP(a) \ ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) @@ -115,143 +116,11 @@ time_t scripttime; -#if 0 - -int -findproto(char *cp, int n) -{ - struct sockaddr *sa; - int i; - - if (n == 0) - return -1; - for (i = 1; i; i <<= 1) { - if (i & n) { [truncated at 1000 lines; 674 more skipped]

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