Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 45013: [User32] - Add corrected behavior for SetWindowRgn, delete region object after setting windows region. See bug 4980. - After a successful call to SetWindowRgn, the system owns the region specified by the region handle hRgn. The system does not make a copy of the region. Thus, you should not make any further function calls with this region handle. In particular, do not delete this region handle. The system deletes the region handle when it no longer needed. - References : http:/
by jimtabor＠svn.reactos.org 09 Jan '10

09 Jan '10

Author: jimtabor Date: Sat Jan 9 07:16:51 2010 New Revision: 45013 URL: http://svn.reactos.org/svn/reactos?rev=45013&view=rev Log: [User32] - Add corrected behavior for SetWindowRgn, delete region object after setting windows region. See bug 4980. - After a successful call to SetWindowRgn, the system owns the region specified by the region handle hRgn. The system does not make a copy of the region. Thus, you should not make any further function calls with this region handle. In particular, do not delete this region handle. The system deletes the region handle when it no longer needed. - References : http://msdn.microsoft.com/en-us/library/dd145102(VS.85).aspx Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sat Jan 9 07:16:51 2010 @@ -149,7 +149,13 @@ Hook = BeginIfHookedUserApiHook(); /* Bypass SEH and go direct. */ - if (!Hook) return (int)NtUserSetWindowRgn(hWnd, hRgn, bRedraw); + if (!Hook) + { + Ret = NtUserSetWindowRgn(hWnd, hRgn, bRedraw); + if (hRgn && Ret) + DeleteObject(hRgn); + return Ret; + } _SEH2_TRY {

1 0

[arty] 45012: Fix copy/paste error. We weren't using a page from the resources struct.
by arty＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: arty Date: Fri Jan 8 23:24:55 2010 New Revision: 45012 URL: http://svn.reactos.org/svn/reactos?rev=45012&view=rev Log: Fix copy/paste error. We weren't using a page from the resources struct. Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] Fri Jan 8 23:24:55 2010 @@ -233,8 +233,7 @@ if (NT_SUCCESS(Status)) { MmInsertRmap(Page, Process, Address); - if (Locked) MmLockPage(Required->Page[0]); - Required->Page[0] = 0; + if (Locked) MmLockPage(Page); } DPRINT("XXX Set Event %x\n", Status); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE);

1 0

[martinf] 45011: avoid warning messages on Explorer startup when missing configuration files
by martinf＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: martinf Date: Fri Jan 8 22:51:43 2010 New Revision: 45011 URL: http://svn.reactos.org/svn/reactos?rev=45011&view=rev Log: avoid warning messages on Explorer startup when missing configuration files Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/taskbar/favorites.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Fri Jan 8 22:51:43 2010 @@ -94,9 +94,9 @@ _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); if (!_cfg.read_file(_cfg_path)) { - //if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) - MessageBox(_hwndDesktop, _cfg._errors.str(), - TEXT("ROS Explorer - reading user settings"), MB_OK); + if (!_cfg._errors.empty()) + MessageBox(_hwndDesktop, _cfg._errors.str(), + TEXT("ROS Explorer - reading user settings"), MB_OK); _cfg.read_file(TEXT("explorer-cfg-template.xml")); } Modified: trunk/reactos/base/shell/explorer/taskbar/favorites.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/favorites.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/favorites.cpp [iso-8859-1] Fri Jan 8 22:51:43 2010 @@ -427,8 +427,9 @@ XMLDoc xbel; if (!xbel.read_file(path)) { - MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), - TEXT("ROS Explorer - reading bookmark file"), MB_OK); + if (!xbel._errors.empty()) + MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), + TEXT("ROS Explorer - reading bookmark file"), MB_OK); } const_XMLPos pos(&xbel);

1 0

[sir_richard] 45010: Trap handlers in C Patch 5 of X: [NDK]: Add FSW defines for FPU exception bits. [NTOS]: Convert trap 19 (XMMI exception) to C.
by sir_richard＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: sir_richard Date: Fri Jan 8 20:24:10 2010 New Revision: 45010 URL: http://svn.reactos.org/svn/reactos?rev=45010&view=rev Log: Trap handlers in C Patch 5 of X: [NDK]: Add FSW defines for FPU exception bits. [NTOS]: Convert trap 19 (XMMI exception) to C. Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -104,6 +104,17 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 + +// +// Legacy floating status word bit masks. +// +#define FSW_INVALID_OPERATION 0x1 +#define FSW_DENORMAL 0x2 +#define FSW_ZERO_DIVIDE 0x4 +#define FSW_OVERFLOW 0x8 +#define FSW_UNDERFLOW 0x10 +#define FSW_PRECISION 0x20 +#define FSW_STACK_FAULT 0x40 // // IPI Types Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -13,6 +13,22 @@ : "=m" (*X) \ : /* no input */ \ : "memory"); + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PFX_SAVE_AREA SaveArea) +{ + extern ULONG KeI386FxsrPresent; + if (KeI386FxsrPresent) + { + __asm__ __volatile__ ("fxsave %0\n" : : "m"(SaveArea)); + } + else + { + __asm__ __volatile__ ("fnsave %0\n wait\n" : : "m"(SaveArea)); + } + +} FORCEINLINE USHORT Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -222,6 +222,17 @@ VOID FORCEINLINE +KiDispatchException1Args(IN NTSTATUS Code, + IN ULONG_PTR Address, + IN ULONG P1, + IN PKTRAP_FRAME TrapFrame) +{ + /* Helper for exceptions with no arguments */ + KiDispatchExceptionFromTrapFrame(Code, Address, 1, P1, 0, 0, TrapFrame); +} + +VOID +FORCEINLINE KiDispatchException2Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -1524,178 +1524,7 @@ .endfunc GENERATE_TRAP_HANDLER KiTrap17, 1 - -.func KiTrap19 -TRAP_FIXUPS kit19_a, kit19_t, DoFixupV86, DoNotFixupAbios -_KiTrap19: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit19_a, kit19_t - - /* Check if this is the NPX Thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - cmp eax, PCR[KPCR_NPX_THREAD] - - /* If this is a valid fault, handle it */ - jz HandleXmmiFault - - /* Otherwise, bugcheck */ - mov eax, 19 - jmp _KiSystemFatalException - -HandleXmmiFault: - /* Get the initial stack and NPX frame */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* Check if the trap came from V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86Xmmi - - /* Check if it came from kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KernelXmmi - - /* Check if it came from a VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jne VdmXmmi - -HandleUserXmmi: - /* Set new CR0 */ - mov ebx, cr0 - and ebx, ~(CR0_MP + CR0_EM + CR0_TS) - mov cr0, ebx - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz XmmiFnSave2 - - /* Save the state */ - fxsave [ecx] - jmp XmmiMakeCr0Dirty -XmmiFnSave2: - fnsave [ecx] - wait - -XmmiMakeCr0Dirty: - /* Make CR0 state not loaded */ - or ebx, NPX_STATE_NOT_LOADED - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Update NPX state */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - mov dword ptr PCR[KPCR_NPX_THREAD], 0 - - /* Clear the TS bit and re-enable interrupts */ - and dword ptr [ecx+FN_CR0_NPX_STATE], ~CR0_TS - - /* Re-enable interrupts for user-mode and send the exception */ - sti - mov ebx, [ebp+KTRAP_FRAME_EIP] - - /* Get MxCSR and get current mask (bits 7-12) */ - movzx eax, word ptr [ecx+FX_MXCSR] - mov edx, eax - shr edx, 7 - not edx - - /* Set faulting opcode address to 0 */ - mov esi, 0 - - /* Apply legal exceptions mask */ - and eax, 0x3f - - /* Apply the mask we got in MXCSR itself */ - and eax, edx - - /* Check for invalid operation */ - test al, 1 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for zero divide */ - test al, 2 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 4 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for overflow*/ - test al, 8 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 16 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -1: - /* Check for Precision */ - test al, 32 - jz UnexpectedXmmi - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -UnexpectedXmmi: - /* Strange result, bugcheck the OS */ - sti - push ebp - push 1 - push 0 - push eax - push 13 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 - -VdmXmmi: - /* Check if this is a VDM */ - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jz HandleUserXmmi - -V86Xmmi: - /* V86 XMMI not handled */ - UNHANDLED_V86_PATH - -KernelXmmi: - /* Another weird situation */ - push ebp - push 2 - push 0 - push eax - push 13 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 -.endfunc +GENERATE_TRAP_HANDLER KiTrap19, 1 .func KiSystemFatalException _KiSystemFatalException: Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -595,6 +595,89 @@ VOID FASTCALL +KiTrap19Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + PFX_SAVE_AREA SaveArea; + ULONG Cr0, MxCsrMask, Error; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check if this is the NPX thrad */ + Thread = KeGetCurrentThread(); + if (Thread != KeGetCurrentPrcb()->NpxThread) + { + /* It isn't, kill the system */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, (ULONG_PTR)Thread, 0, 0, TrapFrame); + } + + /* Get the NPX frame */ + SaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Check for user trap */ + if (!KiUserTrap(TrapFrame)) + { + /* Kernel should not fault on XMMI */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 2, TrapFrame); + } + + /* Update CR0 */ + Cr0 = __readcr0(); + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Save FPU state */ + Ke386SaveFpuState(SaveArea); + + /* Mark CR0 state dirty */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= SaveArea->Cr0NpxState; + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + KeGetCurrentPrcb()->NpxThread = NULL; + + /* Clear the TS bit and re-enable interrupts */ + SaveArea->Cr0NpxState &= ~CR0_TS; + _enable(); + + /* Now look at MxCsr to get the mask of errors we should care about */ + MxCsrMask = ~((USHORT)SaveArea->U.FxArea.MXCsr >> 7); + + /* Get legal exceptions that software should handle */ + Error = (USHORT)SaveArea->U.FxArea.MXCsr & (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION); + Error &= MxCsrMask; + + /* Now handle any of those legal errors */ + if (Error & (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION)) + { + /* By issuing an exception */ + KiDispatchException1Args(STATUS_FLOAT_MULTIPLE_TRAPS, + TrapFrame->Eip, + 0, + TrapFrame); + } + + /* Unknown XMMI fault */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); +} + +VOID +FASTCALL KiRaiseAssertionHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */

1 0

[cgutman] 45009: - Rewrite request queuing - We now use the documented members of NDIS_MINIPORT_BLOCK - It also fixes the issue of determining if the miniport is currently processing a request - Remove unneeded IRQL raises - Half-plement MiniSendResourcesAvailable (NdisMSendResourcesAvailable) - Comment out the code inside ProSendPackets (only used by protocols, not miniports)
by cgutman＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: cgutman Date: Fri Jan 8 20:15:03 2010 New Revision: 45009 URL: http://svn.reactos.org/svn/reactos?rev=45009&view=rev Log: - Rewrite request queuing - We now use the documented members of NDIS_MINIPORT_BLOCK - It also fixes the issue of determining if the miniport is currently processing a request - Remove unneeded IRQL raises - Half-plement MiniSendResourcesAvailable (NdisMSendResourcesAvailable) - Comment out the code inside ProSendPackets (only used by protocols, not miniports) Modified: branches/aicom-network-branch/drivers/network/ndis/include/miniport.h branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-branch/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -90,8 +90,6 @@ typedef struct _LOGICAL_ADAPTER { NDIS_MINIPORT_BLOCK NdisMiniportBlock; /* NDIS defined fields */ - PNDIS_MINIPORT_WORK_ITEM WorkQueueHead; /* Head of work queue */ - PNDIS_MINIPORT_WORK_ITEM WorkQueueTail; /* Tail of work queue */ LIST_ENTRY ListEntry; /* Entry on global list */ LIST_ENTRY MiniportListEntry; /* Entry on miniport driver list */ LIST_ENTRY ProtocolListHead; /* List of bound protocols */ @@ -142,20 +140,22 @@ PVOID Buffer, PULONG BytesWritten); -VOID -FASTCALL -MiniQueueWorkItem( +NDIS_STATUS +MiniBeginRequest( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext, - BOOLEAN Top); - -NDIS_STATUS -FASTCALL -MiniDequeueWorkItem( - PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE *WorkItemType, - PVOID *WorkItemContext); + PVOID WorkItemContext); + +NDIS_STATUS +MiniQueueWorkItemHead( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType, + PVOID WorkItemContext); + +VOID +MiniEndRequest( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType); NDIS_STATUS MiniDoRequest( Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -121,55 +121,6 @@ #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( @@ -316,6 +267,7 @@ if (!LookAheadBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return; } @@ -357,6 +309,8 @@ PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; + MiniEndRequest(Adapter, NdisWorkItemResetRequested); + if (AddressingReset) MiniDoAddressingReset(Adapter); @@ -364,8 +318,6 @@ NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - Adapter->NdisMiniportBlock.ResetStatus = Status; CurrentEntry = Adapter->ProtocolListHead.Flink; @@ -395,11 +347,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Request = Adapter->NdisMiniportBlock.PendingRequest; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + MiniEndRequest(Adapter, NdisWorkItemRequest); MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; @@ -409,12 +361,22 @@ Request, Status); } - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); +} + +VOID NTAPI +MiniIndicateComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN PNDIS_PACKET Packet, + IN NDIS_STATUS Status) +{ + PADAPTER_BINDING AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; + + MiniEndRequest(MiniportAdapterHandle, NdisWorkItemSendLoopback); + + (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + Packet, + Status); } VOID NTAPI @@ -440,14 +402,14 @@ AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { NDIS_DbgPrint(MAX_TRACE, ("Freeing Scatter/Gather list\n")); SGList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Adapter->NdisMiniportBlock.SystemAdapterObject-> DmaOperations->PutScatterGatherList( @@ -455,28 +417,42 @@ SGList, TRUE); + KeLowerIrql(OldIrql); + NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo) = NULL; } + + MiniEndRequest(Adapter, NdisWorkItemSend); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - - KeLowerIrql(OldIrql); -} - +} + +NDIS_STATUS +SignalQueue(PLOGICAL_ADAPTER Adapter) +{ + PIO_WORKITEM WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + + ASSERT(WorkItem); + if (!WorkItem) return NDIS_STATUS_RESOURCES; + + IoQueueWorkItem(WorkItem, + MiniportWorker, + DelayedWorkQueue, + WorkItem); + + return NDIS_STATUS_SUCCESS; +} VOID NTAPI MiniSendResourcesAvailable( IN NDIS_HANDLE MiniportAdapterHandle) { -/* - UNIMPLEMENTED -*/ -} - + SignalQueue(MiniportAdapterHandle); +} VOID NTAPI MiniTransferDataComplete( @@ -486,19 +462,16 @@ IN UINT BytesTransferred) { PADAPTER_BINDING AdapterBinding; - KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.TransferDataCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status, BytesTransferred); - KeLowerIrql(OldIrql); } @@ -597,12 +570,6 @@ ASSERT(AdapterName); NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(IsListEmpty(&AdapterListHead)) - { - NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); - return NULL; - } KeAcquireSpinLock(&AdapterListLock, &OldIrql); { @@ -667,9 +634,15 @@ NdisRequest->DATA.SET_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.SET_INFORMATION.InformationBufferLength = Size; + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); /* FIXME: Wait in pending case! */ + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); ASSERT(NdisStatus != NDIS_STATUS_PENDING); @@ -717,9 +690,15 @@ NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.QUERY_INFORMATION.InformationBufferLength = Size; + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); /* FIXME: Wait in pending case! */ + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); ASSERT(NdisStatus != NDIS_STATUS_PENDING); @@ -742,13 +721,10 @@ */ { BOOLEAN Ret = FALSE; - KIRQL OldIrql; - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); - KeLowerIrql(OldIrql); return Ret; } @@ -779,31 +755,24 @@ */ { NDIS_STATUS Status; - KIRQL OldIrql; BOOLEAN AddressingReset = TRUE; - if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { - MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); - return NDIS_STATUS_PENDING; - } + Status = MiniBeginRequest(Adapter, NdisWorkItemResetRequested, NULL); + if (!NT_SUCCESS(Status)) + return Status; NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); 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) { if (AddressingReset) MiniDoAddressingReset(Adapter); + + MiniEndRequest(Adapter, NdisWorkItemResetRequested); NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -827,78 +796,45 @@ } } - -VOID -FASTCALL -MiniQueueWorkItem( +NDIS_STATUS +MiniBeginRequest( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext, - BOOLEAN Top) -/* - * FUNCTION: Queues a work item for execution at a later time - * ARGUMENTS: - * Adapter = Pointer to the logical adapter object to queue work item on - * WorkItemType = Type of work item to queue - * WorkItemContext = Pointer to context information for work item - * RETURNS: - * Status of operation - */ -{ + PVOID WorkItemContext) +{ + KIRQL OldIrql; + BOOLEAN QueueBusy; PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PIO_WORKITEM IoWorkItem; - KIRQL OldIrql; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - ASSERT(Adapter); + PSINGLE_LIST_ENTRY CurrentEntry; KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - if (Top) - { - if (WorkItemType == NdisWorkItemSend) - { - NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); - Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; - } - else - { - //This should never happen - ASSERT(FALSE); - } - } - else - { - MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); - if (!MiniportWorkItem) - { - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return; - } - - MiniportWorkItem->WorkItemType = WorkItemType; - MiniportWorkItem->WorkItemContext = WorkItemContext; - - /* safe due to adapter lock held */ - MiniportWorkItem->Link.Next = NULL; - if (!Adapter->WorkQueueHead) - { - Adapter->WorkQueueHead = MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - else - { - Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - } - - IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); - if (IoWorkItem) - IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); + + QueueBusy = (Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next != NULL); + + MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); + if (!MiniportWorkItem) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return NDIS_STATUS_RESOURCES; + } + + MiniportWorkItem->WorkItemType = WorkItemType; + MiniportWorkItem->WorkItemContext = WorkItemContext; + MiniportWorkItem->Link.Next = NULL; + + CurrentEntry = &Adapter->NdisMiniportBlock.WorkQueue[WorkItemType]; + while (CurrentEntry->Next) + CurrentEntry = CurrentEntry->Next; + + CurrentEntry->Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (QueueBusy) + NDIS_DbgPrint(MIN_TRACE, ("Queue %d busy!\n", WorkItemType)); + + return (QueueBusy ? NDIS_STATUS_PENDING : NDIS_STATUS_SUCCESS); } @@ -906,7 +842,7 @@ FASTCALL MiniDequeueWorkItem( PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE *WorkItemType, + NDIS_WORK_ITEM_TYPE WorkItemType, PVOID *WorkItemContext) /* * FUNCTION: Dequeues a work item from the work queue of a logical adapter @@ -922,42 +858,49 @@ */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_PACKET Packet; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - MiniportWorkItem = Adapter->WorkQueueHead; - - if ((Packet = Adapter->NdisMiniportBlock.FirstPendingPacket)) - { - Adapter->NdisMiniportBlock.FirstPendingPacket = NULL; - - *WorkItemType = NdisWorkItemSend; - *WorkItemContext = Packet; + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + MiniportWorkItem = (PNDIS_MINIPORT_WORK_ITEM)Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (MiniportWorkItem) + { + /* This is VERY IMPORTANT! We dequeue the work item AFTER completion */ + + *WorkItemContext = MiniportWorkItem->WorkItemContext; return NDIS_STATUS_SUCCESS; } - else if (MiniportWorkItem) - { - /* safe due to adapter lock held */ - Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)MiniportWorkItem->Link.Next; - - if (MiniportWorkItem == Adapter->WorkQueueTail) - Adapter->WorkQueueTail = NULL; - - *WorkItemType = MiniportWorkItem->WorkItemType; - *WorkItemContext = MiniportWorkItem->WorkItemContext; - - ExFreePool(MiniportWorkItem); - - return NDIS_STATUS_SUCCESS; - } else { - NDIS_DbgPrint(MIN_TRACE, ("No work item to dequeue\n")); - return NDIS_STATUS_FAILURE; } +} + +VOID +MiniEndRequest( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType) +{ + KIRQL OldIrql; + BOOLEAN QueueBusy; + PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + MiniportWorkItem = (PNDIS_MINIPORT_WORK_ITEM)Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next; + ASSERT(MiniportWorkItem); + Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next = MiniportWorkItem->Link.Next; + ExFreePool(MiniportWorkItem); + + QueueBusy = (Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next != NULL); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (QueueBusy) + SignalQueue(Adapter); } @@ -976,13 +919,12 @@ { NDIS_STATUS Status; KIRQL OldIrql; + NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (!Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CoRequestHandler) { @@ -1021,13 +963,13 @@ NdisRequest); } - if (Status != NDIS_STATUS_PENDING) { - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if (Status != NDIS_STATUS_PENDING) + { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - } - - KeLowerIrql(OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } + return Status; } @@ -1044,12 +986,10 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Adapter->NdisMiniportBlock.SetCompleteHandler) - (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); - KeLowerIrql(OldIrql); + + (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + + MiniEndRequest(Adapter, NdisWorkItemRequest); } @@ -1065,12 +1005,10 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) - (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); - KeLowerIrql(OldIrql); + + (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); + + MiniEndRequest(Adapter, NdisWorkItemRequest); } VOID @@ -1078,25 +1016,20 @@ MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; - KIRQL OldIrql, RaiseOldIrql; + KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; - BOOLEAN AddressingReset; + BOOLEAN AddressingReset, NextQueue; IoFreeWorkItem((PIO_WORKITEM)Context); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - NdisStatus = - MiniDequeueWorkItem - (Adapter, &WorkItemType, &WorkItemContext); - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - - if (NdisStatus == NDIS_STATUS_SUCCESS) - { - switch (WorkItemType) + for (WorkItemType = 0; WorkItemType < NUMBER_OF_WORK_ITEM_TYPES; WorkItemType++) + { + NextQueue = FALSE; + while (!NextQueue && MiniDequeueWorkItem(Adapter, WorkItemType, &WorkItemContext) == NDIS_STATUS_SUCCESS) + { + switch (WorkItemType) { case NdisWorkItemSend: /* @@ -1125,7 +1058,7 @@ NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); + NextQueue = TRUE; break; } } @@ -1151,7 +1084,7 @@ NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); + NextQueue = TRUE; break; } } @@ -1171,26 +1104,16 @@ NdisStatus = ProIndicatePacket(Adapter, (PNDIS_PACKET)WorkItemContext); if( NdisStatus != NDIS_STATUS_PENDING ) - MiniSendComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); + MiniIndicateComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); break; case NdisWorkItemReturnPackets: break; case NdisWorkItemResetRequested: - NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); - NdisMIndicateStatusComplete(Adapter); - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.ResetStatus = NdisStatus; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); if (NdisStatus != NDIS_STATUS_PENDING) MiniResetComplete(Adapter, NdisStatus, AddressingReset); @@ -1220,15 +1143,18 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniEndRequest(Adapter, NdisWorkItemRequest); break; } break; default: + MiniEndRequest(Adapter, WorkItemType); NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS work item type (%d).\n", WorkItemType)); break; } - } + } + } } @@ -1337,6 +1263,7 @@ if (Adapter->NdisMiniportBlock.Log) { *LogHandle = NULL; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NDIS_STATUS_FAILURE; } @@ -1344,6 +1271,7 @@ if (!Log) { *LogHandle = NULL; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NDIS_STATUS_RESOURCES; } @@ -2231,6 +2159,7 @@ PDEVICE_OBJECT DeviceObject; PLOGICAL_ADAPTER Adapter; NTSTATUS Status; + UINT i; /* * Gain the access to the miniport data structure first. @@ -2353,6 +2282,9 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = 0; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceAdded; + + for (i = 0; i < NUMBER_OF_WORK_ITEM_TYPES; i++) + Adapter->NdisMiniportBlock.WorkQueue[i].Next = NULL; KeInitializeTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); KeInitializeDpc(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc, MiniportHangDpc, Adapter); Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -325,6 +325,7 @@ PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; + NDIS_STATUS Status; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -336,17 +337,15 @@ MacBlock->Binding = &AdapterBinding->NdisOpenBlock; -#if WORKER_TEST - 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 + Status = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(Status)) + return Status; + + Status = MiniDoRequest(Adapter, NdisRequest); + if (Status != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); + + return Status; } @@ -393,17 +392,12 @@ NDIS_STATUS proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) { -#if WORKER_TEST - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); - return NDIS_STATUS_PENDING; -#else KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(MiniIsBusy(Adapter, NdisWorkItemSend)) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); - return NDIS_STATUS_PENDING; - } + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemSend, Packet); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { @@ -425,10 +419,14 @@ NdisStatus = NDIS_GET_PACKET_STATUS(Packet); if (NdisStatus == NDIS_STATUS_RESOURCES) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + /* We don't need to add to head here because it's already guaranteed to the + the first packet in the queue */ NdisStatus = NDIS_STATUS_PENDING; } } + + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemSend); return NdisStatus; } else { @@ -448,14 +446,16 @@ KeLowerIrql(RaiseOldIrql); if (NdisStatus == NDIS_STATUS_RESOURCES) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + /* See comment above */ NdisStatus = NDIS_STATUS_PENDING; } } + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemSend); + return NdisStatus; } -#endif } @@ -508,12 +508,7 @@ if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { -#if WORKER_TEST - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet, FALSE); - return NDIS_STATUS_PENDING; -#else return ProIndicatePacket(Adapter, Packet); -#endif } else { if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { @@ -570,11 +565,14 @@ IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets) { + UNIMPLEMENTED +#if 0 PADAPTER_BINDING AdapterBinding = NdisBindingHandle; PLOGICAL_ADAPTER Adapter = AdapterBinding->Adapter; KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; UINT i; + BOOLEAN QueuePackets; if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { @@ -590,10 +588,15 @@ (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); KeLowerIrql(RaiseOldIrql); - for (i = 0; i < NumberOfPackets; i++) + for (i = 0, QueuePackets = FALSE; i < NumberOfPackets; i++) { NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); - if (NdisStatus != NDIS_STATUS_PENDING) + if (NdisStatus == NDIS_STATUS_RESOURCES) + QueuePackets = TRUE; + + if (QueuePackets) + NdisQueueWorkItemHead(Adapter, NdisWorkItemSend, PacketArray[i]); + else MiniSendComplete(Adapter, PacketArray[i], NdisStatus); } } @@ -624,6 +627,7 @@ KeLowerIrql(RaiseOldIrql); } } +#endif }

1 0

[sir_richard] 45008: Trap handlers in C Patch 4 of X: [NTOS]: Implement trap 6 (invalid opcode) in C.
by sir_richard＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: sir_richard Date: Fri Jan 8 19:45:04 2010 New Revision: 45008 URL: http://svn.reactos.org/svn/reactos?rev=45008&view=rev Log: Trap handlers in C Patch 4 of X: [NTOS]: Implement trap 6 (invalid opcode) in C. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 8 19:45:04 2010 @@ -664,13 +664,6 @@ /* HARDWARE TRAP HANDLERS ****************************************************/ -.func KiFixupFrame -_KiFixupFrame: - - /* TODO: Routine to fixup a KTRAP_FRAME when faulting from a syscall. */ - UNHANDLED_PATH "Trap Frame Fixup" -.endfunc - GENERATE_TRAP_HANDLER KiTrap0, 1 GENERATE_TRAP_HANDLER KiTrap1, 1 @@ -699,122 +692,7 @@ GENERATE_TRAP_HANDLER KiTrap3, 1 GENERATE_TRAP_HANDLER KiTrap4, 1 GENERATE_TRAP_HANDLER KiTrap5, 1 - -.func KiTrap6 -TRAP_FIXUPS kit6_a, kit6_t, DoFixupV86, DoNotFixupAbios -_KiTrap6: - - /* It this a V86 GPF? */ - test dword ptr [esp+8], EFLAGS_V86_MASK - jz NotV86UD - - /* Enter V86 Trap */ - V86_TRAP_PROLOG kit6_a, kit6_v - -VdmOpCodeFault: - /* Not yet supported (Invalid OPCODE from V86) */ - UNHANDLED_V86_PATH - -NotV86UD: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit6_a, kit6_t - -DispatchLockErrata: - /* Check if this happened in kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KmodeOpcode - - /* Check for VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jz UmodeOpcode - - /* Check if the process is vDM */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jnz IsVdmOpcode - -UmodeOpcode: - /* Get EIP and enable interrupts at this point */ - mov esi, [ebp+KTRAP_FRAME_EIP] - sti - - /* Set intruction prefix length */ - mov ecx, 4 - - /* Setup a SEH frame */ - push ebp - push OpcodeSEH - push PCR[KPCR_EXCEPTION_LIST] - mov PCR[KPCR_EXCEPTION_LIST], esp - -OpcodeLoop: - /* Get the instruction and check if it's LOCK */ - mov al, [esi] - cmp al, 0xF0 - jz LockCrash - - /* Keep moving */ - add esi, 1 - loop OpcodeLoop - - /* Undo SEH frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - -KmodeOpcode: - - /* Re-enable interrupts */ - sti - - /* Setup illegal instruction exception and dispatch it */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_ILLEGAL_INSTRUCTION - jmp _DispatchNoParam - -LockCrash: - - /* Undo SEH Frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - - /* Setup invalid lock exception and dispatch it */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_INVALID_LOCK_SEQUENCE - jmp _DispatchNoParam - -IsVdmOpcode: - - /* Unhandled yet */ - UNHANDLED_V86_PATH - - /* Return to caller */ - jmp _Kei386EoiHelper@0 - -OpcodeSEH: - - /* Get SEH frame */ - mov esp, [esp+8] - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 4 - pop ebp - - /* Check if this was user mode */ - test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz KmodeOpcode - - /* Do a bugcheck */ - push ebp - push 0 - push 0 - push 0 - push 0 - push KMODE_EXCEPTION_NOT_HANDLED - call _KeBugCheckWithTf@24 -.endfunc +GENERATE_TRAP_HANDLER KiTrap6, 1 .func KiTrap7 TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios @@ -1473,8 +1351,13 @@ pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 - /* Illegal instruction */ - jmp KmodeOpcode + /* Re-enable interrupts */ + sti + + /* Setup illegal instruction exception and dispatch it */ + mov ebx, [ebp+KTRAP_FRAME_EIP] + mov eax, STATUS_ILLEGAL_INSTRUCTION + jmp _DispatchNoParam NotPrefixByte: /* Check if it's a HLT */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 8 19:45:04 2010 @@ -340,6 +340,51 @@ KiDispatchException0Args(STATUS_ARRAY_BOUNDS_EXCEEDED, TrapFrame->Eip, TrapFrame); +} + +VOID +FASTCALL +KiTrap6Handler(IN PKTRAP_FRAME TrapFrame) +{ + PUCHAR Instruction; + ULONG i; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Enable interrupts */ + Instruction = (PUCHAR)TrapFrame->Eip; + _enable(); + + /* Check for user trap */ + if (KiUserTrap(TrapFrame)) + { + /* FIXME: Use SEH */ + + /* Scan next 4 opcodes */ + for (i = 0; i < 4; i++) + { + /* Check for LOCK instruction */ + if (Instruction[i] == 0xF0) + { + /* Send invalid lock sequence exception */ + KiDispatchException0Args(STATUS_INVALID_LOCK_SEQUENCE, + TrapFrame->Eip, + TrapFrame); + } + } + + /* FIXME: SEH ends here */ + } + + /* Kernel-mode or user-mode fault (but not LOCK) */ + KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } VOID

1 0

[cgutman] 45007: - Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon) - Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock
by cgutman＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: cgutman Date: Fri Jan 8 19:36:59 2010 New Revision: 45007 URL: http://svn.reactos.org/svn/reactos?rev=45007&view=rev Log: - Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon) - Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock Modified: branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c Modified: branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -501,8 +501,6 @@ NDIS_MEDIUM Medium = NdisMedium802_3; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); Status = NDIS_STATUS_SUCCESS; @@ -671,8 +669,6 @@ { NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); #ifndef NOCARD @@ -751,8 +747,6 @@ ULONG GenericULONG; NDIS_STATUS Status = NDIS_STATUS_SUCCESS; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); @@ -862,8 +856,6 @@ UINT RecvStart; UINT RecvStop; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n", Packet, ByteOffset, BytesToTransfer)); Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -1101,8 +1101,6 @@ { DPRINT("Called\n"); - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ *AddressingReset = FALSE; Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -118,11 +118,9 @@ DPRINT("Called. OID 0x%x\n", Oid); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - ASSERT(Adapter); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); Status = NDIS_STATUS_SUCCESS; CopyFrom = (PVOID)&GenericULONG; @@ -369,7 +367,7 @@ *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status is 0x%x\n", Status); @@ -408,11 +406,9 @@ ASSERT(Adapter); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - DPRINT("Called, OID 0x%x\n", Oid); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); switch (Oid) { @@ -511,7 +507,7 @@ *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status (0x%X).\n", Status);

1 0

[cgutman] 45006: - Use a spin lock to protect the port bitmap instead of a fast mutex
by cgutman＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: cgutman Date: Fri Jan 8 19:21:52 2010 New Revision: 45006 URL: http://svn.reactos.org/svn/reactos?rev=45006&view=rev Log: - Use a spin lock to protect the port bitmap instead of a fast mutex Modified: branches/aicom-network-branch/drivers/network/tcpip/include/ports.h branches/aicom-network-branch/lib/drivers/ip/network/ports.c Modified: branches/aicom-network-branch/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/tcpip/include/ports.h [iso-8859-1] Fri Jan 8 19:21:52 2010 @@ -16,7 +16,7 @@ PVOID ProtoBitBuffer; UINT StartingPort; UINT PortsToOversee; - FAST_MUTEX Mutex; + KSPIN_LOCK Lock; } PORT_SET, *PPORT_SET; NTSTATUS PortsStartup( PPORT_SET PortSet, Modified: branches/aicom-network-branch/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/ports.c [iso-8859-1] Fri Jan 8 19:21:52 2010 @@ -24,7 +24,7 @@ PortSet->ProtoBitBuffer, PortSet->PortsToOversee ); RtlClearAllBits( &PortSet->ProtoBitmap ); - ExInitializeFastMutex( &PortSet->Mutex ); + KeInitializeSpinLock( &PortSet->Lock ); return STATUS_SUCCESS; } @@ -33,17 +33,20 @@ } VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ) { + KIRQL OldIrql; + Port = htons(Port); ASSERT(Port >= PortSet->StartingPort); ASSERT(Port < PortSet->StartingPort + PortSet->PortsToOversee); - ExAcquireFastMutex( &PortSet->Mutex ); + KeAcquireSpinLock( &PortSet->Lock, &OldIrql ); RtlClearBits( &PortSet->ProtoBitmap, Port - PortSet->StartingPort, 1 ); - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); } BOOLEAN AllocatePort( PPORT_SET PortSet, ULONG Port ) { BOOLEAN Clear; + KIRQL OldIrql; Port = htons(Port); @@ -55,32 +58,34 @@ Port -= PortSet->StartingPort; - ExAcquireFastMutex( &PortSet->Mutex ); + KeAcquireSpinLock( &PortSet->Lock, &OldIrql ); Clear = RtlAreBitsClear( &PortSet->ProtoBitmap, Port, 1 ); if( Clear ) RtlSetBits( &PortSet->ProtoBitmap, Port, 1 ); - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); return Clear; } ULONG AllocateAnyPort( PPORT_SET PortSet ) { ULONG AllocatedPort; + KIRQL OldIrql; - ExAcquireFastMutex( &PortSet->Mutex ); + KeAcquireSpinLock( &PortSet->Lock, &OldIrql ); AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, 0 ); if( AllocatedPort != (ULONG)-1 ) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); return htons(AllocatedPort); } - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); return -1; } ULONG AllocatePortFromRange( PPORT_SET PortSet, ULONG Lowest, ULONG Highest ) { ULONG AllocatedPort; + KIRQL OldIrql; if ((Lowest < PortSet->StartingPort) || (Highest >= PortSet->StartingPort + PortSet->PortsToOversee)) @@ -91,15 +96,15 @@ Lowest -= PortSet->StartingPort; Highest -= PortSet->StartingPort; - ExAcquireFastMutex( &PortSet->Mutex ); + KeAcquireSpinLock( &PortSet->Lock, &OldIrql ); AllocatedPort = RtlFindClearBits( &PortSet->ProtoBitmap, 1, Lowest ); if( AllocatedPort != (ULONG)-1 && AllocatedPort <= Highest) { RtlSetBit( &PortSet->ProtoBitmap, AllocatedPort ); AllocatedPort += PortSet->StartingPort; - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); return htons(AllocatedPort); } - ExReleaseFastMutex( &PortSet->Mutex ); + KeReleaseSpinLock( &PortSet->Lock, OldIrql ); return -1; }

1 0

[sir_richard] 45005: Trap Handlers in C Patch 3 of X (Patch by Sir_Richard <ros.arm@reactos.org>): [NTOS]: Fix a bug in the assertion handler. [NTOS]: Implement page fault trap (14) in C instead of ASM. [NTOS]: Implement V8086 trap entry/exit, we were hitting these during page faults in Ke386CallBios for video reset during GUI boot.
by sir_richard＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: sir_richard Date: Fri Jan 8 19:21:47 2010 New Revision: 45005 URL: http://svn.reactos.org/svn/reactos?rev=45005&view=rev Log: Trap Handlers in C Patch 3 of X (Patch by Sir_Richard <ros.arm(a)reactos.org>): [NTOS]: Fix a bug in the assertion handler. [NTOS]: Implement page fault trap (14) in C instead of ASM. [NTOS]: Implement V8086 trap entry/exit, we were hitting these during page faults in Ke386CallBios for video reset during GUI boot. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Fri Jan 8 19:21:47 2010 @@ -9,7 +9,6 @@ // // Debug Macros // -#if YDEBUG VOID NTAPI KiDumpTrapFrame(IN PKTRAP_FRAME TrapFrame) @@ -52,6 +51,7 @@ DPRINT1("V86Gs: %x\n", TrapFrame->V86Gs); } +#if YDEBUG FORCEINLINE VOID KiFillTrapFrameDebug(IN PKTRAP_FRAME TrapFrame) @@ -220,6 +220,18 @@ KiDispatchExceptionFromTrapFrame(Code, Address, 0, 0, 0, 0, TrapFrame); } +VOID +FORCEINLINE +KiDispatchException2Args(IN NTSTATUS Code, + IN ULONG_PTR Address, + IN ULONG P1, + IN ULONG P2, + IN PKTRAP_FRAME TrapFrame) +{ + /* Helper for exceptions with no arguments */ + KiDispatchExceptionFromTrapFrame(Code, Address, 2, P1, P2, 0, TrapFrame); +} + FORCEINLINE VOID KiTrapReturn(IN PKTRAP_FRAME TrapFrame) Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 8 19:21:47 2010 @@ -58,6 +58,10 @@ .globl _KiTrap8 .globl _KiTrap19 +/* System call code referenced from C code */ +.globl _CopyParams +.globl _ReadBatch + /* System call entrypoints: */ .globl _KiFastCallEntry .globl _KiSystemService @@ -193,7 +197,7 @@ /* Check if we should flush the User Batch */ xor ebx, ebx -ReadBatch: +_ReadBatch: or ebx, [ecx+TEB_GDI_BATCH_COUNT] jz NotWin32K @@ -239,7 +243,7 @@ cmp esi, _MmUserProbeAddress jnb AccessViolation -CopyParams: +_CopyParams: /* Copy the parameters */ rep movsd @@ -359,7 +363,7 @@ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK /* It's fine, go ahead with it */ - jz CopyParams + jz _CopyParams /* Caller sent invalid parameters, fail here */ mov eax, STATUS_ACCESS_VIOLATION @@ -1219,9 +1223,9 @@ test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK jnz UserModeGpf - /* Check if we have a VDM alert */ - cmp dword ptr PCR[KPCR_VDM_ALERT], 0 - jnz VdmAlertGpf + ///* Check if we have a VDM alert */ + //cmp dword ptr PCR[KPCR_VDM_ALERT], 0 // BUGBUG: Add this back later + //jnz VdmAlertGpf /* Check for GPF during GPF */ mov eax, [ebp+KTRAP_FRAME_EIP] @@ -1607,203 +1611,7 @@ UNHANDLED_V86_PATH .endfunc -.func KiTrap14 -TRAP_FIXUPS kite_a, kite_t, DoFixupV86, DoNotFixupAbios -_KiTrap14: - - /* Enter trap */ - TRAP_PROLOG kite_a, kite_t - - /* Check if we have a VDM alert */ - cmp dword ptr PCR[KPCR_VDM_ALERT], 0 - jnz VdmAlertGpf - - /* Get the current thread */ - mov edi, PCR[KPCR_CURRENT_THREAD] - - /* Get the stack address of the frame */ - lea eax, [esp+KTRAP_FRAME_LENGTH+NPX_FRAME_LENGTH] - sub eax, [edi+KTHREAD_INITIAL_STACK] - jz NoFixUp - - /* This isn't the base frame, check if it's the second */ - cmp eax, -KTRAP_FRAME_EFLAGS - jb NoFixUp - - /* Check if we have a TEB */ - mov eax, PCR[KPCR_TEB] - or eax, eax - jle NoFixUp - - /* Fixup the frame */ - call _KiFixupFrame - - /* Save CR2 */ -NoFixUp: - mov edi, cr2 - - /* Check if this processor has the cmpxchg8b lock errata */ - cmp byte ptr _KiI386PentiumLockErrataPresent, 0 - jnz HandleLockErrata - -NotLockErrata: - /* HACK: Handle page faults with interrupts disabled */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - je HandlePf - - /* Enable interrupts and check if we got here with interrupts disabled */ - sti -#ifdef HACK_ABOVE_FIXED - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - jz IllegalState -#endif - -HandlePf: - /* Send trap frame and check if this is kernel-mode or usermode */ - push ebp - mov eax, [ebp+KTRAP_FRAME_CS] - and eax, MODE_MASK - push eax - - /* Send faulting address and check if this is read or write */ - push edi - mov eax, [ebp+KTRAP_FRAME_ERROR_CODE] - and eax, 1 - push eax - - /* Call the access fault handler */ - call _MmAccessFault@16 - test eax, eax - jl AccessFail - - /* Access fault handled, return to caller */ - jmp _Kei386EoiHelper@0 - -AccessFail: - /* First check if this is a fault in the S-LIST functions */ - mov ecx, offset _ExpInterlockedPopEntrySListFault@0 - cmp [ebp+KTRAP_FRAME_EIP], ecx - jz SlistFault - - /* Check if this is a fault in the syscall handler */ - mov ecx, offset CopyParams - cmp [ebp+KTRAP_FRAME_EIP], ecx - jz SysCallCopyFault - mov ecx, offset ReadBatch - cmp [ebp+KTRAP_FRAME_EIP], ecx - jnz CheckVdmPf - - /* FIXME: TODO */ - UNHANDLED_PATH "SYSENTER Fault" - jmp _Kei386EoiHelper@0 - -SysCallCopyFault: - /* FIXME: TODO */ - UNHANDLED_PATH "SYSENTER Fault" - jmp _Kei386EoiHelper@0 - - /* Check if the fault occured in a V86 mode */ -CheckVdmPf: - mov ecx, [ebp+KTRAP_FRAME_ERROR_CODE] - shr ecx, 1 - and ecx, 1 - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz VdmPF - - /* Check if the fault occured in a VDM */ - mov esi, PCR[KPCR_CURRENT_THREAD] - mov esi, [esi+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [esi+EPROCESS_VDM_OBJECTS], 0 - jz CheckStatus - - /* Check if we this was in kernel-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz CheckStatus - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jz CheckStatus - -VdmPF: - /* FIXME: TODO */ - UNHANDLED_V86_PATH - - /* Save EIP and check what kind of status failure we got */ -CheckStatus: - mov esi, [ebp+KTRAP_FRAME_EIP] - cmp eax, STATUS_ACCESS_VIOLATION - je AccessViol - cmp eax, STATUS_GUARD_PAGE_VIOLATION - je SpecialCode - cmp eax, STATUS_STACK_OVERFLOW - je SpecialCode - - /* Setup an in-page exception to dispatch */ - mov edx, ecx - mov ebx, esi - mov esi, edi - mov ecx, 3 - mov edi, eax - mov eax, STATUS_IN_PAGE_ERROR - call _CommonDispatchException - -AccessViol: - /* Use more proper status code */ - mov eax, KI_EXCEPTION_ACCESS_VIOLATION - -SpecialCode: - /* Setup a normal page fault exception */ - mov ebx, esi - mov edx, ecx - mov esi, edi - jmp _DispatchTwoParam - -SlistFault: - /* FIXME: TODO */ - UNHANDLED_PATH "SLIST Fault" - -IllegalState: - - /* This is completely illegal, bugcheck the system */ - push ebp - push esi - push ecx - push eax - push edi - push IRQL_NOT_LESS_OR_EQUAL - call _KeBugCheckWithTf@24 - -VdmAlertGpf: - - /* FIXME: NOT SUPPORTED */ - UNHANDLED_V86_PATH - -HandleLockErrata: - - /* Fail if this isn't a write fault */ - test word ptr [ebp+KTRAP_FRAME_ERROR_CODE], 0x4 - jnz NotLockErrata - - /* Also make sure the page fault is for IDT entry 6 */ - mov eax, PCR[KPCR_IDT] - add eax, 0x30 - cmp eax, edi - jne NotLockErrata - - /* - * This is a write fault to the Invalid Opcode handler entry. - * We assume this is the lock errata and not a real write fault. - */ - - /* Clear the error code */ - and dword ptr [ebp+KTRAP_FRAME_ERROR_CODE], 0 - - /* Check if this happened in V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz VdmOpCodeFault - - /* Dispatch this to the invalid opcode handler */ - jmp DispatchLockErrata -.endfunc - +GENERATE_TRAP_HANDLER KiTrap14, 0 GENERATE_TRAP_HANDLER KiTrap0F, 1 .func KiTrap16 Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 8 19:21:47 2010 @@ -43,13 +43,8 @@ } /* Check if this was a V8086 trap */ - if (TrapFrame->EFlags & EFLAGS_V86_MASK) - { - /* Not handled yet */ - UNIMPLEMENTED; - while (TRUE); - } - + if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiTrapReturn(TrapFrame); + /* Check if the trap frame was edited */ if (!(TrapFrame->SegCs & FRAME_EDITED)) { @@ -155,8 +150,11 @@ /* Check for V86 mode */ if (TrapFrame->EFlags & EFLAGS_V86_MASK) { - UNIMPLEMENTED; - while (TRUE); + /* Restore V8086 segments into Protected Mode segments */ + TrapFrame->SegFs = TrapFrame->V86Fs; + TrapFrame->SegGs = TrapFrame->V86Gs; + TrapFrame->SegDs = TrapFrame->V86Ds; + TrapFrame->SegEs = TrapFrame->V86Es; } /* Clear direction flag */ @@ -404,6 +402,130 @@ VOID FASTCALL +KiTrap14Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + ULONG_PTR Cr2; + NTSTATUS Status; + extern VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); + extern VOID CopyParams(VOID); + extern VOID ReadBatch(VOID); + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check for custom VDM trap handler */ + if (KeGetPcr()->VdmAlert) + { + /* Not implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check if this is the base frame */ + Thread = KeGetCurrentThread(); + if (KeGetTrapFrame(Thread) != TrapFrame) + { + /* It isn't, check if this is a second nested frame */ + if (((ULONG_PTR)KeGetTrapFrame(Thread) - (ULONG_PTR)TrapFrame) <= + FIELD_OFFSET(KTRAP_FRAME, EFlags)) + { + /* The stack is somewhere in between frames, we need to fix it */ + UNIMPLEMENTED; + while (TRUE); + } + } + + /* Save CR2 */ + Cr2 = __readcr2(); + + /* Check for Pentium LOCK errata */ + if (KiI386PentiumLockErrataPresent) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* HACK: Check if interrupts are disabled and enable them */ + if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + { + /* Enable interupts */ + _enable(); +#ifdef HACK_ABOVE_FIXED + if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + { + /* This is illegal */ + KeBugCheckWithTf(IRQL_NOT_LESS_OR_EQUAL, + Cr2, + -1, + TrapFrame->ErrCode & 1, + TrapFrame->Eip, + TrapFrame); + } +#endif + } + + /* Call the access fault handler */ + Status = MmAccessFault(TrapFrame->ErrCode & 1, + (PVOID)Cr2, + TrapFrame->SegCs & MODE_MASK, + TrapFrame); + if (Status == STATUS_SUCCESS) KiEoiHelper(TrapFrame); + + /* Check for S-LIST fault */ + if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check for syscall fault */ + if ((TrapFrame->Eip == (ULONG_PTR)CopyParams) || + (TrapFrame->Eip == (ULONG_PTR)ReadBatch)) + { + /* Not yet implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Either kernel or user trap (non VDM) so dispatch exception */ + if (Status == STATUS_ACCESS_VIOLATION) + { + /* This status code is repurposed so we can recognize it later */ + KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, + TrapFrame->Eip, + TrapFrame->ErrCode & 1, + Cr2, + TrapFrame); + } + else if ((Status == STATUS_GUARD_PAGE_VIOLATION) || + (Status == STATUS_STACK_OVERFLOW)) + { + /* These faults only have two parameters */ + KiDispatchException2Args(Status, + TrapFrame->Eip, + TrapFrame->ErrCode & 1, + Cr2, + TrapFrame); + } + + /* Only other choice is an in-page error, with 3 parameters */ + KiDispatchExceptionFromTrapFrame(STATUS_IN_PAGE_ERROR, + TrapFrame->Eip, + 3, + TrapFrame->ErrCode & 1, + Cr2, + Status, + TrapFrame); +} + +VOID +FASTCALL KiTrap0FHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -433,8 +555,8 @@ /* Save trap frame */ KiEnterTrap(TrapFrame); - /* Increment EIP to skip the INT2C instruction (2 bytes, not 1 like INT3) */ - TrapFrame->Eip += 2; + /* Decrement EIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ + TrapFrame->Eip -= 2; /* Dispatch the exception */ KiDispatchException0Args(STATUS_ASSERTION_FAILURE,

1 0

[cgutman] 45004: - Add locking to ICMPSendDatagram
by cgutman＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: cgutman Date: Fri Jan 8 19:10:05 2010 New Revision: 45004 URL: http://svn.reactos.org/svn/reactos?rev=45004&view=rev Log: - Add locking to ICMPSendDatagram Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] Fri Jan 8 19:10:05 2010 @@ -159,6 +159,7 @@ USHORT RemotePort; NTSTATUS Status; PNEIGHBOR_CACHE_ENTRY NCE; + KIRQL OldIrql; TI_DbgPrint(MID_TRACE,("Sending Datagram(%x %x %x %d)\n", AddrFile, ConnInfo, BufferData, DataSize)); @@ -177,6 +178,8 @@ } TI_DbgPrint(MID_TRACE,("About to get route to destination\n")); + + LockObject(AddrFile, &OldIrql); LocalAddress = AddrFile->Address; if (AddrIsUnspecified(&LocalAddress)) @@ -186,14 +189,20 @@ * interface we're sending over */ if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) + { + UnlockObject(AddrFile, OldIrql); return STATUS_NETWORK_UNREACHABLE; + } LocalAddress = NCE->Interface->Unicast; } else { if(!(NCE = NBLocateNeighbor( &LocalAddress ))) + { + UnlockObject(AddrFile, OldIrql); return STATUS_INVALID_PARAMETER; + } } Status = PrepareICMPPacket( NCE->Interface, @@ -203,17 +212,23 @@ DataSize ); if( !NT_SUCCESS(Status) ) + { + UnlockObject(AddrFile, OldIrql); return Status; + } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, ICMPSendPacketComplete, NULL ))) { + UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); + + UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; }

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