Author: fireball Date: Fri Jan 28 22:13:44 2011 New Revision: 50546
URL: http://svn.reactos.org/svn/reactos?rev=50546&view=rev Log: - Oleg Baikalow: TDI exported function prototypes are documented in WDK 7, so use them in our driver instead of old, probably NT4-aged stubs full of unknown variables. - Oleg Baikalow: Don't use psdk's tdi.h but use a real tdikrnl.h (adding a _TDI_ global define so it's recognized as a tdi driver itself).
Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec trunk/reactos/drivers/network/tdi/tdi.rbuild trunk/reactos/drivers/network/tdi/tdi/dereg.c trunk/reactos/drivers/network/tdi/tdi/stubs.c
Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/misc/td... ============================================================================== --- trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] Fri Jan 28 22:13:44 2011 @@ -27,13 +27,13 @@ @ stdcall TdiDeregisterDeviceObject(ptr) @ stdcall TdiDeregisterNetAddress(ptr) @ stdcall TdiDeregisterNotificationHandler(ptr) - @ stdcall TdiInitialize(ptr) + @ stdcall TdiInitialize() @ stdcall TdiMapBuffer(ptr) @ stdcall TdiMapUserRequest(ptr ptr ptr) @ stdcall TdiOpenNetbiosAddress(long long long long) @ stdcall TdiRegisterAddressChangeHandler(long long long) @ stdcall TdiRegisterDeviceObject(long long) - @ stdcall TdiRegisterNetAddress(long long) + @ stdcall TdiRegisterNetAddress(long ptr ptr ptr) @ stdcall TdiRegisterNotificationHandler(long long long) @ stdcall TdiReturnChainedReceives(ptr long) @ stdcall TdiUnmapBuffer(ptr)
Modified: trunk/reactos/drivers/network/tdi/tdi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi.rbu... ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi.rbuild [iso-8859-1] Fri Jan 28 22:13:44 2011 @@ -4,6 +4,7 @@ <importlibrary definition="misc/tdi.spec"></importlibrary> <library>ntoskrnl</library> <library>hal</library> + <define name="_TDI_" /> <directory name="cte"> <file>string.c</file> <file>stubs.c</file>
Modified: trunk/reactos/drivers/network/tdi/tdi/dereg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/der... ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/dereg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/dereg.c [iso-8859-1] Fri Jan 28 22:13:44 2011 @@ -1,8 +1,5 @@ -/* $Id$ - * - */ #include <ntddk.h> -#include <tdi.h> +#include <tdikrnl.h>
/* De-/Register Action IDs for TdiDeRegister */
@@ -21,18 +18,6 @@ } TDI_OBJECT_ACTION;
-static -NTSTATUS -NTAPI -TdiDeRegister ( - IN TDI_OBJECT_ACTION Action, - IN OUT PVOID Object - ) -{ - return STATUS_NOT_IMPLEMENTED; -} - - /* ADDRESS_CHANGE_HANDLER */
/* @@ -40,20 +25,11 @@ */ NTSTATUS NTAPI -TdiRegisterAddressChangeHandler ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2 - ) +TdiRegisterAddressChangeHandler(IN TDI_ADD_ADDRESS_HANDLER AddHandler, + IN TDI_DEL_ADDRESS_HANDLER DeleteHandler, + OUT HANDLE *BindingHandle) { -#if 0 - NTSTATUS Status = STATUS_SUCCESS; - Status = TdiDeRegister ( - R_ADDRESS_CHANGE_HANDLER, - AddressChangeHandler - ); -#endif - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }
@@ -62,14 +38,9 @@ */ NTSTATUS NTAPI -TdiDeregisterAddressChangeHandler ( - IN PVOID AddressChangeHandler - ) +TdiDeregisterAddressChangeHandler(IN HANDLE BindingHandle) { - return TdiDeRegister ( - D_ADDRESS_CHANGE_HANDLER, - AddressChangeHandler - ); + return STATUS_NOT_IMPLEMENTED; }
@@ -80,19 +51,10 @@ */ NTSTATUS NTAPI -TdiRegisterDeviceObject ( - ULONG Unknown0, - ULONG Unknown1 - ) +TdiRegisterDeviceObject(IN PUNICODE_STRING DeviceName, + OUT HANDLE *RegistrationHandle) { -#if 0 - NTSTATUS Status = STATUS_SUCCESS; - Status = TdiDeRegister ( - R_DEVICE_OBJECT, - DeviceObject - ); -#endif - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }
@@ -101,14 +63,9 @@ */ NTSTATUS NTAPI -TdiDeregisterDeviceObject ( - IN PVOID DeviceObject - ) +TdiDeregisterDeviceObject(IN HANDLE RegistrationHandle) { - return TdiDeRegister ( - D_DEVICE_OBJECT, - DeviceObject - ); + return STATUS_NOT_IMPLEMENTED; }
@@ -119,19 +76,12 @@ */ NTSTATUS NTAPI -TdiRegisterNetAddress ( - ULONG Unknown0, - ULONG Unknown1 - ) +TdiRegisterNetAddress(IN PTA_ADDRESS Address, + IN PUNICODE_STRING DeviceName, + IN PTDI_PNP_CONTEXT Context, + OUT HANDLE *RegistrationHandle) { -#if 0 - NTSTATUS Status = STATUS_SUCCESS; - Status = TdiDeRegister ( - R_NET_ADDRESS, - NetAddress - ); -#endif - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }
@@ -140,14 +90,9 @@ */ NTSTATUS NTAPI -TdiDeregisterNetAddress ( - IN PVOID NetAddress - ) +TdiDeregisterNetAddress(IN HANDLE RegistrationHandle) { - return TdiDeRegister ( - D_NET_ADDRESS, - NetAddress - ); + return STATUS_NOT_IMPLEMENTED; }
@@ -158,20 +103,11 @@ */ NTSTATUS NTAPI -TdiRegisterNotificationHandler ( - ULONG Unknown0, - ULONG Unknown1, - ULONG Unknown2 - ) +TdiRegisterNotificationHandler(IN TDI_BIND_HANDLER BindHandler, + IN TDI_UNBIND_HANDLER UnbindHandler, + OUT HANDLE *BindingHandle) { -#if 0 - NTSTATUS Status = STATUS_SUCCESS; - Status = TdiDeRegister ( - R_NOTIFICATION_HANDLER, - NotificationHandler - ); -#endif - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }
@@ -180,15 +116,9 @@ */ NTSTATUS NTAPI -TdiDeregisterNotificationHandler ( - IN PVOID NotificationHandler - ) +TdiDeregisterNotificationHandler(IN HANDLE BindingHandle) { - return TdiDeRegister ( - DT_NOTIFICATION_HANDLER, - NotificationHandler - ); + return STATUS_NOT_IMPLEMENTED; }
- /* EOF */
Modified: trunk/reactos/drivers/network/tdi/tdi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/stu... ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/stubs.c [iso-8859-1] Fri Jan 28 22:13:44 2011 @@ -75,9 +75,7 @@ */ VOID NTAPI -TdiInitialize ( - PVOID Unknown0 - ) +TdiInitialize () { }