Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[cgutman] 41213: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code
by cgutman＠svn.reactos.org 02 Jun '09

02 Jun '09

Author: cgutman Date: Sun May 31 03:07:13 2009 New Revision: 41213 URL: http://svn.reactos.org/svn/reactos?rev=41213&view=rev Log: - Export and hackplement NdisSetTimerEx - Implementation is #ifed out currently but I may enable it later - Hopefully somebody can think of a better way to do it than the current code Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/time.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 03:07:13 2009 @@ -257,6 +257,7 @@ NdisSetPacketPoolProtocolId@8 ;NdisSetProtocolFilter ? NdisSetTimer@8 +NdisSetTimerEx@12 NdisSetupDmaTransfer@24 NdisSystemProcessorCount@0 NdisTerminateWrapper@8 Modified: trunk/reactos/drivers/network/ndis/ndis/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/time.c [iso-8859-1] Sun May 31 03:07:13 2009 @@ -243,5 +243,26 @@ KeSetTimer (&Timer->Timer, Timeout, &Timer->Dpc); } +VOID +EXPORT +NdisSetTimerEx( + IN PNDIS_TIMER Timer, + IN UINT MillisecondsToDelay, + IN PVOID FunctionContext) +{ +#if 0 + /* FIXME: I'm not sure how to this in a nice way + * We can't store the function context anywhere in NDIS_TIMER + * so I'm forced to do this + */ + + Timer->Dpc.DeferredContext = FunctionContext; + + NdisSetTimer(Timer, MillisecondsToDelay); +#else + UNIMPLEMENTED +#endif +} + /* EOF */

2 1

[cgutman] 41232: - Implement and export NdisCompareAnsiString, NdisCompareUnicodeString, and NdisInterlockedAddLargeInteger
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Mon Jun 1 03:20:55 2009 New Revision: 41232 URL: http://svn.reactos.org/svn/reactos?rev=41232&view=rev Log: - Implement and export NdisCompareAnsiString, NdisCompareUnicodeString, and NdisInterlockedAddLargeInteger Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Mon Jun 1 03:20:55 2009 @@ -67,8 +67,8 @@ NdisCoRequest@20 NdisCoRequestComplete@20 NdisCoSendPackets@12 -;NdisCompareAnsiString ? -;NdisCompareUnicodeString ? +NdisCompareAnsiString@12 +NdisCompareUnicodeString@12 NdisCompleteBindAdapter@12 NdisCompleteCloseAdapter@8 NdisCompleteDmaTransfer@24 @@ -150,7 +150,7 @@ NdisInitializeTimer@12 NdisInitializeWrapper@16 NdisInitUnicodeString@8 -;NdisInterlockedAddLargeInterger ? +NdisInterlockedAddLargeInteger@16 NdisInterlockedAddUlong@12 NdisInterlockedDecrement@4 NdisInterlockedIncrement@4 Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon Jun 1 03:20:55 2009 @@ -20,6 +20,58 @@ ExInterlockedAddUlong ( Addend, Increment, &SpinLock->SpinLock ); } +/* + * @implemented + */ +VOID +EXPORT +NdisInterlockedAddLargeInteger( + IN PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN PNDIS_SPIN_LOCK SpinLock) +{ + /* This needs to be verified. The documentation + * seems to be missing but it is exported by + * NDIS 5.1 so I'm implementing it like the other + * interlocked routines + */ + + ExInterlockedAddLargeInteger(Addend, Increment, &SpinLock->SpinLock); +} + +/* + * @implemented + */ +LONG +EXPORT +NdisCompareAnsiString( + IN PNDIS_ANSI_STRING String1, + IN PNDIS_ANSI_STRING String2, + BOOLEAN CaseInSensitive) +{ + /* This one needs to be verified also. See the + * comment in NdisInterlockedAddLargeInteger + */ + + return RtlCompareString(String1, String2, CaseInSensitive); +} + +/* + * @implemented + */ +LONG +EXPORT +NdisCompareUnicodeString( + IN PNDIS_STRING String1, + IN PNDIS_STRING String2, + IN BOOLEAN CaseInSensitive) +{ + /* This one needs to be verified also. See the + * comment in NdisInterlockedAddLargeInteger + */ + + return RtlCompareUnicodeString(String1, String2, CaseInSensitive); +} /* * @implemented @@ -34,7 +86,6 @@ { return ExInterlockedInsertHeadList ( ListHead, ListEntry, &SpinLock->SpinLock ); } - /* * @implemented

1 0

[cgutman] 41231: - Export the stubs for NdisRegisterTdiCallBack, NdisSetProtocolFilter, and NdisClGetProtocolVcContextFromTapiCallId - Remove some extra stuff - Move implemented stuff to misc.c - Add some debug prints
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Mon Jun 1 03:00:32 2009 New Revision: 41231 URL: http://svn.reactos.org/svn/reactos?rev=41231&view=rev Log: - Export the stubs for NdisRegisterTdiCallBack, NdisSetProtocolFilter, and NdisClGetProtocolVcContextFromTapiCallId - Remove some extra stuff - Move implemented stuff to misc.c - Add some debug prints Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/cl.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Mon Jun 1 03:00:32 2009 @@ -34,6 +34,7 @@ NdisClCloseCall@16 NdisClDeregisterSap@4 NdisClDropParty@12 +NdisClGetProtocolVcContextFromTapiCallId@12 NdisClIncomingCallComplete@12 NdisClMakeCall@16 NdisClModifyCallQoS@8 @@ -84,7 +85,7 @@ NdisDeregisterAdapterShutdownHandler@4 NdisDeregisterMac@8 NdisDeregisterProtocol@8 -;NdisDeregisterTdiCallback ? +NdisDeregisterTdiCallBack@0 NdisDestroyBlockPool@4 NdisDprAcquireSpinLock@4 NdisDprAllocatePacket@12 @@ -256,7 +257,7 @@ NdisRegisterAdapter@24 NdisRegisterAdapterShutdownHandler@12 NdisRegisterProtocol@16 -;NdisRegisterTdiCallBack ? +NdisRegisterTdiCallBack@8 NdisReleaseAdapterResources@4 NdisReleaseReadWriteLock@8 NdisReleaseSpinLock@4 @@ -270,7 +271,7 @@ NdisSetPacketCancelId@8 NdisSetPacketPoolProtocolId@8 NdisSetPacketStatus@16 -;NdisSetProtocolFilter ? +NdisSetProtocolFilter@32 NdisSetTimer@8 NdisSetTimerEx@12 NdisSetupDmaTransfer@24 Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Mon Jun 1 03:00:32 2009 @@ -132,28 +132,6 @@ } /* - * @implemented - */ -ULONG -EXPORT -NdisGetSharedDataAlignment(VOID) -{ - return KeGetRecommendedSharedDataAlignment(); -} - -/* - * @implemented - */ -UINT -EXPORT -NdisGetVersion(VOID) -{ - NDIS_DbgPrint(MAX_TRACE, ("NdisGetVersion() has returned 5.1\n")); - - return (UINT) 0x501; -} - -/* * @unimplemented */ PVOID @@ -309,28 +287,31 @@ UNIMPLEMENTED } - -/* -NdisOpenGlobalConfiguration -*/ - -#if 0 +/* + * @unimplemented + */ VOID EXPORT NdisRegisterTdiCallBack( - IN TDI_REGISTER_CALLBACK RegsterCallback) -{ - UNIMPLEMENTED -} -#endif - - -/* -NdisScheduleWorkItem -*/ - - -#if 0 + IN TDI_REGISTER_CALLBACK RegisterCallback, + IN TDI_PNP_HANDLER PnPHandler) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisDeregisterTdiCallBack(VOID) +{ + UNIMPLEMENTED +} + +/* + * @unimplemented + */ VOID EXPORT NdisSetProtocolFilter( @@ -345,18 +326,6 @@ { UNIMPLEMENTED } -#endif - - -/* -NdisUpcaseUnicodeString -NdisUpdateSharedMemory@4 -*/ - - -/* -NdisWriteEventLogEntry -*/ /* Modified: trunk/reactos/drivers/network/ndis/ndis/cl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/cl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/cl.c [iso-8859-1] Mon Jun 1 03:00:32 2009 @@ -10,6 +10,19 @@ #include "ndissys.h" +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisClGetProtocolVcContextFromTapiCallId( + IN UNICODE_STRING TapiCallId, + OUT PNDIS_HANDLE ProtocolVcContext) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} /* * @unimplemented Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon Jun 1 03:00:32 2009 @@ -126,6 +126,8 @@ { PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + HandleObject->Mapped = FALSE; } @@ -140,6 +142,8 @@ PNDIS_HANDLE_OBJECT FileHandleObject; ASSERT_IRQL(PASSIVE_LEVEL); + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); ASSERT ( FileHandle ); @@ -176,6 +180,8 @@ IO_STATUS_BLOCK IoStatusBlock; ASSERT_IRQL(PASSIVE_LEVEL); + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); *Status = NDIS_STATUS_SUCCESS; FullFileName.Buffer = NULL; @@ -280,6 +286,8 @@ * NDIS 5.0 */ { + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); } @@ -294,6 +302,8 @@ ULONG Increment; LARGE_INTEGER TickCount; + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + /* Get the increment and current tick count */ Increment = KeQueryTimeIncrement(); KeQueryTickCount(&TickCount); @@ -388,6 +398,9 @@ ndisProcWorkItemHandler(PVOID pContext) { PNDIS_WORK_ITEM pNdisItem = (PNDIS_WORK_ITEM)pContext; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + pNdisItem->Routine(pNdisItem, pNdisItem->Context); } @@ -397,6 +410,9 @@ IN PNDIS_WORK_ITEM pWorkItem) { PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); ExQueueWorkItem(pntWorkItem, DelayedWorkQueue); return NDIS_STATUS_SUCCESS; @@ -415,7 +431,33 @@ * pCpuUsage = Pointer to a buffer to place CPU usage */ { + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + ExGetCurrentProcessorCpuUsage(pCpuUsage); } +/* + * @implemented + */ +ULONG +EXPORT +NdisGetSharedDataAlignment(VOID) +{ + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + return KeGetRecommendedSharedDataAlignment(); +} + +/* + * @implemented + */ +UINT +EXPORT +NdisGetVersion(VOID) +{ + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + return (UINT) 0x501; +} + /* EOF */

1 0

[khornicek] 41230: - driverName can be null, display info.DriverName instead
by khornicek＠svn.reactos.org 31 May '09

31 May '09

Author: khornicek Date: Mon Jun 1 01:54:34 2009 New Revision: 41230 URL: http://svn.reactos.org/svn/reactos?rev=41230&view=rev Log: - driverName can be null, display info.DriverName instead Modified: trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c [iso-8859-1] Mon Jun 1 01:54:34 2009 @@ -400,7 +400,7 @@ { WCHAR Buffer[256]; snwprintf(Buffer, sizeof(Buffer)/sizeof(WCHAR), - L"Couldn't load driver \"%s\".", driverName); + L"Couldn't load driver \"%s\".", info.DriverName); MessageBox(WindowFromDC( hdc ), Buffer, L"OPENGL32.dll: Warning", MB_OK | MB_ICONWARNING);

1 0

[sginsberg] 41229: Patch from Olaf Siejka <olaf_siejka AT o2 DOT pl> Stub out more IRP type cases instead of printing "Unknown IOCTL"
by sginsberg＠svn.reactos.org 31 May '09

31 May '09

Author: sginsberg Date: Mon Jun 1 00:53:49 2009 New Revision: 41229 URL: http://svn.reactos.org/svn/reactos?rev=41229&view=rev Log: Patch from Olaf Siejka <olaf_siejka AT o2 DOT pl> Stub out more IRP type cases instead of printing "Unknown IOCTL" Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Mon Jun 1 00:53:49 2009 @@ -1295,13 +1295,14 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); switch (IrpSp->MinorFunction) { -#if 0 + case IRP_MN_DEVICE_USAGE_NOTIFICATION: + DPRINT("Unimplemented IRP_MN_DEVICE_USAGE_NOTIFICATION received\n"); break; case IRP_MN_EJECT: - break; -#endif + DPRINT("Unimplemented IRP_MN_EJECT received\n"); + break; case IRP_MN_QUERY_BUS_INFORMATION: Status = PdoQueryBusInformation(DeviceObject, Irp, IrpSp); @@ -1311,11 +1312,10 @@ Status = PdoQueryCapabilities(DeviceObject, Irp, IrpSp); break; -#if 0 case IRP_MN_QUERY_DEVICE_RELATIONS: /* FIXME: Possibly handle for RemovalRelations */ - break; -#endif + DPRINT("Unimplemented IRP_MN_QUERY_DEVICE_RELATIONS received\n"); + break; case IRP_MN_QUERY_DEVICE_TEXT: DPRINT("IRP_MN_QUERY_DEVICE_TEXT received\n"); @@ -1327,10 +1327,9 @@ Status = PdoQueryId(DeviceObject, Irp, IrpSp); break; -#if 0 case IRP_MN_QUERY_PNP_DEVICE_STATE: - break; -#endif + DPRINT("Unimplemented IRP_MN_QUERY_ID received\n"); + break; case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS received\n"); @@ -1342,10 +1341,9 @@ Status = PdoQueryResources(DeviceObject, Irp, IrpSp); break; -#if 0 case IRP_MN_SET_LOCK: - break; -#endif + DPRINT("Unimplemented IRP_MN_SET_LOCK received\n"); + break; case IRP_MN_START_DEVICE: case IRP_MN_QUERY_STOP_DEVICE:

1 0

[cgutman] 41228: - Add TDI_REGISTER_CALLBACK and TDI_PNP_HANDLER
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 21:42:56 2009 New Revision: 41228 URL: http://svn.reactos.org/svn/reactos?rev=41228&view=rev Log: - Add TDI_REGISTER_CALLBACK and TDI_PNP_HANDLER Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=412… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sun May 31 21:42:56 2009 @@ -639,6 +639,19 @@ (*ADAPTER_SHUTDOWN_HANDLER)( IN PVOID ShutdownContext); +typedef NTSTATUS DDKAPI +(*TDI_REGISTER_CALLBACK)( + IN PUNICODE_STRING DeviceName, + OUT HANDLE* TdiHandle); + +typedef NTSTATUS DDKAPI +(*TDI_PNP_HANDLER)( + IN PUNICODE_STRING UpperComponent, + IN PUNICODE_STRING LowerComponent, + IN PUNICODE_STRING BindList, + IN PVOID ReconfigBuffer, + IN UINT ReconfigBufferSize, + IN UINT Operation); typedef struct _OID_LIST OID_LIST, *POID_LIST;

1 0

[jimtabor] 41227: - dmDriverExtra is zeroed before the call to ChangeDisplaySettingsEx.
by jimtabor＠svn.reactos.org 31 May '09

31 May '09

Author: jimtabor Date: Sun May 31 21:33:27 2009 New Revision: 41227 URL: http://svn.reactos.org/svn/reactos?rev=41227&view=rev Log: - dmDriverExtra is zeroed before the call to ChangeDisplaySettingsEx. Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sun May 31 21:33:27 2009 @@ -493,10 +493,9 @@ LPDEVMODEA lpDevMode, DWORD dwflags) { - LONG Status = ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); if(lpDevMode) lpDevMode->dmDriverExtra = 0; - return Status; + return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); } @@ -536,8 +535,7 @@ LPDEVMODEW lpDevMode, DWORD dwflags) { - LONG Status = ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); if(lpDevMode) lpDevMode->dmDriverExtra = 0; - return Status; -} + return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); +}

1 0

[spetreolle] 41226: Return NDIS 5.1 in NdisGetVersion (its XP+)
by spetreolle＠svn.reactos.org 31 May '09

31 May '09

Author: spetreolle Date: Sun May 31 20:14:27 2009 New Revision: 41226 URL: http://svn.reactos.org/svn/reactos?rev=41226&view=rev Log: Return NDIS 5.1 in NdisGetVersion (its XP+) Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun May 31 20:14:27 2009 @@ -148,9 +148,9 @@ EXPORT NdisGetVersion(VOID) { - NDIS_DbgPrint(MAX_TRACE, ("NdisGetVersion() has returned 5.0\n")); - - return (UINT) 0x5; + NDIS_DbgPrint(MAX_TRACE, ("NdisGetVersion() has returned 5.1\n")); + + return (UINT) 0x501; } /*

1 0

[cgutman] 41225: - Implement and export NdisOverrideBusNumber
by cgutman＠svn.reactos.org 31 May '09

31 May '09

Author: cgutman Date: Sun May 31 20:04:43 2009 New Revision: 41225 URL: http://svn.reactos.org/svn/reactos?rev=41225&view=rev Log: - Implement and export NdisOverrideBusNumber Modified: trunk/reactos/drivers/network/ndis/ndis.def trunk/reactos/drivers/network/ndis/ndis/40stubs.c trunk/reactos/drivers/network/ndis/ndis/hardware.c Modified: trunk/reactos/drivers/network/ndis/ndis.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.def [iso-8859-1] Sun May 31 20:04:43 2009 @@ -234,7 +234,7 @@ NdisOpenConfigurationKeyByName@16 NdisOpenFile@24 NdisOpenProtocolConfiguration@12 -;NdisOverrideBusNumber ? +NdisOverrideBusNumber@12 NdisPacketPoolUsage@4 NdisPacketSize@4 NdisPciAssignResources@20 Modified: trunk/reactos/drivers/network/ndis/ndis/40stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Sun May 31 20:04:43 2009 @@ -148,26 +148,6 @@ UNIMPLEMENTED return FALSE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisOverrideBusNumber( - IN NDIS_HANDLE WrapperConfigurationContext, - IN NDIS_HANDLE MiniportAdapterHandle OPTIONAL, - IN ULONG BusNumber) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED } Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Sun May 31 20:04:43 2009 @@ -302,4 +302,31 @@ Length); } +/* + * @implemented + */ +VOID +EXPORT +NdisOverrideBusNumber( + IN NDIS_HANDLE WrapperConfigurationContext, + IN NDIS_HANDLE MiniportAdapterHandle OPTIONAL, + IN ULONG BusNumber) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + PNDIS_WRAPPER_CONTEXT Wrapper = WrapperConfigurationContext; + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + + Wrapper->BusNumber = BusNumber; + + if (Adapter) + Adapter->NdisMiniportBlock.BusNumber = BusNumber; +} + /* EOF */

1 0

[dchapyshev] 41224: - Implement NdisGetSharedDataAlignment and NdisGetVersion
by dchapyshev＠svn.reactos.org 31 May '09

31 May '09

Author: dchapyshev Date: Sun May 31 19:24:56 2009 New Revision: 41224 URL: http://svn.reactos.org/svn/reactos?rev=41224&view=rev Log: - Implement NdisGetSharedDataAlignment and NdisGetVersion Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sun May 31 19:24:56 2009 @@ -132,27 +132,25 @@ } /* - * @unimplemented + * @implemented */ ULONG EXPORT NdisGetSharedDataAlignment(VOID) { - UNIMPLEMENTED - - return 0; -} - -/* - * @unimplemented + return KeGetRecommendedSharedDataAlignment(); +} + +/* + * @implemented */ UINT EXPORT NdisGetVersion(VOID) { - UNIMPLEMENTED - - return 0; + NDIS_DbgPrint(MAX_TRACE, ("NdisGetVersion() has returned 5.0\n")); + + return (UINT) 0x5; } /*

1 0

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 May 2009