Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37719: - MSFS: Don't rely on PSDK headers for MAILSLOT_NO_MESSAGE/MAILSLOT_WAIT_FOREVER
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 04:26:47 2008 New Revision: 37719 URL: http://svn.reactos.org/svn/reactos?rev=37719&view=rev Log: - MSFS: Don't rely on PSDK headers for MAILSLOT_NO_MESSAGE/MAILSLOT_WAIT_FOREVER Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c Modified: trunk/reactos/drivers/filesystems/msfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/msfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/msfs/finfo.c [iso-8859-1] Sat Nov 29 04:26:47 2008 @@ -13,6 +13,11 @@ #define NDEBUG #include <debug.h> + +#undef MAILSLOT_NO_MESSAGE +#undef MAILSLOT_WAIT_FOREVER +#define MAILSLOT_NO_MESSAGE ((ULONG)-1) +#define MAILSLOT_WAIT_FOREVER ((ULONG)-1) /* FUNCTIONS *****************************************************************/

1 0

[sginsberg] 37718: - Don't redefine basic types
by sginsberg＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sginsberg Date: Sat Nov 29 04:22:57 2008 New Revision: 37718 URL: http://svn.reactos.org/svn/reactos?rev=37718&view=rev Log: - Don't redefine basic types Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h Modified: trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/ext2fsd.h [iso-8859-1] Sat Nov 29 04:22:57 2008 @@ -31,23 +31,8 @@ // Some type definitions... // These are used later... -typedef unsigned char UCHAR; -typedef unsigned int UINT; -typedef UCHAR BYTE; -typedef UCHAR BOOLEAN; // winnt -typedef BOOLEAN * PBOOLEAN; // winnt -typedef void * PVOID64; // winnt -typedef long LONG; -typedef LONG HRESULT; - - -#if defined(_M_IX86) -#define FASTCALL _fastcall -#else -#define FASTCALL -#endif - - +typedef unsigned int UINT; +typedef unsigned char BYTE; // Common include files - should be in the include dir of the MS supplied IFS Kit #include <ntifs.h>

1 0

[sserapion] 37717: convert to spec
by sserapion＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sserapion Date: Sat Nov 29 04:18:10 2008 New Revision: 37717 URL: http://svn.reactos.org/svn/reactos?rev=37717&view=rev Log: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.spec (contents, props changed) - copied, changed from r37677, branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def (removed) @@ -1,12 +1,0 @@ -; beepmidi.def -; -; BeepMidi driver by Andrew Greenwood -; -; For ReactOS Operating System -; - -LIBRARY beepmidi.dll - -EXPORTS -DriverProc@20 -modMessage@20 Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Sat Nov 29 04:18:10 2008 @@ -1,5 +1,5 @@ <module name="beepmidi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> - <importlibrary definition="beepmidi.def" /> + <importlibrary definition="beepmidi.spec" /> <include base="beepmidi">.</include> <library>ntdll</library> <library>kernel32</library> Copied: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.spec (from r37677, branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.spec [iso-8859-1] Sat Nov 29 04:18:10 2008 @@ -1,12 +1,2 @@ -; beepmidi.def -; -; BeepMidi driver by Andrew Greenwood -; -; For ReactOS Operating System -; - -LIBRARY beepmidi.dll - -EXPORTS -DriverProc@20 -modMessage@20 + @ stdcall DriverProc(long ptr long long long) + @ stdcall modMessage(long long ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[sserapion] 37716: convert to spec
by sserapion＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: sserapion Date: Sat Nov 29 04:17:51 2008 New Revision: 37716 URL: http://svn.reactos.org/svn/reactos?rev=37716&view=rev Log: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.spec (contents, props changed) - copied, changed from r37677, branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def Removed: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def (removed) @@ -1,46 +1,0 @@ -LIBRARY authz.dll - -EXPORTS -AuthzAccessCheck@36 -AuthzAddSidsToContext@24 -AuthzCachedAccessCheck@20 -AuthzEnumerateSecurityEventSources@16 -AuthzFreeAuditEvent@4 -AuthzFreeContext@4 -AuthzFreeHandle@4 -AuthzFreeResourceManager@4 -AuthzGetInformationFromContext@20 -AuthzInitializeContextFromAuthzContext@28 -AuthzInitializeContextFromSid@32 -AuthzInitializeContextFromToken@32 -AuthzInitializeObjectAccessAuditEvent@32 -AuthzInitializeObjectAccessAuditEvent2@36 -AuthzInitializeResourceManager@24 -AuthzInstallSecurityEventSource@8 -AuthzOpenObjectAudit@32 -AuthzRegisterSecurityEventSource@12 -AuthzReportSecurityEvent@20=AuthzReportSecurityEvent -AuthzReportSecurityEventFromParams@20 -AuthzUninstallSecurityEventSource@8 -AuthzUnregisterSecurityEventSource@8 -;AuthziAllocateAuditParams -;AuthziFreeAuditEventType -;AuthziFreeAuditParams -;AuthziFreeAuditQueue -;AuthziInitializeAuditEvent -;AuthziInitializeAuditEventType -;AuthziInitializeAuditParams -;AuthziInitializeAuditParamsFromArray -;AuthziInitializeAuditParamsWithRM -;AuthziInitializeAuditQueue -;AuthziInitializeContextFromSid -;AuthziLogAuditEvent -;AuthziModifyAuditEvent2 -;AuthziModifyAuditEvent -;AuthziModifyAuditEventType -;AuthziModifyAuditQueue -;AuthziQueryAuditPolicy -;AuthziSetAuditPolicy -;AuthziSourceAudit - -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] Sat Nov 29 04:17:51 2008 @@ -1,5 +1,5 @@ <module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll" unicode="yes"> - <importlibrary definition="authz.def" /> + <importlibrary definition="authz.spec" /> <include base="authz">.</include> <library>ntdll</library> <library>kernel32</library> Copied: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.spec (from r37677, branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def) URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.spec [iso-8859-1] Sat Nov 29 04:17:51 2008 @@ -1,46 +1,43 @@ -LIBRARY authz.dll + @ stdcall AuthzAccessCheck(long ptr ptr ptr ptr ptr long ptr ptr) + @ stdcall AuthzAddSidsToContext(ptr ptr long ptr long ptr) + @ stdcall AuthzCachedAccessCheck(long ptr ptr ptr ptr) + @ stdcall AuthzEnumerateSecurityEventSources(long ptr ptr ptr) + @ stdcall AuthzFreeAuditEvent(ptr) + @ stdcall AuthzFreeContext(ptr) + @ stdcall AuthzFreeHandle(ptr) + @ stdcall AuthzFreeResourceManager(ptr) + @ stdcall AuthzGetInformationFromContext(ptr ptr long ptr ptr) + @ stdcall AuthzInitializeContextFromAuthzContext(long ptr ptr double ptr ptr) + @ stdcall AuthzInitializeContextFromSid(long ptr ptr ptr double ptr ptr) + @ stdcall AuthzInitializeContextFromToken(long ptr ptr ptr double ptr ptr) + @ stdcall AuthzInitializeObjectAccessAuditEvent(long ptr wstr wstr wstr wstr ptr long) + @ stdcall AuthzInitializeObjectAccessAuditEvent2(long ptr wstr wstr wstr wstr wstr ptr long) + @ stdcall AuthzInitializeResourceManager(long ptr ptr ptr ptr ptr) + @ stdcall AuthzInstallSecurityEventSource(long ptr) + @ stdcall AuthzOpenObjectAudit(long ptr ptr ptr ptr ptr long ptr) + @ stdcall AuthzRegisterSecurityEventSource(long ptr ptr) + @ varargs AuthzReportSecurityEvent(long ptr long ptr long) + @ stdcall AuthzReportSecurityEventFromParams(long ptr long ptr ptr) + @ stdcall AuthzUninstallSecurityEventSource(long ptr) + @ stdcall AuthzUnregisterSecurityEventSource(long ptr) +#AuthziAllocateAuditParams +#AuthziFreeAuditEventType +#AuthziFreeAuditParams +#AuthziFreeAuditQueue +#AuthziInitializeAuditEvent +#AuthziInitializeAuditEventType +#AuthziInitializeAuditParams +#AuthziInitializeAuditParamsFromArray +#AuthziInitializeAuditParamsWithRM +#AuthziInitializeAuditQueue +#AuthziInitializeContextFromSid +#AuthziLogAuditEvent +#AuthziModifyAuditEvent2 +#AuthziModifyAuditEvent +#AuthziModifyAuditEventType +#AuthziModifyAuditQueue +#AuthziQueryAuditPolicy +#AuthziSetAuditPolicy +#AuthziSourceAudit -EXPORTS -AuthzAccessCheck@36 -AuthzAddSidsToContext@24 -AuthzCachedAccessCheck@20 -AuthzEnumerateSecurityEventSources@16 -AuthzFreeAuditEvent@4 -AuthzFreeContext@4 -AuthzFreeHandle@4 -AuthzFreeResourceManager@4 -AuthzGetInformationFromContext@20 -AuthzInitializeContextFromAuthzContext@28 -AuthzInitializeContextFromSid@32 -AuthzInitializeContextFromToken@32 -AuthzInitializeObjectAccessAuditEvent@32 -AuthzInitializeObjectAccessAuditEvent2@36 -AuthzInitializeResourceManager@24 -AuthzInstallSecurityEventSource@8 -AuthzOpenObjectAudit@32 -AuthzRegisterSecurityEventSource@12 -AuthzReportSecurityEvent@20=AuthzReportSecurityEvent -AuthzReportSecurityEventFromParams@20 -AuthzUninstallSecurityEventSource@8 -AuthzUnregisterSecurityEventSource@8 -;AuthziAllocateAuditParams -;AuthziFreeAuditEventType -;AuthziFreeAuditParams -;AuthziFreeAuditQueue -;AuthziInitializeAuditEvent -;AuthziInitializeAuditEventType -;AuthziInitializeAuditParams -;AuthziInitializeAuditParamsFromArray -;AuthziInitializeAuditParamsWithRM -;AuthziInitializeAuditQueue -;AuthziInitializeContextFromSid -;AuthziLogAuditEvent -;AuthziModifyAuditEvent2 -;AuthziModifyAuditEvent -;AuthziModifyAuditEventType -;AuthziModifyAuditQueue -;AuthziQueryAuditPolicy -;AuthziSetAuditPolicy -;AuthziSourceAudit - -; EOF +# EOF Propchange: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/dll/win32/authz/authz.spec ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[cgutman] 37715: - Make sure we're in the correct state
by cgutman＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: cgutman Date: Fri Nov 28 21:47:58 2008 New Revision: 37715 URL: http://svn.reactos.org/svn/reactos?rev=37715&view=rev Log: - Make sure we're in the correct state Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Nov 28 21:47:58 2008 @@ -114,7 +114,7 @@ IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } - if( NT_SUCCESS(Status) ) { + if( NT_SUCCESS(Status) && FCB->State == SOCKET_STATE_CONNECTED ) { Status = MakeSocketIntoConnection( FCB ); if( !NT_SUCCESS(Status) ) {

1 0

[cgutman] 37714: - Fix behavior of kernel APCs interrupting waits on gate objects. Patch by Alex Ionescu.
by cgutman＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: cgutman Date: Fri Nov 28 20:57:21 2008 New Revision: 37714 URL: http://svn.reactos.org/svn/reactos?rev=37714&view=rev Log: - Fix behavior of kernel APCs interrupting waits on gate objects. Patch by Alex Ionescu. Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3771… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Fri Nov 28 20:57:21 2008 @@ -242,7 +242,7 @@ if (Thread->Queue) Thread->Queue->CurrentCount++; /* Put into deferred ready list with this status */ - Status = STATUS_KERNEL_APC; + Thread->WaitStatus = STATUS_KERNEL_APC; KiInsertDeferredReadyList(Thread); }

1 0

[cgutman] 37713: - Merge aicom-network-fixes up to r37712
by cgutman＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: cgutman Date: Fri Nov 28 19:51:19 2008 New Revision: 37713 URL: http://svn.reactos.org/svn/reactos?rev=37713&view=rev Log: - Merge aicom-network-fixes up to r37712 Modified: 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/tcpip/dispatch.c 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] Fri Nov 28 19:51:19 2008 @@ -173,6 +173,11 @@ IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type); + #endif /* __MINIPORT_H */ /* EOF */ 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] Fri Nov 28 19:51:19 2008 @@ -134,6 +134,55 @@ #endif /* DBG */ } +PNDIS_MINIPORT_WORK_ITEM +MiniGetFirstWorkItem( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + PNDIS_MINIPORT_WORK_ITEM CurrentEntry = Adapter->WorkQueueHead; + + while (CurrentEntry) + { + if (CurrentEntry->WorkItemType == Type) + return CurrentEntry; + + CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; + } + + return NULL; +} + +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + BOOLEAN Busy = FALSE; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Type == NdisWorkItemRequest && + (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemSend && + (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemResetRequested && + (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) + { + Busy = TRUE; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + return Busy; +} + VOID MiniIndicateData( @@ -274,6 +323,8 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->NdisMiniportBlock.ResetStatus = Status; + CurrentEntry = Adapter->ProtocolListHead.Flink; while (CurrentEntry != &Adapter->ProtocolListHead) @@ -298,12 +349,18 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, @@ -601,6 +658,11 @@ NDIS_STATUS Status; KIRQL OldIrql; + if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { + MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); + return NDIS_STATUS_PENDING; + } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -608,6 +670,11 @@ Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = Status; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); if (Status != NDIS_STATUS_PENDING) { @@ -668,6 +735,7 @@ { if (WorkItemType == NdisWorkItemSend) { + NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; } else @@ -786,6 +854,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: @@ -810,6 +883,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status != NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -968,12 +1047,18 @@ NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); + + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = NDIS_STATUS_PENDING; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + KeLowerIrql(OldIrql); - if (NdisStatus == NDIS_STATUS_PENDING) - break; - - MiniResetComplete(Adapter, NdisStatus, AddressingReset); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniResetComplete(Adapter, NdisStatus, AddressingReset); break; case NdisWorkItemResetInProgress: @@ -1002,6 +1087,7 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; 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] Fri Nov 28 19:51:19 2008 @@ -140,6 +140,11 @@ MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); return NDIS_STATUS_PENDING; #else + if (MiniIsBusy(Adapter, NdisWorkItemRequest)) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; + } + return MiniDoRequest(Adapter, NdisRequest); #endif } @@ -164,7 +169,7 @@ KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + if(MiniIsBusy(Adapter, NdisWorkItemSend)) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); return NDIS_STATUS_PENDING; } Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Nov 28 19:51:19 2008 @@ -27,12 +27,17 @@ */ { KIRQL OldIrql; + PIO_STACK_LOCATION IrpSp; + PTRANSPORT_CONTEXT TransContext; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + TransContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext; + IoAcquireCancelSpinLock(&OldIrql); - if (!Irp->Cancel) { + if (!Irp->Cancel && !TransContext->CancelIrps) { (void)IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql);

1 0

[cgutman] 37712: - Fix queuing request and reset work items - Fix a problem that could result in packets being sent in the wrong order
by cgutman＠svn.reactos.org 29 Nov '08

29 Nov '08

Author: cgutman Date: Fri Nov 28 18:06:25 2008 New Revision: 37712 URL: http://svn.reactos.org/svn/reactos?rev=37712&view=rev Log: - Fix queuing request and reset work items - Fix a problem that could result in packets being sent in the wrong order 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] Fri Nov 28 18:06:25 2008 @@ -169,6 +169,11 @@ IN PNDIS_PACKET Packet, IN NDIS_STATUS Status); +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type); + #endif /* __MINIPORT_H */ /* EOF */ 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] Fri Nov 28 18:06:25 2008 @@ -134,6 +134,55 @@ #endif /* DBG */ } +PNDIS_MINIPORT_WORK_ITEM +MiniGetFirstWorkItem( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + PNDIS_MINIPORT_WORK_ITEM CurrentEntry = Adapter->WorkQueueHead; + + while (CurrentEntry) + { + if (CurrentEntry->WorkItemType == Type) + return CurrentEntry; + + CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; + } + + return NULL; +} + +BOOLEAN +MiniIsBusy( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE Type) +{ + BOOLEAN Busy = FALSE; + KIRQL OldIrql; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Type == NdisWorkItemRequest && + (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemSend && + (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) + { + Busy = TRUE; + } + else if (Type == NdisWorkItemResetRequested && + (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) + { + Busy = TRUE; + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + return Busy; +} + VOID MiniIndicateData( @@ -274,6 +323,8 @@ KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + Adapter->NdisMiniportBlock.ResetStatus = Status; + CurrentEntry = Adapter->ProtocolListHead.Flink; while (CurrentEntry != &Adapter->ProtocolListHead) @@ -298,12 +349,18 @@ IN PNDIS_REQUEST Request, IN NDIS_STATUS Status) { + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, @@ -601,6 +658,11 @@ NDIS_STATUS Status; KIRQL OldIrql; + if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { + MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); + return NDIS_STATUS_PENDING; + } + NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -608,6 +670,11 @@ Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, AddressingReset); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = Status; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeLowerIrql(OldIrql); if (Status != NDIS_STATUS_PENDING) { @@ -668,6 +735,7 @@ { if (WorkItemType == NdisWorkItemSend) { + NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; } else @@ -786,6 +854,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: @@ -810,6 +883,12 @@ default: Status = NDIS_STATUS_FAILURE; + } + + if (Status != NDIS_STATUS_PENDING) { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.PendingRequest = NULL; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); } KeLowerIrql(OldIrql); @@ -968,12 +1047,18 @@ NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); + + if (NdisStatus == NDIS_STATUS_PENDING) + { + KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + Adapter->NdisMiniportBlock.ResetStatus = NDIS_STATUS_PENDING; + KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + } + KeLowerIrql(OldIrql); - if (NdisStatus == NDIS_STATUS_PENDING) - break; - - MiniResetComplete(Adapter, NdisStatus, AddressingReset); + if (NdisStatus != NDIS_STATUS_PENDING) + MiniResetComplete(Adapter, NdisStatus, AddressingReset); break; case NdisWorkItemResetInProgress: @@ -1002,6 +1087,7 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniRequestComplete( (NDIS_HANDLE)Adapter, (PNDIS_REQUEST)WorkItemContext, NdisStatus ); break; } break; 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] Fri Nov 28 18:06:25 2008 @@ -140,6 +140,11 @@ MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); return NDIS_STATUS_PENDING; #else + if (MiniIsBusy(Adapter, NdisWorkItemRequest)) { + MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); + return NDIS_STATUS_PENDING; + } + return MiniDoRequest(Adapter, NdisRequest); #endif } @@ -164,7 +169,7 @@ KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(Adapter->NdisMiniportBlock.FirstPendingPacket) { + if(MiniIsBusy(Adapter, NdisWorkItemSend)) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); return NDIS_STATUS_PENDING; }

1 0

[sginsberg] 37711: - Don't add an include path for internal win32k headers as dxg doesn't include them anymore
by sginsberg＠svn.reactos.org 28 Nov '08

28 Nov '08

Author: sginsberg Date: Fri Nov 28 14:26:25 2008 New Revision: 37711 URL: http://svn.reactos.org/svn/reactos?rev=37711&view=rev Log: - Don't add an include path for internal win32k headers as dxg doesn't include them anymore Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg.rb… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg.rbuild [iso-8859-1] Fri Nov 28 14:26:25 2008 @@ -4,7 +4,6 @@ <importlibrary definition="dxg.spec" /> <include base="dxg">.</include> <include base="dxg">include</include> - <include base="ReactOS">subsystems/win32/win32k/include</include> <library>dxgthk</library> <library>ntoskrnl</library> <file>main.c</file>

1 0

[sginsberg] 37710: - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers
by sginsberg＠svn.reactos.org 28 Nov '08

28 Nov '08

Author: sginsberg Date: Fri Nov 28 14:24:36 2008 New Revision: 37710 URL: http://svn.reactos.org/svn/reactos?rev=37710&view=rev Log: - Add a header guard for pnp.idl's RESOURCEID, and add an internal define for setupapi as it uses incompatible Wine headers Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -43,6 +43,11 @@ #include <ndk/ntndk.h> #include <pseh/pseh.h> + +/* This hack definition is necessary as long as setupapi + depends on Wine "compatibility" headers */ +typedef ULONG RESOURCEID; +typedef RESOURCEID *PRESOURCEID; #include <pnp_c.h> #include "rpc_private.h" Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Fri Nov 28 14:24:36 2008 @@ -14,7 +14,9 @@ const unsigned long PNP_MAX_PROP_COUNT = 32767; const unsigned long PNP_MAX_BUFFER_SIZE = 16000000; +cpp_quote("#ifndef _CFGMGR32_H_") typedef unsigned long RESOURCEID; +cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE, *PPNP_PROP_SIZE; typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT, *PPNP_PROP_COUNT;

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