Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36242: add PCI_SUBCLASS_SB_SMBUS
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 11:22:42 2008 New Revision: 36242 URL: http://svn.reactos.org/svn/reactos?rev=36242&view=rev Log: add PCI_SUBCLASS_SB_SMBUS Modified: trunk/reactos/drivers/bus/pci/pci.c trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] Sun Sep 14 11:22:42 2008 @@ -606,6 +606,10 @@ Description = L"Fibre Channel controller"; break; + case PCI_SUBCLASS_SB_SMBUS: + Description = L"SMBus controller"; + break; + default: Description = L"Other serial bus controller"; break; Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Sep 14 11:22:42 2008 @@ -4301,6 +4301,7 @@ #define PCI_SUBCLASS_SB_SSA 0x02 #define PCI_SUBCLASS_SB_USB 0x03 #define PCI_SUBCLASS_SB_FIBRE_CHANNEL 0x04 +#define PCI_SUBCLASS_SB_SMBUS 0x05 #define PCI_MAX_DEVICES 32 #define PCI_MAX_FUNCTION 8

1 0

[cwittich] 36241: add kvmnet.sys and kvmnet.inf to bootcd (OPTIONAL)
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 09:29:33 2008 New Revision: 36241 URL: http://svn.reactos.org/svn/reactos?rev=36241&view=rev Log: add kvmnet.sys and kvmnet.inf to bootcd (OPTIONAL) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Sep 14 09:29:33 2008 @@ -673,3 +673,5 @@ modules\windows\vmx_mode.dll 1 optional modules\windows\vmx_svga.sys 2 optional modules\windows\vmx_svga.inf 6 optional +modules\windows\kvmnet.sys 2 optional +modules\windows\kvmnet.inf 6 optional

1 0

[cgutman] 36240: - Merge aicom-network-fixes up to r36215 - We now queue a work item to do most of the work - Send/SendPackets now get called at the correct IRQL
by cgutman＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cgutman Date: Sun Sep 14 08:54:42 2008 New Revision: 36240 URL: http://svn.reactos.org/svn/reactos?rev=36240&view=rev Log: - Merge aicom-network-fixes up to r36215 - We now queue a work item to do most of the work - Send/SendPackets now get called at the correct IRQL Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/lib/drivers/ip/network/neighbor.c 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] Sun Sep 14 08:54:42 2008 @@ -748,35 +748,22 @@ KeLowerIrql(OldIrql); } - -VOID NTAPI MiniportDpc( - IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -/* - * FUNCTION: Deferred routine to handle serialization - * ARGUMENTS: - * Dpc = Pointer to DPC object - * DeferredContext = Pointer to context information (LOGICAL_ADAPTER) - * SystemArgument1 = Unused - * SystemArgument2 = Unused - */ -{ +VOID NTAPI MiniportWorker(IN PVOID WorkItem) +{ + PNDIS_WORK_ITEM NdisWorkItem = WorkItem; + PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(NdisWorkItem->Context); + KIRQL OldIrql, RaiseOldIrql; NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; - PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(DeferredContext); - - NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); NdisStatus = MiniDequeueWorkItem (Adapter, &WorkItemType, &WorkItemContext); - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (NdisStatus == NDIS_STATUS_SUCCESS) { @@ -791,27 +778,45 @@ #endif if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); - - /* - * XXX assumes single-packet - prolly OK since we'll call something - * different on multi-packet sends - */ - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); - NdisStatus = - NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); - - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's SendPackets handler\n")); + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); + } + else + { + /* SendPackets is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's SendPackets handler\n")); + (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PPNDIS_PACKET)&WorkItemContext, 1); + } + KeLowerIrql(RaiseOldIrql); + } + + NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); } else { - NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); - - NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); - - NDIS_DbgPrint(MAX_TRACE, ("back from miniport's Send handler\n")); + if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + } + else + { + /* Send is called at DISPATCH_LEVEL for all serialized miniports */ + KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); + NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); + NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); + NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); + KeLowerIrql(RaiseOldIrql); + } } if( NdisStatus != NDIS_STATUS_PENDING ) { NdisMSendComplete @@ -870,6 +875,40 @@ break; } } + + ExFreePool(WorkItem); +} + + + +VOID NTAPI MiniportDpc( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +/* + * FUNCTION: Deferred routine to handle serialization + * ARGUMENTS: + * Dpc = Pointer to DPC object + * DeferredContext = Pointer to context information (LOGICAL_ADAPTER) + * SystemArgument1 = Unused + * SystemArgument2 = Unused + */ +{ + PNDIS_WORK_ITEM NdisWorkItem; + PWORK_QUEUE_ITEM WorkItem; + + NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + + NdisWorkItem = ExAllocatePool(NonPagedPool, sizeof(PNDIS_WORK_ITEM)); + + WorkItem = (PWORK_QUEUE_ITEM)NdisWorkItem->WrapperReserved; + + NdisWorkItem->Context = DeferredContext; + + ExInitializeWorkItem(WorkItem, MiniportWorker, NdisWorkItem); + + ExQueueWorkItem(WorkItem, CriticalWorkQueue); } Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Sep 14 08:54:42 2008 @@ -157,7 +157,9 @@ NCE->EventTimer--; if (NCE->EventTimer == 0) { /* Call timeout handler for NCE */ + TcpipReleaseSpinLock(&NeighborCache[i].Lock, OldIrql); NCETimeout(NCE); + TcpipAcquireSpinLock(&NeighborCache[i].Lock, &OldIrql); } } }

1 0

[cwittich] 36239: fix some typos
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 08:43:46 2008 New Revision: 36239 URL: http://svn.reactos.org/svn/reactos?rev=36239&view=rev Log: fix some typos Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Sun Sep 14 08:43:46 2008 @@ -735,7 +735,7 @@ PreviousMode, &BytesRead); - /* Derefernece the process */ + /* Dereference the process */ ObDereferenceObject(Process); } @@ -822,7 +822,7 @@ PreviousMode, &BytesWritten); - /* Derefernece the process */ + /* Dereference the process */ ObDereferenceObject(Process); }

1 0

[sginsberg] 36238: - Don't dereference a thread when we are supposed to reference it. Now WinDBG can attach to a process, but we crash in CM due to a unhandled failure case.
by sginsberg＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: sginsberg Date: Sun Sep 14 08:41:33 2008 New Revision: 36238 URL: http://svn.reactos.org/svn/reactos?rev=36238&view=rev Log: - Don't dereference a thread when we are supposed to reference it. Now WinDBG can attach to a process, but we crash in CM due to a unhandled failure case. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Sep 14 08:41:33 2008 @@ -722,7 +722,7 @@ IsFirstThread = FALSE; /* Reference this thread and set it as first */ - ObDereferenceObject(ThisThread); + ObReferenceObject(ThisThread); pFirstThread = ThisThread; }

1 0

[sginsberg] 36237: - Don't dereference the debug object when we are supposed to reference it
by sginsberg＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: sginsberg Date: Sun Sep 14 08:20:36 2008 New Revision: 36237 URL: http://svn.reactos.org/svn/reactos?rev=36237&view=rev Log: - Don't dereference the debug object when we are supposed to reference it Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Sun Sep 14 08:20:36 2008 @@ -1262,7 +1262,7 @@ PSF_NO_DEBUG_INHERIT_BIT | PSF_CREATE_REPORTED_BIT); /* Reference the debug object */ - ObDereferenceObject(DebugObject); + ObReferenceObject(DebugObject); } }

1 0

[cwittich] 36236: fix a no newline @ end of file warning
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 08:11:49 2008 New Revision: 36236 URL: http://svn.reactos.org/svn/reactos?rev=36236&view=rev Log: fix a no newline @ end of file warning Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Sun Sep 14 08:11:49 2008 @@ -2092,4 +2092,4 @@ dispatch_imsg(fd); } } -#endif +#endif

1 0

[cwittich] 36235: fix a no newline @ end of file warning
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 08:10:36 2008 New Revision: 36235 URL: http://svn.reactos.org/svn/reactos?rev=36235&view=rev Log: fix a no newline @ end of file warning Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Sun Sep 14 08:10:36 2008 @@ -291,4 +291,4 @@ VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) { RtlFreeHeap( GetProcessHeap(), 0, InfoPtr ); -} +}

1 0

[cwittich] 36234: include wintrust.h in imagehlp.h
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 07:02:50 2008 New Revision: 36234 URL: http://svn.reactos.org/svn/reactos?rev=36234&view=rev Log: include wintrust.h in imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sun Sep 14 07:02:50 2008 @@ -24,6 +24,8 @@ #ifdef __cplusplus extern "C" { #endif + +#include <wintrust.h> #define API_VERSION_NUMBER 7 #define BIND_NO_BOUND_IMPORTS 0x00000001

1 0

[cwittich] 36233: sync imm.h with wine (should fix build)
by cwittich＠svn.reactos.org 14 Sep '08

14 Sep '08

Author: cwittich Date: Sun Sep 14 06:46:08 2008 New Revision: 36233 URL: http://svn.reactos.org/svn/reactos?rev=36233&view=rev Log: sync imm.h with wine (should fix build) Modified: trunk/reactos/include/psdk/imm.h Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=362… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Sun Sep 14 06:46:08 2008 @@ -169,7 +169,6 @@ /* the modifiers of hot key */ -#ifndef _WINUSER_ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 #define MOD_SHIFT 0x0004 @@ -179,7 +178,6 @@ #define MOD_ON_KEYUP 0x0800 #define MOD_IGNORE_ALL_MODIFIER 0x0400 -#endif /* _WINUSER_ */ /* Windows for Simplified Chinese Edition hot key ID from 0x10 - 0x2F */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs