Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cfinck] 36565: Add an SQL Dump to make it possible to test the Paste Service locally
by cfinck＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cfinck Date: Sun Sep 28 05:03:43 2008 New Revision: 36565 URL: http://svn.reactos.org/svn/reactos?rev=36565&view=rev Log: Add an SQL Dump to make it possible to test the Paste Service locally Added: trunk/web/reactos.org/resources/paste/ trunk/web/reactos.org/resources/paste/paste.sql (with props) Added: trunk/web/reactos.org/resources/paste/paste.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/resources/paste/pa… ============================================================================== --- trunk/web/reactos.org/resources/paste/paste.sql (added) +++ trunk/web/reactos.org/resources/paste/paste.sql [iso-8859-1] Sun Sep 28 05:03:43 2008 @@ -1,0 +1,18 @@ +CREATE TABLE `paste_service` ( + `paste_id` bigint(20) NOT NULL auto_increment, + `paste_date` date NOT NULL default '0000-00-00', + `paste_days` int(11) NOT NULL default '7', + `paste_usrid` bigint(20) NOT NULL default '0', + `paste_nick` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `paste_desc` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `paste_lines` int(11) NOT NULL default '0', + `paste_tabs` int(11) NOT NULL default '0', + `paste_public` char(1) collate utf8_unicode_ci NOT NULL default '1', + `paste_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'C', + `paste_datetime` datetime NOT NULL default '0000-00-00 00:00:00', + `paste_size` int(11) NOT NULL default '0', + `paste_ip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `paste_proxy` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `paste_host` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`paste_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='ReactOS Copy & Paste - paste service'; Propchange: trunk/web/reactos.org/resources/paste/paste.sql ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 36564: Fix the Paste Service for the new Logon system
by cfinck＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cfinck Date: Sun Sep 28 05:02:52 2008 New Revision: 36564 URL: http://svn.reactos.org/svn/reactos?rev=36564&view=rev Log: Fix the Paste Service for the new Logon system Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php trunk/web/reactos.org/htdocs/paste/index.php Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/account.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/paste/inc/account.php [iso-8859-1] Sun Sep 28 05:02:52 2008 @@ -20,12 +20,10 @@ include("connect.db.php"); -/* - require_once("/web/reactos.org/htdocs/roscms/inc/subsys_login.php"); - $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); -*/ - $RSDB_intern_user_id=2; - $RSDB_USER_name="Anonymous"; + + define("ROSCMS_PATH", "../roscms/"); + require_once(ROSCMS_PATH . "logon/subsys_login.php"); + $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . "http://localhost/reactos.org/"); if($RSDB_intern_user_id != 0) { $query_roscms_user = mysql_query("SELECT * @@ -40,6 +38,5 @@ else { $RSDB_USER_name = "Anonymous"; } - //echo "<h1>!!!".$RSDB_USER_name."</h1>"; ?> Modified: trunk/web/reactos.org/htdocs/paste/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/index… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/paste/index.php [iso-8859-1] Sun Sep 28 05:02:52 2008 @@ -27,10 +27,10 @@ } - $ros_paste_SET_path = "http://localhost/reactos.org/paste/"; - $ros_paste_SET_path_ex = "http://localhost/reactos.org/paste/index.php/"; + $ros_paste_SET_path = "http://www.reactos.org/paste/"; + $ros_paste_SET_path_ex = "http://www.reactos.org/paste/index.php/"; $ros_paste_SET_dirs = "reactos.org/paste/"; - $ros_paste_SET_content = "content"; + $ros_paste_SET_content = "storage"; @@ -66,22 +66,23 @@ if (!strchr($RSDB_URI_tree,"?page=")) { //echo "<p>###</p>"; - $ros_paste_SET_page = @$RSDB_URI_tree_array[1]; + $ros_paste_SET_page = @$RSDB_URI_tree_array[3]; if ($ros_paste_SET_page == "id") { $ros_paste_SET_page = "paste"; $ros_paste_SET_pasteid = ""; - $ros_paste_SET_pasteid = @$RSDB_URI_tree_array[2]; + $ros_paste_SET_pasteid = @$RSDB_URI_tree_array[3]; $ros_paste_SET_pasteflag = ""; - $ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[3]; + $ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[4]; } else if ($ros_paste_SET_page != "conditions" && $ros_paste_SET_page != "help" && $ros_paste_SET_page != "recent") { $ros_paste_SET_page = "paste"; $ros_paste_SET_pasteid = ""; - $ros_paste_SET_pasteid = @$RSDB_URI_tree_array[1]; + $ros_paste_SET_pasteid = @$RSDB_URI_tree_array[3]; $ros_paste_SET_pasteflag = ""; - $ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[2]; + $ros_paste_SET_pasteflag = @$RSDB_URI_tree_array[4]; } } + include("inc/tools.php");

1 0

[hpoussin] 36563: Replace .def file by a .spec file
by hpoussin＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: hpoussin Date: Sun Sep 28 04:09:57 2008 New Revision: 36563 URL: http://svn.reactos.org/svn/reactos?rev=36563&view=rev Log: Replace .def file by a .spec file Added: trunk/reactos/drivers/network/tcpip/tcpip.spec - copied, changed from r36562, trunk/reactos/drivers/network/tcpip/tcpip.def Removed: trunk/reactos/drivers/network/tcpip/tcpip.def Modified: trunk/reactos/drivers/network/tcpip/DIRS (props changed) trunk/reactos/drivers/network/tcpip/datalink/SOURCES (props changed) trunk/reactos/drivers/network/tcpip/datalink/lan.c (props changed) trunk/reactos/drivers/network/tcpip/include/address.h (props changed) trunk/reactos/drivers/network/tcpip/include/arp.h (props changed) trunk/reactos/drivers/network/tcpip/include/bug.h (props changed) trunk/reactos/drivers/network/tcpip/include/checksum.h (props changed) trunk/reactos/drivers/network/tcpip/include/datagram.h (props changed) trunk/reactos/drivers/network/tcpip/include/debug.h (props changed) trunk/reactos/drivers/network/tcpip/include/dispatch.h (props changed) trunk/reactos/drivers/network/tcpip/include/fileobjs.h (props changed) trunk/reactos/drivers/network/tcpip/include/icmp.h (props changed) trunk/reactos/drivers/network/tcpip/include/info.h (props changed) trunk/reactos/drivers/network/tcpip/include/interface.h (props changed) trunk/reactos/drivers/network/tcpip/include/ip.h (props changed) trunk/reactos/drivers/network/tcpip/include/irp.h (props changed) trunk/reactos/drivers/network/tcpip/include/lan.h (props changed) trunk/reactos/drivers/network/tcpip/include/linux.h (props changed) trunk/reactos/drivers/network/tcpip/include/lock.h (props changed) trunk/reactos/drivers/network/tcpip/include/loopback.h (props changed) trunk/reactos/drivers/network/tcpip/include/memtrack.h (props changed) trunk/reactos/drivers/network/tcpip/include/neighbor.h (props changed) trunk/reactos/drivers/network/tcpip/include/pool.h (props changed) trunk/reactos/drivers/network/tcpip/include/ports.h (props changed) trunk/reactos/drivers/network/tcpip/include/precomp.h (props changed) trunk/reactos/drivers/network/tcpip/include/rawip.h (props changed) trunk/reactos/drivers/network/tcpip/include/receive.h (props changed) trunk/reactos/drivers/network/tcpip/include/route.h (props changed) trunk/reactos/drivers/network/tcpip/include/router.h (props changed) trunk/reactos/drivers/network/tcpip/include/routines.h (props changed) trunk/reactos/drivers/network/tcpip/include/tcp.h (props changed) trunk/reactos/drivers/network/tcpip/include/tcpcore.h (props changed) trunk/reactos/drivers/network/tcpip/include/tcpdef.h (props changed) trunk/reactos/drivers/network/tcpip/include/tcpip.h (props changed) trunk/reactos/drivers/network/tcpip/include/ticonsts.h (props changed) trunk/reactos/drivers/network/tcpip/include/tilists.h (props changed) trunk/reactos/drivers/network/tcpip/include/titypes.h (props changed) trunk/reactos/drivers/network/tcpip/include/transmit.h (props changed) trunk/reactos/drivers/network/tcpip/include/udp.h (props changed) trunk/reactos/drivers/network/tcpip/include/wait.h (props changed) trunk/reactos/drivers/network/tcpip/notes.txt (props changed) trunk/reactos/drivers/network/tcpip/readme.txt (props changed) trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c (props changed) trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h (props changed) trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/drivers/network/tcpip/tcpip.rc (contents, props changed) trunk/reactos/drivers/network/tcpip/tcpip/SOURCES (props changed) trunk/reactos/drivers/network/tcpip/tcpip/buffer.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/bug.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/info.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/irp.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/lock.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/main.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/mockbuffer.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/mocklock.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/mockpool.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/mockwait.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/pool.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/proto.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/resource.rc (props changed) trunk/reactos/drivers/network/tcpip/tcpip/tcpip.def (props changed) trunk/reactos/drivers/network/tcpip/tcpip/tinfo.c (props changed) trunk/reactos/drivers/network/tcpip/tcpip/wait.c (props changed) trunk/reactos/drivers/network/tcpip/tests/setup.c (props changed) trunk/reactos/drivers/network/tcpip/tests/stubs.tst (props changed) trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c (props changed) trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c (props changed) Propchange: trunk/reactos/drivers/network/tcpip/DIRS ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/datalink/SOURCES ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/datalink/lan.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/address.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/arp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/bug.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/checksum.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/datagram.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/debug.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/dispatch.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/fileobjs.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/icmp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/info.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/interface.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/ip.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/irp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/lan.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/linux.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/lock.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/loopback.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/memtrack.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/neighbor.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/pool.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/ports.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/precomp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/rawip.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/receive.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/route.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/router.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/routines.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/tcp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/tcpcore.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/tcpdef.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/tcpip.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/ticonsts.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/tilists.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/titypes.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/transmit.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/udp.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/include/wait.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/notes.txt ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/readme.txt ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Removed: trunk/reactos/drivers/network/tcpip/tcpip.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.def (removed) @@ -1,32 +1,0 @@ -; TCPIP.SYS - TCP/IP protocol driver - -LIBRARY tcpip.sys - -EXPORTS -;FreeIprBuff -;GetIFAndLink -IPAddInterface@20 -;IPAllocBuff -IPDelInterface@4 -;IPDelayedNdisReEnumerateBindings -;IPDeregisterARP -;IPDisableSniffer -;IPEnableSniffer -;IPFreeBuff -;IPGetAddrType -;IPGetBestInterface -;IPGetInfo -;IPInjectPkt -;IPProxyNdisRequest -;IPRegisterARP -;IPRegisterProtocol -;IPSetIPSecStatus -;IPTransmit -LookupRoute@8 -;LookupRouteInformation -;SendICMPErr -;SetIPSecPtr -;UnSetIPSecPtr -;UnSetIPSecSendPtr - -; EOF Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Sun Sep 28 04:09:57 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys"> - <importlibrary definition="tcpip.def"></importlibrary> + <importlibrary definition="tcpip.spec.def" /> <include base="tcpip">include</include> <include base="oskittcp">include</include> <define name="NDIS40" /> @@ -39,4 +39,5 @@ <file>wait.c</file> </directory> <file>tcpip.rc</file> + <file>tcpip.spec</file> </module> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rc [iso-8859-1] Sun Sep 28 04:09:57 2008 @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "TCP/IP protocol driver\0" #define REACTOS_STR_INTERNAL_NAME "tcpip\0" Propchange: trunk/reactos/drivers/network/tcpip/tcpip.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Copied: trunk/reactos/drivers/network/tcpip/tcpip.spec (from r36562, trunk/reactos/drivers/network/tcpip/tcpip.def) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.spec [iso-8859-1] Sun Sep 28 04:09:57 2008 @@ -1,13 +1,8 @@ -; TCPIP.SYS - TCP/IP protocol driver - -LIBRARY tcpip.sys - -EXPORTS ;FreeIprBuff ;GetIFAndLink -IPAddInterface@20 +@ stdcall IPAddInterface(long long long long long) ;IPAllocBuff -IPDelInterface@4 +@ stdcall IPDelInterface(long) ;IPDelayedNdisReEnumerateBindings ;IPDeregisterARP ;IPDisableSniffer @@ -22,11 +17,9 @@ ;IPRegisterProtocol ;IPSetIPSecStatus ;IPTransmit -LookupRoute@8 +@ stdcall LookupRoute(long long) ;LookupRouteInformation ;SendICMPErr ;SetIPSecPtr ;UnSetIPSecPtr ;UnSetIPSecSendPtr - -; EOF Propchange: trunk/reactos/drivers/network/tcpip/tcpip/SOURCES ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/bug.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/info.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/irp.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/lock.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/main.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/mockbuffer.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/mocklock.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/mockpool.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/mockwait.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/pool.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/proto.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/resource.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/tcpip.def ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/tinfo.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tcpip/wait.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tests/setup.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tests/stubs.tst ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tests/tests/ipreceive.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/drivers/network/tcpip/tests/tests/tigetprotocolnumber.c ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[sserapion] 36562: Work around bug 3746. Use arch specific def files.
by sserapion＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: sserapion Date: Sun Sep 28 03:47:44 2008 New Revision: 36562 URL: http://svn.reactos.org/svn/reactos?rev=36562&view=rev Log: Work around bug 3746. Use arch specific def files. Added: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-amd64.def (with props) branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-i386.def (with props) Removed: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.def Modified: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup.rbuild Added: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-amd64.def (added) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-amd64.def [iso-8859-1] Sun Sep 28 03:47:44 2008 @@ -1,0 +1,20 @@ +EXPORTS +DbgBreakPoint +DbgBreakPointWithStatus +DbgPrint +DbgPrompt +DbgPrintEx +RtlAssert +RtlUnwind + +;EOF +EXPORTS +DbgBreakPoint +DbgBreakPointWithStatus +DbgPrint +DbgPrompt +DbgPrintEx +RtlAssert +RtlUnwind + +;EOF Propchange: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-i386.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-i386.def (added) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-i386.def [iso-8859-1] Sun Sep 28 03:47:44 2008 @@ -1,0 +1,20 @@ +EXPORTS +DbgBreakPoint@0 +DbgBreakPointWithStatus@4 +DbgPrint +DbgPrompt@12 +DbgPrintEx +RtlAssert@16 +RtlUnwind@16 + +;EOF +EXPORTS +DbgBreakPoint@0 +DbgBreakPointWithStatus@4 +DbgPrint +DbgPrompt@12 +DbgPrintEx +RtlAssert@16 +RtlUnwind@16 + +;EOF Propchange: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos-i386.def ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.def (removed) @@ -1,10 +1,0 @@ -EXPORTS -DbgBreakPoint@0 -DbgBreakPointWithStatus@4 -DbgPrint -DbgPrompt@12 -DbgPrintEx -RtlAssert@16 -RtlUnwind@16 - -;EOF Modified: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup.rbuild [iso-8859-1] Sun Sep 28 03:47:44 2008 @@ -2,9 +2,9 @@ <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> <module name="debugsup_ntoskrnl" type="staticlibrary"> - <importlibrary definition="debugsup-ntos.def" dllname="ntoskrnl.exe" /> + <importlibrary definition="debugsup-ntos-$(ARCH).def" dllname="ntoskrnl.exe" /> </module> <module name="debugsup_ntdll" type="staticlibrary"> - <importlibrary definition="debugsup-ntos.def" dllname="ntdll.dll" /> + <importlibrary definition="debugsup-ntos-$(ARCH).def" dllname="ntdll.dll" /> </module> </group>

1 0

[cfinck] 36561: Fix the blog system to work with the new Login system
by cfinck＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: cfinck Date: Sun Sep 28 02:52:03 2008 New Revision: 36561 URL: http://svn.reactos.org/svn/reactos?rev=36561&view=rev Log: Fix the blog system to work with the new Login system Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc.php trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.php trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_roscmsa… trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.php Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/serendipity… ============================================================================== --- trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc.php [iso-8859-1] Sun Sep 28 02:52:03 2008 @@ -309,7 +309,7 @@ return true; } -require_once(ROSCMS_INC_PATH . "/subsys_login.php"); +require_once(ROSCMS_PATH . "logon/subsys_login.php"); @define('ROSCMSLOGIN_NOT_LOGGEDIN', 'You need to be logged in to leave a comment'); Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/serendipity… ============================================================================== --- trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.php [iso-8859-1] Sun Sep 28 02:52:03 2008 @@ -273,7 +273,7 @@ unset($serendipity['COOKIE'][$name]); } -require_once(ROSCMS_INC_PATH . "/subsys_login.php"); +require_once(ROSCMS_PATH . "logon/subsys_login.php"); function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false, $use_external = true) { global $serendipity; Modified: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_roscmsa… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/serendipity… ============================================================================== --- trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_roscmsa… [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_roscmsa… [iso-8859-1] Sun Sep 28 02:52:03 2008 @@ -14,7 +14,7 @@ @define('PLUGIN_ROSCMSACCOUNT_REGISTER', 'Register'); @define('PLUGIN_ROSCMSACCOUNT_MANAGE', 'Manage blog entries'); -require_once(ROSCMS_INC_PATH . "/subsys_login.php"); +require_once(ROSCMS_PATH . "logon/subsys_login.php"); class serendipity_plugin_roscmsaccount extends serendipity_plugin { Modified: trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/serendipity… ============================================================================== --- trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.php [iso-8859-1] Sun Sep 28 02:52:03 2008 @@ -13,5 +13,5 @@ // You can place your own special variables after here: require_once("blogs-connect.php"); - @define('ROSCMS_INC_PATH', '/web/reactos.org/htdocs/roscms/inc'); + define('ROSCMS_PATH', '../roscms/'); ?>

1 0

[dchapyshev] 36560: - Sync ddstream.idl with wine head - Add qedit.idl from wine
by dchapyshev＠svn.reactos.org 28 Sep '08

28 Sep '08

Author: dchapyshev Date: Sun Sep 28 01:04:47 2008 New Revision: 36560 URL: http://svn.reactos.org/svn/reactos?rev=36560&view=rev Log: - Sync ddstream.idl with wine head - Add qedit.idl from wine Added: trunk/reactos/include/dxsdk/qedit.idl (with props) Modified: trunk/reactos/include/dxsdk/ddstream.idl trunk/reactos/include/dxsdk/dxsdk.rbuild Modified: trunk/reactos/include/dxsdk/ddstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/ddstream.idl [iso-8859-1] Sun Sep 28 01:04:47 2008 @@ -44,14 +44,14 @@ interface IDirectDrawMediaStream : IMediaStream { HRESULT GetFormat( - [out, optional] DDSURFACEDESC *pDDSDCurrent, - [out, optional] IDirectDrawPalette **ppDirectDrawPalette, - [out, optional] DDSURFACEDESC *pDDSDDesired, - [out, optional] DWORD *pdwFlags); + [out] DDSURFACEDESC *pDDSDCurrent, + [out] IDirectDrawPalette **ppDirectDrawPalette, + [out] DDSURFACEDESC *pDDSDDesired, + [out] DWORD *pdwFlags); HRESULT SetFormat( [in] const DDSURFACEDESC *pDDSurfaceDesc, - [in, optional] IDirectDrawPalette *pDirectDrawPalette); + [in] IDirectDrawPalette *pDirectDrawPalette); HRESULT GetDirectDraw( [out] IDirectDraw **ppDirectDraw); @@ -60,8 +60,8 @@ [in] IDirectDraw *pDirectDraw); HRESULT CreateSample( - [in, optional] IDirectDrawSurface *pSurface, - [in, optional] const RECT *pRect, + [in] IDirectDrawSurface *pSurface, + [in] const RECT *pRect, [in] DWORD dwFlags, [out] IDirectDrawStreamSample **ppSample); @@ -79,8 +79,8 @@ interface IDirectDrawStreamSample : IStreamSample { HRESULT GetSurface( - [out, optional] IDirectDrawSurface ** ppDirectDrawSurface, - [out, optional] RECT * pRect); + [out] IDirectDrawSurface ** ppDirectDrawSurface, + [out] RECT * pRect); HRESULT SetRect( [in] const RECT * pRect); Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild [iso-8859-1] Sun Sep 28 01:04:47 2008 @@ -9,6 +9,7 @@ <file>mediaobj.idl</file> <file>medparam.idl</file> <file>mmstream.idl</file> + <file>qedit.idl</file> <file>regbag.idl</file> <file>tvratings.idl</file> <file>vidcap.idl</file> Added: trunk/reactos/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re… ============================================================================== --- trunk/reactos/include/dxsdk/qedit.idl (added) +++ trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] Sun Sep 28 01:04:47 2008 @@ -1,0 +1,168 @@ +/* + * Copyright (C) 2008 Google (Lei Zhang) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +/* import "dxtrans.idl"; */ +import "amstream.idl"; +import "msxml.idl"; + +[ + object, + uuid(0579154A-2B53-4994-B0D0-E773148EFF85), + local, + pointer_default(unique) +] +interface ISampleGrabberCB : IUnknown +{ + HRESULT SampleCB( + double SampleTime, + IMediaSample * pSample + ); + HRESULT BufferCB( + double SampleTime, + BYTE * pBuffer, + long BufferLen + ); +} + +[ + object, + uuid(6B652FFF-11FE-4fce-92AD-0266B5D7C78F), + local, + pointer_default(unique) +] +interface ISampleGrabber: IUnknown +{ + HRESULT SetOneShot( + BOOL OneShot + ); + + HRESULT SetMediaType( + const AM_MEDIA_TYPE * pType + ); + + HRESULT GetConnectedMediaType( + AM_MEDIA_TYPE * pType + ); + + HRESULT SetBufferSamples( + BOOL BufferThem + ); + + HRESULT GetCurrentBuffer( + [in,out] long * pBufferSize, + [out] long * pBuffer + ); + + HRESULT GetCurrentSample( + [out] IMediaSample ** ppSample + ); + + HRESULT SetCallback( + ISampleGrabberCB * pCallback, + long WhichMethodToCallback + ); +}; + +[ + object, + uuid(65bd0710-24d2-4FF7-9324-ed2e5d3abafa), + pointer_default(unique) +] +interface IMediaDet : IUnknown +{ + HRESULT get_Filter( + [out] IUnknown* *pVal + ); + + HRESULT put_Filter( + IUnknown* newVal + ); + + HRESULT get_OutputStreams( + [out] long *pVal + ); + + HRESULT get_CurrentStream( + [out] long *pVal + ); + + HRESULT put_CurrentStream( + long newVal + ); + + HRESULT get_StreamType( + [out] GUID *pVal + ); + + HRESULT get_StreamTypeB( + [out] BSTR *pVal + ); + + HRESULT get_StreamLength( + [out] double *pVal + ); + + HRESULT get_Filename( + [out] BSTR *pVal + ); + + HRESULT put_Filename( + BSTR newVal + ); + + HRESULT GetBitmapBits( + double StreamTime, + long * pBufferSize, + char * pBuffer, + long Width, + long Height + ); + + HRESULT WriteBitmapBits( + double StreamTime, + long Width, + long Height, + BSTR Filename + ); + + HRESULT get_StreamMediaType( + [out] AM_MEDIA_TYPE * pVal + ); + + HRESULT GetSampleGrabber( + [out] ISampleGrabber ** ppVal + ); + + HRESULT get_FrameRate( + [out] double *pVal + ); + + HRESULT EnterBitmapGrabMode( + double SeekTime + ); +}; + +[ + uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), +] +coclass MediaDet +{ + [default] interface IMediaDet; +}; Propchange: trunk/reactos/include/dxsdk/qedit.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 36559: - Merge aicom-network-fixes up to r36558
by cgutman＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cgutman Date: Sat Sep 27 16:25:27 2008 New Revision: 36559 URL: http://svn.reactos.org/svn/reactos?rev=36559&view=rev Log: - Merge aicom-network-fixes up to r36558 Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/lib/drivers/ip/network/ip.c Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -194,6 +194,8 @@ ULONG TdiAddressSize; PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn; + if (!From) return STATUS_INVALID_PARAMETER; + /* FIXME: Get from socket information */ TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType); SizeOfEntry = TdiAddressSize + sizeof(TDI_CONNECTION_INFORMATION); @@ -207,15 +209,10 @@ RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry ); - FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame; - ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry; - - if (From != NULL) { - TdiBuildConnectionInfoInPlace( FromTdiConn, From ); - } else { - TdiBuildNullConnectionInfoInPlace( FromTdiConn, - From->Address[0].AddressType ); - } + FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame; + ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry; + + TdiBuildConnectionInfoInPlace( FromTdiConn, From ); TdiBuildConnectionInfoInPlace( ToTdiConn, To ); Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -543,6 +543,8 @@ UCHAR Tmp; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + if (Adapter->TXCurrent < 0) return; //FrameStart = Adapter->TXStart + Adapter->TXCurrent * DRIVER_BLOCK_SIZE; //FrameStart = Adapter->TXStart; Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -669,13 +669,9 @@ ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); +#ifndef NOCARD NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n")); -#ifdef NOCARD - NdisMSendComplete(Adapter->MiniportAdapterHandle, - Packet, - NDIS_STATUS_SUCCESS); -#else /* Queue the packet on the transmit queue */ RESERVED(Packet)->Next = NULL; if (Adapter->TXQueueHead == NULL) { @@ -688,8 +684,11 @@ /* Transmit the packet */ NICTransmit(Adapter); + + return NDIS_STATUS_PENDING; +#else + return NDIS_STATUS_SUCCESS; #endif - return NDIS_STATUS_PENDING; } Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -146,7 +146,7 @@ NDIS_STATUS MiniDoRequest( - PNDIS_MINIPORT_BLOCK Adapter, + PLOGICAL_ADAPTER Adapter, PNDIS_REQUEST NdisRequest); BOOLEAN Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -326,8 +326,10 @@ Request, Status); } + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } VOID NTAPI @@ -357,8 +359,10 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } @@ -392,8 +396,10 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } @@ -619,14 +625,18 @@ * Status of the operation */ { - NDIS_STATUS Status = NDIS_STATUS_FAILURE; + NDIS_STATUS Status; KIRQL OldIrql; - /* FIXME: What should we return if there isn't a reset handler? */ + if (Adapter->MiniportBusy) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return NDIS_STATUS_PENDING; + } KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler) - Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); KeLowerIrql(OldIrql); @@ -763,7 +773,7 @@ NDIS_STATUS MiniDoRequest( - PNDIS_MINIPORT_BLOCK Adapter, + PLOGICAL_ADAPTER Adapter, PNDIS_REQUEST NdisRequest) /* * FUNCTION: Sends a request to a miniport @@ -778,14 +788,14 @@ KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - Adapter->MediaRequest = NdisRequest; + Adapter->NdisMiniportBlock.MediaRequest = NdisRequest; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: - Status = (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( - Adapter->MiniportAdapterContext, + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.QueryInformationHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, NdisRequest->DATA.QUERY_INFORMATION.Oid, NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer, NdisRequest->DATA.QUERY_INFORMATION.InformationBufferLength, @@ -794,8 +804,8 @@ break; case NdisRequestSetInformation: - Status = (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( - Adapter->MiniportAdapterContext, + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SetInformationHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, NdisRequest->DATA.SET_INFORMATION.Oid, NdisRequest->DATA.SET_INFORMATION.InformationBuffer, NdisRequest->DATA.SET_INFORMATION.InformationBufferLength, @@ -805,6 +815,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status == NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = TRUE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -829,8 +845,10 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } VOID NTAPI MiniportWorker(IN PVOID WorkItem) @@ -841,6 +859,7 @@ NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; + BOOLEAN AddressingReset; KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); @@ -938,6 +957,16 @@ break; case NdisWorkItemResetRequested: + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, + &AddressingReset); + KeLowerIrql(OldIrql); + + if (NdisStatus == NDIS_STATUS_PENDING) + break; + + MiniResetComplete(Adapter, NdisStatus, AddressingReset); break; case NdisWorkItemResetInProgress: @@ -947,7 +976,7 @@ break; case NdisWorkItemRequest: - NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, (PNDIS_REQUEST)WorkItemContext); + NdisStatus = MiniDoRequest(Adapter, (PNDIS_REQUEST)WorkItemContext); if (NdisStatus == NDIS_STATUS_PENDING) break; @@ -976,8 +1005,11 @@ } } - if( NdisStatus != NDIS_STATUS_PENDING ) - Adapter->MiniportBusy = FALSE; + if( NdisStatus != NDIS_STATUS_PENDING ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } ExFreePool(WorkItem); } @@ -1004,6 +1036,7 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); + if (!NdisWorkItem) return; WorkItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; @@ -1496,7 +1529,7 @@ if (Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) { - ResourceCount = Stack->Parameters.StartDevice.AllocatedResources->List[0]. + ResourceCount = Stack->Parameters.StartDevice.AllocatedResourcesTranslated->List[0]. PartialResourceList.Count; ResourceListSize = FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. @@ -2108,8 +2141,10 @@ ASSERT(Adapter); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -43,6 +43,8 @@ { PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)BindAdapterContext; + if (!NT_SUCCESS(Status)) return; + /* Put protocol binding struct on global list */ ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); } @@ -119,8 +121,6 @@ */ { KIRQL OldIrql; - BOOLEAN QueueWorkItem = FALSE; - NDIS_STATUS NdisStatus; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; @@ -141,26 +141,15 @@ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { - if(Adapter->MiniportBusy) - QueueWorkItem = TRUE; - } - - /* MiniQueueWorkItem must be called at IRQL >= DISPATCH_LEVEL */ - if (QueueWorkItem) - { - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - + if (Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return NDIS_STATUS_PENDING; + } + } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest); - - if( NdisStatus == NDIS_STATUS_PENDING ) - Adapter->MiniportBusy = TRUE; - - return NdisStatus; + return MiniDoRequest(Adapter, NdisRequest); } Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -485,16 +485,9 @@ } else { - if (NdisStatus == NDIS_STATUS_SUCCESS) - { - NdisTransferData(&NdisStatus, Adapter->NdisHandle, - MacReceiveContext, 0, PacketSize, - NdisPacket, &BytesTransferred); - } - else - { - BytesTransferred = 0; - } + NdisTransferData(&NdisStatus, Adapter->NdisHandle, + MacReceiveContext, 0, PacketSize, + NdisPacket, &BytesTransferred); } TI_DbgPrint(DEBUG_DATALINK, ("Calling complete\n")); Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sat Sep 27 16:25:27 2008 @@ -242,12 +242,14 @@ NUD_PERMANENT); if (!NCE) { TI_DbgPrint(MIN_TRACE, ("Could not create NCE.\n")); + return; } AddrWidenAddress( &NetworkAddress, &IF->Unicast, &IF->Netmask ); if (!RouterAddRoute(&NetworkAddress, &IF->Netmask, NCE, 1)) { TI_DbgPrint(MIN_TRACE, ("Could not add route due to insufficient resources.\n")); + return; } /* Allow TCP to hang some configuration on this interface */ @@ -352,10 +354,10 @@ * To unregister a protocol handler, call this function with Handler = NULL */ { -#ifdef DBG - if (ProtocolNumber >= IP_PROTOCOL_TABLE_SIZE) + if (ProtocolNumber >= IP_PROTOCOL_TABLE_SIZE) { TI_DbgPrint(MIN_TRACE, ("Protocol number is out of range (%d).\n", ProtocolNumber)); -#endif + return; + } ProtocolTable[ProtocolNumber] = Handler; }

1 0

[cgutman] 36558: - Set MiniportBusy to TRUE if a request is pending - Hold spin lock when setting MiniportBusy (forgot one from last time)
by cgutman＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cgutman Date: Sat Sep 27 14:54:58 2008 New Revision: 36558 URL: http://svn.reactos.org/svn/reactos?rev=36558&view=rev Log: - Set MiniportBusy to TRUE if a request is pending - Hold spin lock when setting MiniportBusy (forgot one from last time) Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Sep 27 14:54:58 2008 @@ -815,6 +815,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status == NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = TRUE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -999,8 +1005,11 @@ } } - if( NdisStatus != NDIS_STATUS_PENDING ) - Adapter->MiniportBusy = FALSE; + if( NdisStatus != NDIS_STATUS_PENDING ) { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } ExFreePool(WorkItem); }

1 0

[cgutman] 36557: - Don't add the protocol to the protocol list if binding failed
by cgutman＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cgutman Date: Sat Sep 27 14:26:17 2008 New Revision: 36557 URL: http://svn.reactos.org/svn/reactos?rev=36557&view=rev Log: - Don't add the protocol to the protocol list if binding failed Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Sep 27 14:26:17 2008 @@ -42,6 +42,8 @@ */ { PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)BindAdapterContext; + + if (!NT_SUCCESS(Status)) return; /* Put protocol binding struct on global list */ ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock);

1 0

[cgutman] 36556: - Protect MiniportBusy with a spin lock - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK - Make sure memory allocation was successful - Cleanup code in ProRequest
by cgutman＠svn.reactos.org 27 Sep '08

27 Sep '08

Author: cgutman Date: Sat Sep 27 14:00:47 2008 New Revision: 36556 URL: http://svn.reactos.org/svn/reactos?rev=36556&view=rev Log: - Protect MiniportBusy with a spin lock - Adapter is PLOGICAL_ADAPTER not PNDIS_MINIPORT_BLOCK - Make sure memory allocation was successful - Cleanup code in ProRequest Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/include/miniport.h [iso-8859-1] Sat Sep 27 14:00:47 2008 @@ -146,7 +146,7 @@ NDIS_STATUS MiniDoRequest( - PNDIS_MINIPORT_BLOCK Adapter, + PLOGICAL_ADAPTER Adapter, PNDIS_REQUEST NdisRequest); BOOLEAN Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Sep 27 14:00:47 2008 @@ -326,8 +326,10 @@ Request, Status); } + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } VOID NTAPI @@ -357,8 +359,10 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } @@ -392,8 +396,10 @@ AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } @@ -767,7 +773,7 @@ NDIS_STATUS MiniDoRequest( - PNDIS_MINIPORT_BLOCK Adapter, + PLOGICAL_ADAPTER Adapter, PNDIS_REQUEST NdisRequest) /* * FUNCTION: Sends a request to a miniport @@ -782,14 +788,14 @@ KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - Adapter->MediaRequest = NdisRequest; + Adapter->NdisMiniportBlock.MediaRequest = NdisRequest; KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: - Status = (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( - Adapter->MiniportAdapterContext, + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.QueryInformationHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, NdisRequest->DATA.QUERY_INFORMATION.Oid, NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer, NdisRequest->DATA.QUERY_INFORMATION.InformationBufferLength, @@ -798,8 +804,8 @@ break; case NdisRequestSetInformation: - Status = (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( - Adapter->MiniportAdapterContext, + Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SetInformationHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, NdisRequest->DATA.SET_INFORMATION.Oid, NdisRequest->DATA.SET_INFORMATION.InformationBuffer, NdisRequest->DATA.SET_INFORMATION.InformationBufferLength, @@ -833,8 +839,10 @@ KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } VOID NTAPI MiniportWorker(IN PVOID WorkItem) @@ -962,7 +970,7 @@ break; case NdisWorkItemRequest: - NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, (PNDIS_REQUEST)WorkItemContext); + NdisStatus = MiniDoRequest(Adapter, (PNDIS_REQUEST)WorkItemContext); if (NdisStatus == NDIS_STATUS_PENDING) break; @@ -1019,6 +1027,7 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_WORK_ITEM)); + if (!NdisWorkItem) return; WorkItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; @@ -2123,8 +2132,10 @@ ASSERT(Adapter); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->MiniportBusy = FALSE; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); KeLowerIrql(OldIrql); - Adapter->MiniportBusy = FALSE; } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Sep 27 14:00:47 2008 @@ -119,8 +119,6 @@ */ { KIRQL OldIrql; - BOOLEAN QueueWorkItem = FALSE; - NDIS_STATUS NdisStatus; PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; @@ -141,26 +139,15 @@ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { - if(Adapter->MiniportBusy) - QueueWorkItem = TRUE; - } - - /* MiniQueueWorkItem must be called at IRQL >= DISPATCH_LEVEL */ - if (QueueWorkItem) - { - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return NDIS_STATUS_PENDING; - } - + if (Adapter->MiniportBusy) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, (PVOID)NdisRequest); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return NDIS_STATUS_PENDING; + } + } KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest); - - if( NdisStatus == NDIS_STATUS_PENDING ) - Adapter->MiniportBusy = TRUE; - - return NdisStatus; + return MiniDoRequest(Adapter, NdisRequest); }

1 0

← Newer
1
2
3
4
5
6
7
8
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008