Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[arty] 13115: This file migrated to ip.a a while back.

by arty＠svn.reactos.com

This file migrated to ip.a a while back. Deleted: trunk/reactos/drivers/net/tcpip/datalink/loopback.c _____ Deleted: trunk/reactos/drivers/net/tcpip/datalink/loopback.c --- trunk/reactos/drivers/net/tcpip/datalink/loopback.c 2005-01-18 04:39:15 UTC (rev 13114) +++ trunk/reactos/drivers/net/tcpip/datalink/loopback.c 2005-01-18 04:41:17 UTC (rev 13115) @@ -1,132 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: datalink/loopback.c - * PURPOSE: Loopback adapter - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created - */ - -#include "precomp.h" - -VOID LoopTransmit( - PVOID Context, - PNDIS_PACKET NdisPacket, - UINT Offset, - PVOID LinkAddress, - USHORT Type) -/* - * FUNCTION: Transmits a packet - * ARGUMENTS: - * Context = Pointer to context information (NULL) - * NdisPacket = Pointer to NDIS packet to send - * Offset = Offset in packet where packet data starts - * LinkAddress = Pointer to link address - * Type = LAN protocol type (unused) - */ -{ - IP_PACKET IPPacket; - - TI_DbgPrint(MAX_TRACE, ("Called (NdisPacket = %x)\n", NdisPacket)); - - IPPacket.NdisPacket = NdisPacket; - - IPReceive(Context, &IPPacket); - TI_DbgPrint(MAX_TRACE, ("Finished receive\n")); - ASSERT_KM_POINTER(Packet); - ASSERT_KM_POINTER(PC(Packet)); - ASSERT_KM_POINTER(PC(Packet)->DLComplete); - PC(NdisPacket)->DLComplete(Context, NdisPacket, NDIS_STATUS_SUCCESS); - TI_DbgPrint(MAX_TRACE, ("Done\n")); -} - -NDIS_STATUS LoopRegisterAdapter( - PNDIS_STRING AdapterName, - PLAN_ADAPTER *Adapter) -/* - * FUNCTION: Registers loopback adapter with the network layer - * ARGUMENTS: - * AdapterName = Unused - * Adapter = Unused - * RETURNS: - * Status of operation - */ -{ - PIP_ADDRESS Address; - NDIS_STATUS Status; - - Status = NDIS_STATUS_SUCCESS; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - Address = AddrBuildIPv4(LOOPBACK_ADDRESS_IPv4); - if (Address != NULL) - { - LLIP_BIND_INFO BindInfo; - - /* Bind the adapter to network (IP) layer */ - BindInfo.Context = NULL; - BindInfo.HeaderSize = 0; - BindInfo.MinFrameSize = 0; - BindInfo.MTU = 16384; - BindInfo.Address = NULL; - BindInfo.AddressLength = 0; - BindInfo.Transmit = LoopTransmit; - - Loopback = IPCreateInterface(&BindInfo); - - if ((Loopback != NULL) && (IPCreateNTE(Loopback, Address, 8))) - { - /* Reference the interface for the NTE. The reference for - the address is just passed on to the NTE */ - ReferenceObject(Loopback); - - IPRegisterInterface(Loopback); - } - else - { - Status = NDIS_STATUS_RESOURCES; - } - } - else - { - Status = NDIS_STATUS_RESOURCES; - } - - if (!NT_SUCCESS(Status)) - { - LoopUnregisterAdapter(NULL); - } - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -NDIS_STATUS LoopUnregisterAdapter( - PLAN_ADAPTER Adapter) -/* - * FUNCTION: Unregisters loopback adapter with the network layer - * ARGUMENTS: - * Adapter = Unused - * RETURNS: - * Status of operation - * NOTES: - * Does not care wether we have registered loopback adapter - */ -{ - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - if (Loopback != NULL) - { - IPUnregisterInterface(Loopback); - IPDestroyInterface(Loopback); - Loopback = NULL; - } - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return NDIS_STATUS_SUCCESS; -}

19 years, 10 months

[arty] 13114: Removed this IoReleaseCancelSpinlock. I believe it's correct but seems to

by arty＠svn.reactos.com

Removed this IoReleaseCancelSpinlock. I believe it's correct but seems to bugcheck others. Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-18 04:33:31 UTC (rev 13113) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-18 04:39:15 UTC (rev 13114) @@ -63,7 +63,7 @@ * Context = Pointer to context information (FILE_OBJECT) */ { - KIRQL OldIrql; + /*KIRQL OldIrql;*/ PFILE_OBJECT FileObject; PTRANSPORT_CONTEXT TranContext; @@ -76,7 +76,7 @@ KeSetEvent(&TranContext->CleanupEvent, 0, FALSE); /* We are expected to release the cancel spin lock */ - IoReleaseCancelSpinLock(OldIrql); + /*IoReleaseCancelSpinLock(OldIrql);*/ TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); } @@ -150,7 +150,7 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; - NTSTATUS Status = STATUS_SUCCESS; + /*NTSTATUS Status = STATUS_SUCCESS;*/ TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -211,10 +211,9 @@ break; } - if (Status != STATUS_PENDING) - DispCancelComplete(FileObject); - else - IoReleaseCancelSpinLock(Irp->CancelIrql); + IoReleaseCancelSpinLock(Irp->CancelIrql); + + DispCancelComplete(FileObject); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); }

19 years, 10 months

[arty] 13112: HTTP registry browser.

by arty＠svn.reactos.com

HTTP registry browser. Added: trunk/rosapps/net/netreg/ Added: trunk/rosapps/net/netreg/makefile Added: trunk/rosapps/net/netreg/netreg.cpp Added: trunk/rosapps/net/netreg/netreg.rc _____ Added: trunk/rosapps/net/netreg/makefile --- trunk/rosapps/net/netreg/makefile 2005-01-18 04:14:13 UTC (rev 13111) +++ trunk/rosapps/net/netreg/makefile 2005-01-18 04:25:27 UTC (rev 13112) @@ -0,0 +1,22 @@ + +PATH_TO_TOP=../../../reactos + +TARGET_TYPE = program + +TARGET_APPTYPE = console + +TARGET_NAME = netreg + +TARGET_SDKLIBS = + +TARGET_OBJECTS = $(TARGET_NAME).o + +TARGET_GCCLIBS = ws2_32 stdc++ + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +TARGET_CPPFLAGS = -I$(PATH_TO_TOP)/w32api/include -D__USE_W32API + +# EOF _____ Added: trunk/rosapps/net/netreg/netreg.cpp --- trunk/rosapps/net/netreg/netreg.cpp 2005-01-18 04:14:13 UTC (rev 13111) +++ trunk/rosapps/net/netreg/netreg.cpp 2005-01-18 04:25:27 UTC (rev 13112) @@ -0,0 +1,522 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS test application + * FILE: apps/net/netreg/netreg.cpp + * PURPOSE: HTTP Registry Server + * PROGRAMMERS: Art Yerkes (arty(a)users.sf.net) + * REVISIONS: + * 01-17-2005 arty -- initial + */ +#include <windows.h> +#include <winsock.h> +#include <stdlib.h> +#include <map> +#include <string> +#include <sstream> +#include <iomanip> + +using std::hex; +using std::setw; +using std::setfill; +using std::map; +using std::string; +using std::ostringstream; + +const char *root_entries[] = { + "HKEY_LOCAL_MACHINE", + "HKEY_CURRENT_USER", + "HKEY_CLASSES_ROOT", + "HKEY_CURRENT_CONFIG", + "HKEY_USERS", + 0 +}; + +const HKEY root_handles[] = { + HKEY_LOCAL_MACHINE, + HKEY_CURRENT_USER, + HKEY_CLASSES_ROOT, + HKEY_CURRENT_CONFIG, + HKEY_USERS +}; + +class RequestHandler { +public: + RequestHandler( SOCKET s ) : socket( s ), state( NO_REQUEST_YET ) {} + ~RequestHandler() { closesocket( socket ); } + void RecvData( string input ) { + full_input += input; + if( full_input.find( "\r\n\r\n" ) != string::npos ) { + // Full request received... + size_t space_pos = full_input.find( ' ' ); + if( space_pos == string::npos ) { state = SHOULD_DIE; return; } + string method = full_input.substr( 0, space_pos ); + if( method != "GET" ) { state = SHOULD_DIE; return; } + space_pos++; + if( full_input[space_pos] != '/' ) { state = SHOULD_DIE; return; } + space_pos++; + string reg_key_and_remainder = + full_input.substr( space_pos, full_input.size() - space_pos ); + space_pos = reg_key_and_remainder.find( ' ' ); + if( space_pos == string::npos ) { state = SHOULD_DIE; return; } + string reg_key_name = reg_key_and_remainder.substr( 0, space_pos ); + process_request( urldec( reg_key_name ) ); + state = REQUEST_RECVD_SENDING_REPLY; + } + } + void OkToSend() { + int rv = send( socket, + remaining_output.c_str(), + remaining_output.size(), 0 ); + if( rv < 0 ) { + state = SHOULD_DIE; + return; + } else { + remaining_output = + remaining_output.substr( rv, remaining_output.size() - rv ); + if( remaining_output.size() == 0 ) { + state = SHOULD_DIE; + } + } + } + + SOCKET GetSocket() const { return socket; } + + bool ShouldDie() const { + return state == SHOULD_DIE; + } + + bool WantPollout() const { + return state == REQUEST_RECVD_SENDING_REPLY; + } + + +private: + string urlenc( string in ) { + ostringstream out; + + for( string::iterator i = in.begin(); + i != in.end(); + i++ ) { + if( isalnum( *i ) || *i == '/' ) + out << *i; + else { + char minibuf[10]; + sprintf( minibuf, "%02x", *i ); + out << "%" << minibuf; + } + } + + return out.str(); + } + + string urldec( string in ) { + string out; + + for( string::iterator i = in.begin(); + i != in.end(); + i++ ) { + if( *i == '%' ) { + char buf[3]; + int res = ' '; + + i++; + if( i != in.end() ) { + buf[0] = *i; + i++; + if( i != in.end() ) { + buf[1] = *i; + buf[2] = 0; + sscanf( buf, "%x", &res ); + fprintf( stderr, "Interpreting %c%c as %02x\n", + buf[0], buf[1], + res ); + out += (char)res; + } + } + } else out += *i; + } + + return out; + } + + string dump_one_line( const char *data, int llen, int len, int addr ) { + ostringstream out; + int i; + + out << setw( 8 ) << setfill( '0' ) << hex << addr << ": "; + + for( i = 0; i < llen; i++ ) { + if( i < len ) out << setw( 2 ) << setfill( '0' ) << hex << + (data[i] & 0xff) << " "; + else out << " "; + } + + out << " : "; + + for( i = 0; i < llen; i++ ) { + if( i < len && i < llen && + data[i] >= ' ' && data[i] < 0x7f ) out << data[i]; else out << '.'; + } + + out << "\n"; + + return out.str(); + } + + string bindump( const char *data, int len ) { + const char *end = data + len; + string out; + int addr = 0; + + out += "<pre>"; + + while( data < end ) { + out += dump_one_line( data, 16, end - data, addr ); + addr += 16; + data += 16; + } + + out += "</pre>"; + + return out; + } + + string present_value( DWORD type, const char *data, DWORD len ) { + switch( type ) { + default: + return bindump( data, len ); + } + } + + void process_valid_request( HKEY open_reg_key, string key_name ) { + size_t ending_slash; + string up_level; + ostringstream text_out; + + DWORD num_sub_keys; + DWORD max_subkey_len; + DWORD num_values; + DWORD max_value_name_len; + DWORD max_value_len; + + char *value_name_buf; + char *value_buf; + char *key_name_buf; + + if( RegQueryInfoKey( open_reg_key, + NULL, + NULL, + NULL, + &num_sub_keys, + &max_subkey_len, + NULL, + &num_values, + &max_value_name_len, + &max_value_len, + NULL, + NULL ) != ERROR_SUCCESS ) { + process_invalid_request( key_name ); + return; + } + + value_name_buf = new char [max_value_name_len+1]; + value_buf = new char [max_value_len+1]; + key_name_buf = new char [max_subkey_len+1]; + + ending_slash = key_name.rfind( '/' ); + if( ending_slash != string::npos ) + up_level = key_name.substr( 0, ending_slash ); + + text_out << "HTTP/1.0 200 OK\r\n" + << "Content-Type: text/html\r\n" + << "\r\n" + << "<html><head><title>Registry Key `" + << key_name + << "'</title></head><body>\r\n" + << "<h1>Registry Key `" << key_name << "'</h1>\r\n" + << "<a href='/" << urlenc(up_level) + << "'>(Up one level)</a><p>\r\n" + << "<h2>Subkeys:</h2><table border='1'>\r\n"; + + DWORD which_index; + DWORD key_name_size; + + for( which_index = 0; which_index < num_sub_keys; which_index++ ) { + key_name_size = max_subkey_len+1; + RegEnumKeyEx( open_reg_key, + which_index, + key_name_buf, + &key_name_size, + NULL, + NULL, + NULL, + NULL ); + text_out << "<tr><td><a href='/" << urlenc(key_name) << "/" + << urlenc(string(key_name_buf,key_name_size)) << "'>" + << string(key_name_buf,key_name_size) + << "</a></td></tr>\r\n"; + } + + text_out << "</table><h2>Values:</h2><table border='1'>\r\n"; + + DWORD value_name_size; + DWORD value_data_size; + DWORD value_type; + + for( which_index = 0; which_index < num_values; which_index++ ) { + value_name_size = max_value_name_len+1; + value_data_size = max_value_len+1; + + RegEnumValue( open_reg_key, + which_index, + value_name_buf, + &value_name_size, + NULL, + &value_type, + (BYTE *)value_buf, + &value_data_size ); + + text_out << "<tr><td><b>" << string(value_name_buf,value_name_size) + << "</b></td><td>" + << present_value( value_type, value_buf, value_data_size ) + << "</td></tr>"; + } + + text_out << "</ul></body></html>\r\n"; + + delete [] key_name_buf; + delete [] value_name_buf; + delete [] value_buf; + + remaining_output = text_out.str(); + } + + void process_invalid_request( string reg_key ) { + ostringstream text_out; + text_out << "HTTP/1.0 404 Not Found\r\n" + << "Content-Type: text/html\r\n" + << "\r\n" + << "<html><head><title>Can't find registry key `" + << reg_key + << "'</title></head><body>\r\n" + << "<H1>Can't find registry key `" + << reg_key + << "'</H1>\r\n" + << "The registry key doesn't exist in the local registry.\r\n" + << "</body></html>\r\n"; + + remaining_output = text_out.str(); + } + + void process_root_request() { + ostringstream text_out; + int i; + + text_out << "HTTP/1.0 200 OK\r\n" + << "Content-Type: text/html\r\n" + << "\r\n" + << "<html><head><title>Registry Browser</title></head>\r\n" + << "<body>\r\n" + << "<H1>Registry Browser</H1>" + << "You can use this interface to browse the registry." + << "You will be presented with one registry key at a time and " + << "the decendents.\r\n" + << "<h2>Root Level</h2>\r\n" + << "Subkeys:<ul>\r\n"; + + for( i = 0; root_entries[i]; i++ ) + text_out << "<li>" + << "<a href='/" << urlenc(root_entries[i]) + << "'>" << root_entries[i] + << "</a></li>\r\n"; + + text_out << "</ul></body></html>\r\n"; + + remaining_output = text_out.str(); + } + + void process_request( string reg_key ) { + int i; + bool is_predefined_key = true; + + if( reg_key == "" ) { process_root_request(); return; } + HKEY hRegKey = 0; + + // Parse the key name... + size_t slash = reg_key.find( '/' ); + string reg_initial = ""; + + if( slash == string::npos ) // A root key... + reg_initial = reg_key; + else // Any other key + reg_initial = reg_key.substr( 0, slash ); + + fprintf( stderr, "reg_init = %s, reg_key = %s\n", + reg_initial.c_str(), + reg_key.c_str() ); + + for( i = 0; root_entries[i]; i++ ) + if( reg_initial == root_entries[i] ) hRegKey = root_handles[i]; + + if( hRegKey != 0 && reg_initial != reg_key ) { + size_t start_of_reg_path = reg_initial.size() + 1; + string reg_path = reg_key.substr( start_of_reg_path, + reg_key.size() - start_of_reg_path ); + + string reg_open_path = reg_path; + do { + slash = reg_open_path.find( '/' ); + string reg_single_key = reg_open_path; + + if( slash != string::npos ) { + reg_single_key = reg_open_path.substr( 0, slash ); + reg_open_path = reg_open_path.substr( slash+1, + reg_open_path.size() ); + } + + HKEY oldKey = hRegKey; + + fprintf( stderr, "Opening %s\n", reg_single_key.c_str() ); + + if( RegOpenKey( hRegKey, reg_single_key.c_str(), &hRegKey ) != + ERROR_SUCCESS ) { + hRegKey = 0; + break; + } else RegCloseKey( oldKey ); + + is_predefined_key = false; + } while( slash != string::npos ); + } + + if( hRegKey == 0 ) process_invalid_request( reg_key ); + else { + process_valid_request( hRegKey, reg_key ); + if( !is_predefined_key ) RegCloseKey( hRegKey ); + } + } + + typedef enum _RHState { + NO_REQUEST_YET, + REQUEST_RECVD_SENDING_REPLY, + SHOULD_DIE + } RHState; + + string full_input; + string remaining_output; + RHState state; + SOCKET socket; +}; + +SOCKET make_listening_socket( int port ) { + struct sockaddr_in sa; + + ZeroMemory( &sa, sizeof( sa ) ); + + sa.sin_family = PF_INET; + sa.sin_port = ntohs( port ); + + fprintf( stderr, "Creating the listener\n" ); + SOCKET l = socket( PF_INET, SOCK_STREAM, 0 ); + fprintf( stderr, "Socket %x\n", l ); + + if( l == INVALID_SOCKET ) return l; + if( bind( l, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 ) { + fprintf( stderr, "Bad response from bind: %d\n", WSAGetLastError() ); + closesocket( l ); return INVALID_SOCKET; + } + if( listen( l, 5 ) < 0 ) { + fprintf( stderr, "Listening: %d\n", WSAGetLastError() ); + closesocket( l ); + return INVALID_SOCKET; + } + + return l; +} + +int main( int argc, char **argv ) { + WSADATA wdWinsockData; + map<SOCKET,RequestHandler *> requests; + fd_set pollin,pollout,pollerr; + SOCKET listen_socket; + int i; + int port_to_listen = 80; + int active_fds = 0; + + for( i = 1; i < argc; i++ ) { + if( string( "-p" ) == argv[i] ) { + i++; + if( i < argc ) port_to_listen = atoi( argv[i] ); + } + } + + WSAStartup( 0x0101, &wdWinsockData ); + + listen_socket = make_listening_socket( port_to_listen ); + if( listen_socket == INVALID_SOCKET ) return 1; + + while( true ) { + FD_ZERO( &pollin ); + FD_ZERO( &pollout ); + FD_ZERO( &pollerr ); + active_fds = listen_socket + 1; + + for( std::map<SOCKET,RequestHandler *>::iterator i = requests.begin(); + i != requests.end(); + i++ ) { + if( i->second->ShouldDie() ) { + delete i->second; + requests.erase( i ); + i = requests.begin(); + break; + } + + FD_SET(i->first,&pollin); + FD_SET(i->first,&pollerr); + + if( i->first > active_fds ) active_fds = i->first + 1; + + if( i->second->WantPollout() ) FD_SET(i->first,&pollout); + } + + FD_SET(listen_socket,&pollin); + + struct timeval tv; + + active_fds = select( active_fds, &pollin, &pollout, &pollerr, NULL ); + + if( active_fds > 0 ) { + if( FD_ISSET(listen_socket,&pollin) ) { + SOCKET ns = accept( listen_socket, NULL, NULL ); + if( ns != INVALID_SOCKET ) { + requests.insert( std::make_pair( ns, new RequestHandler( ns ) ) ); + } + } + + for( std::map<SOCKET,RequestHandler *>::iterator i = requests.begin(); + i != requests.end(); + i++ ) { + if( FD_ISSET(i->first,&pollin) ) { + char inbuf[1024]; + int rv = recv(i->first,inbuf,1024,0); + if( rv < 0 ) { + delete i->second; + requests.erase( i ); + i = requests.begin(); + break; + } else i->second->RecvData( string( inbuf, rv ) ); + } + if( FD_ISSET(i->first,&pollout) ) { + i->second->OkToSend(); + } + if( FD_ISSET(i->first,&pollerr) ) { + delete i->second; + requests.erase( i ); + i = requests.begin(); + break; + } + } + } + } + + WSACleanup(); +} _____ Added: trunk/rosapps/net/netreg/netreg.rc --- trunk/rosapps/net/netreg/netreg.rc 2005-01-18 04:14:13 UTC (rev 13111) +++ trunk/rosapps/net/netreg/netreg.rc 2005-01-18 04:25:27 UTC (rev 13112) @@ -0,0 +1,6 @@ +/* $Id: niclist.rc 11299 2004-10-16 22:30:19Z gvg $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS HTTP Registry Browser\0" +#define REACTOS_STR_INTERNAL_NAME "netreg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "netreg.exe\0" +#include <reactos/version.rc>

19 years, 10 months

[arty] 13111: Browsing netreg, the http registry server works.

by arty＠svn.reactos.com

Browsing netreg, the http registry server works. Modified: trunk/reactos/drivers/net/afd/afd/connect.c Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/net/afd/afd/write.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c _____ Modified: trunk/reactos/drivers/net/afd/afd/connect.c --- trunk/reactos/drivers/net/afd/afd/connect.c 2005-01-18 04:02:49 UTC (rev 13110) +++ trunk/reactos/drivers/net/afd/afd/connect.c 2005-01-18 04:14:13 UTC (rev 13111) @@ -61,7 +61,7 @@ ReceiveComplete, FCB ); } - + return Status; } _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-01-18 04:02:49 UTC (rev 13110) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-01-18 04:14:13 UTC (rev 13111) @@ -140,6 +140,7 @@ VOID DestroySocket( PAFD_FCB FCB ) { UINT i; + BOOLEAN ReturnEarly = FALSE; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB)); @@ -161,8 +162,7 @@ FCB->ListenIrp.InFlightRequest, FCB->ReceiveIrp.InFlightRequest, FCB->SendIrp.InFlightRequest)); - SocketStateUnlock( FCB ); - return; + ReturnEarly = TRUE; } /* After PoolReeval, this FCB should not be involved in any outstanding @@ -181,6 +181,8 @@ } SocketStateUnlock( FCB ); + + if( ReturnEarly ) return; if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); _____ Modified: trunk/reactos/drivers/net/afd/afd/write.c --- trunk/reactos/drivers/net/afd/afd/write.c 2005-01-18 04:02:49 UTC (rev 13110) +++ trunk/reactos/drivers/net/afd/afd/write.c 2005-01-18 04:14:13 UTC (rev 13111) @@ -208,6 +208,12 @@ if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL, FALSE ); + + /* Must lock buffers before handing off user data */ + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); @@ -260,7 +266,7 @@ SendReq->BufferCount, NULL, NULL, FALSE, FALSE ); - + AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n", FCB->Send.BytesUsed)); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-18 04:02:49 UTC (rev 13110) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-18 04:14:13 UTC (rev 13111) @@ -82,6 +82,60 @@ } +VOID DispDataRequestComplete( + PVOID Context, + NTSTATUS Status, + ULONG Count) +/* + * FUNCTION: Completes a send/receive IRP + * ARGUMENTS: + * Context = Pointer to context information (IRP) + * Status = Status of the request + * Count = Number of bytes sent or received + */ +{ + PIRP Irp; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TranContext; + KIRQL OldIrql; + + TI_DbgPrint(DEBUG_IRP, ("Called for irp %x (%x, %d).\n", + Context, Status, Count)); + + Irp = Context; + IrpSp = IoGetCurrentIrpStackLocation(Irp); + TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; + + IoAcquireCancelSpinLock(&OldIrql); + + IoSetCancelRoutine(Irp, NULL); + + if (Irp->Cancel || TranContext->CancelIrps) { + /* The IRP has been cancelled */ + + TI_DbgPrint(DEBUG_IRP, ("IRP is cancelled.\n")); + + Status = STATUS_CANCELLED; + Count = 0; + } + + IoReleaseCancelSpinLock(OldIrql); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Count; + + TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Status = %x\n", + Irp->IoStatus.Status)); + TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Information = %d\n", + Irp->IoStatus.Information)); + TI_DbgPrint(DEBUG_IRP, ("Completing IRP at (0x%X).\n", Irp)); + + IRPFinish(Irp, Irp->IoStatus.Status); + + TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); +} + + VOID DDKAPI DispCancelRequest( PDEVICE_OBJECT Device, PIRP Irp) @@ -112,13 +166,26 @@ TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n")); #endif - IoReleaseCancelSpinLock(Irp->CancelIrql); - /* Try canceling the request */ switch(MinorFunction) { case TDI_SEND: + TCPDisconnect + ( TranContext->Handle.ConnectionContext, + TDI_DISCONNECT_RELEASE, + NULL, + NULL, + DispDataRequestComplete, + Irp ); + break; + case TDI_RECEIVE: - /* FIXME: Close connection */ + TCPDisconnect + ( TranContext->Handle.ConnectionContext, + TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE, + NULL, + NULL, + DispDataRequestComplete, + Irp ); break; case TDI_SEND_DATAGRAM: @@ -146,64 +213,13 @@ if (Status != STATUS_PENDING) DispCancelComplete(FileObject); + else + IoReleaseCancelSpinLock(Irp->CancelIrql); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } -VOID DispDataRequestComplete( - PVOID Context, - NTSTATUS Status, - ULONG Count) -/* - * FUNCTION: Completes a send/receive IRP - * ARGUMENTS: - * Context = Pointer to context information (IRP) - * Status = Status of the request - * Count = Number of bytes sent or received - */ -{ - PIRP Irp; - PIO_STACK_LOCATION IrpSp; - PTRANSPORT_CONTEXT TranContext; - KIRQL OldIrql; - TI_DbgPrint(DEBUG_IRP, ("Called for irp %x (%x, %d).\n", - Context, Status, Count)); - - Irp = Context; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; - - IoAcquireCancelSpinLock(&OldIrql); - - IoSetCancelRoutine(Irp, NULL); - - if (Irp->Cancel || TranContext->CancelIrps) { - /* The IRP has been cancelled */ - - TI_DbgPrint(DEBUG_IRP, ("IRP is cancelled.\n")); - - Status = STATUS_CANCELLED; - Count = 0; - } - - IoReleaseCancelSpinLock(OldIrql); - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Count; - - TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Status = %x\n", - Irp->IoStatus.Status)); - TI_DbgPrint(MID_TRACE, ("Irp->IoStatus.Information = %d\n", - Irp->IoStatus.Information)); - TI_DbgPrint(DEBUG_IRP, ("Completing IRP at (0x%X).\n", Irp)); - - IRPFinish(Irp, Irp->IoStatus.Status); - - TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n")); -} - - NTSTATUS DispTdiAccept( PIRP Irp) /*

19 years, 10 months

[ion] 13110: MSVC compatibility for NCITool, fix more svn:ignore stuff..., enable interrupts during APC delivery and syscall calling, because the functions are probably expecting them to be enabled at that time.

by ion＠svn.reactos.com

MSVC compatibility for NCITool, fix more svn:ignore stuff..., enable interrupts during APC delivery and syscall calling, because the functions are probably expecting them to be enabled at that time. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/tools/nci/ncitool.c Property changes on: trunk/reactos/lib/psapi ___________________________________________________________________ Name: svn:ignore - temp.exp *.tmp *.sym *.coff *.dll *.o *.a *.d *.map *.gch + temp.exp *.tmp *.sym *.coff *.dll *.o *.a *.d *.map *.gch misc _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-18 03:35:37 UTC (rev 13109) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-18 04:02:49 UTC (rev 13110) @@ -105,10 +105,10 @@ #endif /* Load the segment registers */ + sti movw $KERNEL_DS, %bx movw %bx, %ds movw %bx, %es - movw %bx, %gs /* Save the old trap frame pointer where EDX would be saved */ movl KTHREAD_TRAP_FRAME(%esi), %ebx @@ -192,6 +192,7 @@ _KiServiceExit: /* Get the Current Thread */ + cli movl %fs:KPCR_CURRENT_THREAD, %esi /* Deliver APCs only if we were called from user mode */ @@ -213,10 +214,12 @@ pushl %eax /* Deliver APCs */ + sti pushl %ebx pushl $0 pushl $UserMode call _KiDeliverApc@12 + cli /* Return to old IRQL */ popl %ecx _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-01-18 03:35:37 UTC (rev 13109) +++ trunk/reactos/tools/nci/ncitool.c 2005-01-18 04:02:49 UTC (rev 13110) @@ -46,21 +46,45 @@ * This stubs calls into KUSER_SHARED_DATA where either a * sysenter or interrupt is performed, depending on CPU support. */ +#if defined(__GNUC__) #define UserModeStub_x86 " movl $0x%x, %%eax\n" \ " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ " call *%%ecx\n" \ " ret $0x%x\n\n" +#elif defined(_MSC_VER) +#define UserModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " mov ecx, KUSER_SHARED_SYSCALL\n" \ + " call [ecx]\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif /* * This stub calls KiSystemService directly with a fake INT2E stack. * Because EIP is pushed during the call, the handler will return here. */ +#if defined(__GNUC__) #define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ " leal 4(%%esp), %%edx\n" \ " pushfl\n" \ " pushl $KERNEL_CS\n" \ " call _KiSystemService\n" \ " ret $0x%x\n\n" +#elif defined(_MSC_VER) +#define KernelModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " lea edx, [esp+4]\n" \ + " pushf\n" \ + " push KERNEL_CS\n" \ + " call _KiSystemService\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif /***** Arch Dependent Stuff ******/ //#ifdef _M_IX86

19 years, 10 months

[mtempel] 13109: Update to load usbuhci

by mtempel＠svn.reactos.com

Update to load usbuhci Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-01-18 03:34:18 UTC (rev 13108) +++ trunk/reactos/bootdata/hivesys.inf 2005-01-18 03:35:37 UTC (rev 13109) @@ -567,6 +567,20 @@ HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Class",0x00000000,"C omputer" HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x0000000 0,"{4D36E966-E325-11CE-BFC1-08002BE10318}" +;USB UHCI Driver +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010 001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x0 0000003 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Ba se" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00020000,"Sys tem32\DRIVERS\usbuhci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x000 0000f +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","DisplayName",0x000000 00,"ReactOS USB UHCI controller miniport driver" +;hard coded values for VMWARE +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","0",0x00000000,"P CI\VEN_8086&DEV_7112&SUBSYS_197615AD&REV_00\0000" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","Count",0x0001000 1,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci\Enum","NextInstance",0x 00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_8086&DEV_7112&SUBSYS_197615 AD&REV_00\0000","Service",0x0000000,"usbuhci" + ; ReactOS PCNet NIC driver ; To use the AMD supplied driver change the driver name to pcntn5m.sys ;

19 years, 10 months

[mtempel] 13108: Update to add some debugging messages.

by mtempel＠svn.reactos.com

Update to add some debugging messages. Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbport/usbport.c _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c 2005-01-18 03:28:00 UTC (rev 13107) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.c 2005-01-18 03:34:18 UTC (rev 13108) @@ -22,12 +22,14 @@ #include "usbuhci.h" #include "../../usbport/usbport.h" - +#include <debug.h> /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ NTSTATUS STDCALL DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { + //return STATUS_SUCCESS; + //DPRINT1("USBUHCI.SYS DriverEntry\n"); PUSB_CONTROLLER_INTERFACE ControllerInterface; USBPORT_AllocateUsbControllerInterface(&ControllerInterface); _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h --- trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-01-18 03:28:00 UTC (rev 13107) +++ trunk/reactos/drivers/usb/miniport/usbuhci/usbuhci.h 2005-01-18 03:34:18 UTC (rev 13108) @@ -28,12 +28,6 @@ //#include <ddk/miniport.h> #include <ddk/ntapi.h> -#ifdef DBG -#define DPRINT(arg) DbgPrint arg; -#else -#define DPRINT(arg) -#endif - // Export funcs here /* BOOL FASTCALL _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.c --- trunk/reactos/drivers/usb/usbport/usbport.c 2005-01-18 03:28:00 UTC (rev 13107) +++ trunk/reactos/drivers/usb/usbport/usbport.c 2005-01-18 03:34:18 UTC (rev 13108) @@ -26,6 +26,7 @@ #include <windef.h> #include <ddk/ntddk.h> #include "usbport.h" +#include <debug.h> /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ @@ -36,6 +37,7 @@ NTSTATUS STDCALL DriverEntry(IN PVOID Context1, IN PVOID Context2) { + DPRINT1("USBPORT.SYS DriverEntry\n"); return STATUS_SUCCESS; } /* @@ -45,6 +47,7 @@ USBPORT_RegisterUSBPortDriver(PDRIVER_OBJECT DriverObject, DWORD Unknown1, PUSB_CONTROLLER_INTERFACE Interface) { + //DPRINT1("USBPORT_RegisterUSBPortDriver\n"); ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); return STATUS_SUCCESS; @@ -61,6 +64,7 @@ NTSTATUS STDCALL USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface) { + //DPRINT1("USBPORT_AllocateUsbControllerInterface\n"); ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); ASSERT(0 != ControllerObject); @@ -73,6 +77,7 @@ NTSTATUS STDCALL USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface) { + //DPRINT1("USBPORT_FreeUsbControllerInterface\n"); ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); ExFreePool(ControllerInterface);

19 years, 10 months

[ion] 13107: Fix SYSENTER support in VMware. New benchmar: 200ms. ***70%*** faster then with Int2E. Fix FPU save bug/explorer bug. Fix Vmware 4.0 crash bug. HARTMUT IS A GENIUS.

by ion＠svn.reactos.com

Fix SYSENTER support in VMware. New benchmar: 200ms. ***70%*** faster then with Int2E. Fix FPU save bug/explorer bug. Fix Vmware 4.0 crash bug. HARTMUT IS A GENIUS. Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c Deleted: trunk/reactos/win32k.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-18 02:12:45 UTC (rev 13106) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-18 03:28:00 UTC (rev 13107) @@ -26,14 +26,14 @@ .globl _KiSystemService _KiFastCallEntry: - + /* Set FS to PCR */ movl $PCR_SELECTOR, %ecx movw %cx, %fs - + /* Set the current stack to Kernel Stack */ movl %fs:KPCR_TSS, %ecx - movl KTSS_ESP0(%ecx), %ecx + movl %ss:KTSS_ESP0(%ecx), %ecx movl %ecx, %esp /* Set up a fake INT Stack. */ @@ -205,7 +205,7 @@ /* Save pointer to Trap Frame */ movl %esp, %ebx - /* Raise IRQL to HIGH_LEVEL */ + /* Raise IRQL to APC_LEVEL */ movl $1, %ecx call @KfRaiseIrql@4 _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-01-18 02:12:45 UTC (rev 13106) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-01-18 03:28:00 UTC (rev 13107) @@ -316,43 +316,6 @@ } BOOL -DisableFastSystemCall(VOID) -{ - DWORD Value = 1; - HKEY hReg; - - /* Open or Create the Kernel Settings Key */ - if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Kernel", - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hReg, - NULL) != ERROR_SUCCESS) { - DbgPrint("Failed to Disable Sysenter\n"); - return FALSE; - } - - /* Disable Fast System Call */ - if(RegSetValueEx(hReg, - L"FastSystemCallDisable", - 0, - REG_DWORD, - (BYTE*)&Value, - sizeof(DWORD)) != ERROR_SUCCESS) { - RegCloseKey(hReg); - DbgPrint("Failed to Disable Sysenter\n"); - return FALSE; - } - - /* Return Success */ - RegCloseKey(hReg); - return TRUE; -} - -BOOL EnableDriver(WCHAR *Key, BOOL Enable) { DWORD Value; @@ -1061,9 +1024,6 @@ /* restore the exception handler */ SetUnhandledExceptionFilter(OldHandler); - /* Disable Fast System Call no matter what */ - DisableFastSystemCall(); - lc = DestinationPath; lc += GetSystemDirectory(DestinationPath, MAX_PATH) - 1; if(lc >= DestinationPath && *lc != L'\\') _____ Deleted: trunk/reactos/win32k.S --- trunk/reactos/win32k.S 2005-01-18 02:12:45 UTC (rev 13106) +++ trunk/reactos/win32k.S 2005-01-18 03:28:00 UTC (rev 13107) @@ -1 +0,0 @@ -#include "../gdi32/misc/win32k.c"

19 years, 10 months

[mtempel] 13106:

by mtempel＠svn.reactos.com

Modified: trunk/reactos/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-18 01:32:01 UTC (rev 13105) +++ trunk/reactos/Makefile 2005-01-18 02:12:45 UTC (rev 13106) @@ -122,7 +122,7 @@ endif KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \ - $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS + $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS USB_DRIVERS # Regression tests REGTESTS = regtests @@ -578,7 +578,31 @@ .PHONY: VIDEO_DRIVERS VIDEO_DRIVERS_implib VIDEO_DRIVERS_test\ VIDEO_DRIVERS_clean VIDEO_DRIVERS_install VIDEO_DRIVERS_bootcd +# +# USB device driver rules +# +USB_DRIVERS: $(IMPLIB) + $(MAKE) -C drivers/usb +USB_DRIVERS_implib: dk + $(MAKE) --silent -C drivers/usb implib + +USB_DRIVERS_test: + $(MAKE) -C drivers/usb test + +USB_DRIVERS_clean: + $(MAKE) -C drivers/usb clean + +USB_DRIVERS_install: + $(MAKE) -C drivers/usb install + +USB_DRIVERS_bootcd: + $(MAKE) -C drivers/usb bootcd + +.PHONY: USB_DRIVERS USB_DRIVERS_implib USB_DRIVERS_test\ + USB_DRIVERS_clean USB_DRIVERS_install USB_DRIVERS_bootcd + + # # Input driver rules #

19 years, 10 months

[arty] 13105: Removed old stupid cruft i added when i didn't understand this code.

by arty＠svn.reactos.com

Removed old stupid cruft i added when i didn't understand this code. Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c 2005-01-17 22:05:00 UTC (rev 13104) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c 2005-01-18 01:32:01 UTC (rev 13105) @@ -363,9 +363,7 @@ #ifdef OSKIT oskit_bufio_addref(m->m_ext.ext_bufio); #else -#ifdef __REACTOS__ - m->m_data = malloc(m->m_len); -#else +#ifndef __REACTOS__ mclrefcnt[mtocl(m->m_ext.ext_buf)]++; #endif #endif /* OSKIT */ @@ -416,6 +414,7 @@ if (m == 0) panic("m_copydata"); count = min(m->m_len - off, len); + OS_DbgPrint(OSK_MID_TRACE,("count %d len %d\n", count, len)); bcopy(mtod(m, caddr_t) + off, cp, count); len -= count; cp += count;

19 years, 10 months

← Newer
1
...
24
25
26
27
28
29
30
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005