Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 54560: [NDIS] - Print miniport attribute flags
by cgutman＠svn.reactos.org 02 Dec '11

02 Dec '11

Author: cgutman Date: Fri Dec 2 03:21:21 2011 New Revision: 54560 URL: http://svn.reactos.org/svn/reactos?rev=54560&view=rev Log: [NDIS] - Print miniport attribute flags Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Dec 2 03:21:21 2011 @@ -2790,8 +2790,9 @@ if (CheckForHangTimeInSeconds > 0) Adapter->NdisMiniportBlock.CheckForHangSeconds = CheckForHangTimeInSeconds; if (AttributeFlags & NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER) - NDIS_DbgPrint(MAX_TRACE, ("Intermediate drivers not supported yet.\n")); - + NDIS_DbgPrint(MIN_TRACE, ("Intermediate drivers not supported yet.\n")); + + NDIS_DbgPrint(MIN_TRACE, ("Miniport attribute flags: 0x%x\n", AttributeFlags)); if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.AdapterShutdownHandler) {

1 0

[cgutman] 54559: [NDIS] - Implement NdisReturnPackets and do proper reference tracking of packets sent to ProtocolReceivePacket - Plug a massive memory leak that resulted in leaking every packet de...
by cgutman＠svn.reactos.org 02 Dec '11

02 Dec '11

Author: cgutman Date: Fri Dec 2 01:56:10 2011 New Revision: 54559 URL: http://svn.reactos.org/svn/reactos?rev=54559&view=rev Log: [NDIS] - Implement NdisReturnPackets and do proper reference tracking of packets sent to ProtocolReceivePacket - Plug a massive memory leak that resulted in leaking every packet descriptor that any deserialized miniport indicated to TCP/IP Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Fri Dec 2 01:56:10 2011 @@ -490,25 +490,6 @@ /* * @unimplemented */ -VOID -EXPORT -NdisReturnPackets( - IN PNDIS_PACKET *PacketsToReturn, - IN UINT NumberOfPackets) -/* - * FUNCTION: Releases ownership of one or more packets - * ARGUMENTS: - * PacketsToReturn = Pointer to an array of pointers to packet descriptors - * NumberOfPackets = Number of pointers in descriptor pointer array - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ UINT EXPORT NdisPacketPoolUsage( 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 Dec 2 01:56:10 2011 @@ -245,7 +245,41 @@ NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } - +/* + * @implemented + */ +VOID +EXPORT +NdisReturnPackets( + IN PNDIS_PACKET *PacketsToReturn, + IN UINT NumberOfPackets) +/* + * FUNCTION: Releases ownership of one or more packets + * ARGUMENTS: + * PacketsToReturn = Pointer to an array of pointers to packet descriptors + * NumberOfPackets = Number of pointers in descriptor pointer array + */ +{ + UINT i; + PLOGICAL_ADAPTER Adapter; + + NDIS_DbgPrint(MID_TRACE, ("Returning %d packets\n", NumberOfPackets)); + + for (i = 0; i < NumberOfPackets; i++) + { + PacketsToReturn[i]->WrapperReserved[0]--; + if (PacketsToReturn[i]->WrapperReserved[0] == 0) + { + Adapter = (PVOID)(ULONG_PTR)PacketsToReturn[i]->Reserved[1]; + + NDIS_DbgPrint(MAX_TRACE, ("Freeing packet %d (adapter = 0x%p)\n", i, Adapter)); + + Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ReturnPacketHandler( + Adapter->NdisMiniportBlock.MiniportAdapterContext, + PacketsToReturn[i]); + } + } +} VOID NTAPI MiniIndicateReceivePacket( IN NDIS_HANDLE MiniportAdapterHandle, @@ -260,87 +294,139 @@ * */ { - PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; - PLIST_ENTRY CurrentEntry; - PADAPTER_BINDING AdapterBinding; - KIRQL OldIrql; - UINT i; - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - CurrentEntry = Adapter->ProtocolListHead.Flink; - - while (CurrentEntry != &Adapter->ProtocolListHead) - { - AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); - - for (i = 0; i < NumberOfPackets; i++) - { - if (AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler && - NDIS_GET_PACKET_STATUS(PacketArray[i]) != NDIS_STATUS_RESOURCES) - { - (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( - AdapterBinding->NdisOpenBlock.ProtocolBindingContext, - PacketArray[i]); - } - else - { - UINT FirstBufferLength, TotalBufferLength, LookAheadSize, HeaderSize; - PNDIS_BUFFER NdisBuffer; - PVOID NdisBufferVA, LookAheadBuffer; - NDIS_STATUS NdisStatus; - - - NdisGetFirstBufferFromPacket(PacketArray[i], - &NdisBuffer, - &NdisBufferVA, - &FirstBufferLength, - &TotalBufferLength); - - HeaderSize = NDIS_GET_PACKET_HEADER_SIZE(PacketArray[i]); - - if (Adapter->NdisMiniportBlock.CurrentLookahead < (TotalBufferLength - HeaderSize)) - { - LookAheadSize = Adapter->NdisMiniportBlock.CurrentLookahead; - } - else - { - LookAheadSize = TotalBufferLength - HeaderSize; - } - - - LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); - if (!LookAheadBuffer) - { - NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - return; - } - - CopyBufferChainToBuffer(LookAheadBuffer, - NdisBuffer, - HeaderSize, - LookAheadSize); - - NdisStatus = (*AdapterBinding->ProtocolBinding->Chars.ReceiveHandler)( - AdapterBinding->NdisOpenBlock.ProtocolBindingContext, - AdapterBinding->NdisOpenBlock.MacHandle, - NdisBufferVA, - HeaderSize, - LookAheadBuffer, - LookAheadSize, - TotalBufferLength - HeaderSize); - - NDIS_SET_PACKET_STATUS(PacketArray[i], NdisStatus); - - ExFreePool(LookAheadBuffer); - } - } - - CurrentEntry = CurrentEntry->Flink; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + UINT i; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + CurrentEntry = Adapter->ProtocolListHead.Flink; + + while (CurrentEntry != &Adapter->ProtocolListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); + + for (i = 0; i < NumberOfPackets; i++) + { + /* Store the indicating miniport in the packet */ + PacketArray[i]->Reserved[1] = (ULONG_PTR)Adapter; + + if (AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler && + NDIS_GET_PACKET_STATUS(PacketArray[i]) != NDIS_STATUS_RESOURCES) + { + NDIS_DbgPrint(MID_TRACE, ("Indicating packet to protocol's ReceivePacket handler\n")); + PacketArray[i]->WrapperReserved[0] += (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + PacketArray[i]); + NDIS_DbgPrint(MID_TRACE, ("Protocol is holding %d references to the packet\n", PacketArray[i]->WrapperReserved[0])); + } + else + { + UINT FirstBufferLength, TotalBufferLength, LookAheadSize, HeaderSize; + PNDIS_BUFFER NdisBuffer; + PVOID NdisBufferVA, LookAheadBuffer; + + NdisGetFirstBufferFromPacket(PacketArray[i], + &NdisBuffer, + &NdisBufferVA, + &FirstBufferLength, + &TotalBufferLength); + + HeaderSize = NDIS_GET_PACKET_HEADER_SIZE(PacketArray[i]); + + if (Adapter->NdisMiniportBlock.CurrentLookahead < (TotalBufferLength - HeaderSize)) + { + LookAheadSize = Adapter->NdisMiniportBlock.CurrentLookahead; + } + else + { + LookAheadSize = TotalBufferLength - HeaderSize; + } + + LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); + if (!LookAheadBuffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return; + } + + CopyBufferChainToBuffer(LookAheadBuffer, + NdisBuffer, + HeaderSize, + LookAheadSize); + + NDIS_DbgPrint(MID_TRACE, ("Indicating packet to protocol's legacy Receive handler\n")); + (*AdapterBinding->ProtocolBinding->Chars.ReceiveHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + AdapterBinding->NdisOpenBlock.MacHandle, + NdisBufferVA, + HeaderSize, + LookAheadBuffer, + LookAheadSize, + TotalBufferLength - HeaderSize); + + ExFreePool(LookAheadBuffer); + } + } + + CurrentEntry = CurrentEntry->Flink; + } + + /* Loop the packet array to get everything + * set up for return the packets to the miniport */ + for (i = 0; i < NumberOfPackets; i++) + { + /* First, check the initial packet status */ + if (NDIS_GET_PACKET_STATUS(PacketArray[i]) == NDIS_STATUS_RESOURCES) + { + /* The miniport driver gets it back immediately so nothing to do here */ + NDIS_DbgPrint(MID_TRACE, ("Miniport needs the packet back immediately\n")); + continue; + } + + /* Different behavior depending on whether it's serialized or not */ + if (Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE) + { + /* We need to check the reference count */ + if (PacketArray[i]->WrapperReserved[0] == 0) + { + /* NOTE: Unlike serialized miniports, this is REQUIRED to be called for each + * packet received that can be reused immediately, it is not implied! */ + Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ReturnPacketHandler( + Adapter->NdisMiniportBlock.MiniportAdapterContext, + PacketArray[i]); + NDIS_DbgPrint(MID_TRACE, ("Packet has been returned to miniport (Deserialized)\n")); + } + else + { + /* Packet will be returned by the protocol's call to NdisReturnPackets */ + NDIS_DbgPrint(MID_TRACE, ("Packet will be returned to miniport later (Deserialized)\n")); + } + } + else + { + /* Check the reference count */ + if (PacketArray[i]->WrapperReserved[0] == 0) + { + /* NDIS_STATUS_SUCCESS means the miniport can have the packet back immediately */ + NDIS_SET_PACKET_STATUS(PacketArray[i], NDIS_STATUS_SUCCESS); + + NDIS_DbgPrint(MID_TRACE, ("Packet has been returned to miniport (Serialized)\n")); + } + else + { + /* NDIS_STATUS_PENDING means the miniport needs to wait for MiniportReturnPacket */ + NDIS_SET_PACKET_STATUS(PacketArray[i], NDIS_STATUS_PENDING); + + NDIS_DbgPrint(MID_TRACE, ("Packet will be returned to miniport later (Serialized)\n")); + } + } + } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); }

1 0

[cgutman] 54558: [NDIS] - Call FreeCommonBuffer() synchronously if we're running at PASSIVE_LEVEL to avoid cases where the miniport could be freed before the work item runs
by cgutman＠svn.reactos.org 01 Dec '11

01 Dec '11

Author: cgutman Date: Thu Dec 1 23:04:22 2011 New Revision: 54558 URL: http://svn.reactos.org/svn/reactos?rev=54558&view=rev Log: [NDIS] - Call FreeCommonBuffer() synchronously if we're running at PASSIVE_LEVEL to avoid cases where the miniport could be freed before the work item runs Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Thu Dec 1 23:04:22 2011 @@ -239,10 +239,32 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; + PDMA_ADAPTER DmaAdapter = Adapter->NdisMiniportBlock.SystemAdapterObject; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + + /* Call FreeCommonBuffer synchronously if we are at PASSIVE_LEVEL */ + if (KeGetCurrentIrql() == PASSIVE_LEVEL) + { + /* We need this case because we free shared memory asynchronously + * and the miniport (and DMA adapter object) could be freed before + * our work item executes. Lucky for us, the scenarios where the + * freeing needs to be synchronous (failed init, MiniportHalt, + * and driver unload) are all at PASSIVE_LEVEL so we can just + * call FreeCommonBuffer synchronously and not have to worry + * about the miniport falling out from under us */ + + NDIS_DbgPrint(MID_TRACE,("Freeing shared memory synchronously\n")); + + DmaAdapter->DmaOperations->FreeCommonBuffer(DmaAdapter, + Length, + PhysicalAddress, + VirtualAddress, + Cached); + return; + } /* Must be NonpagedPool because by definition we're at DISPATCH_LEVEL */ Memory = ExAllocatePool(NonPagedPool, sizeof(MINIPORT_SHARED_MEMORY));

1 0

[cgutman] 54557: [NDIS] - Make NdisMAllocateSharedMemoryAsync and NdisMFreeSharedMemory safe to call at IRQL <= DISPATCH_LEVEL
by cgutman＠svn.reactos.org 01 Dec '11

01 Dec '11

Author: cgutman Date: Thu Dec 1 22:31:54 2011 New Revision: 54557 URL: http://svn.reactos.org/svn/reactos?rev=54557&view=rev Log: [NDIS] - Make NdisMAllocateSharedMemoryAsync and NdisMFreeSharedMemory safe to call at IRQL <= DISPATCH_LEVEL Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/memory.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] Thu Dec 1 22:31:54 2011 @@ -71,7 +71,7 @@ BOOLEAN Cached; PNDIS_MINIPORT_BLOCK Adapter; PVOID Context; - PKEVENT Event; + PIO_WORKITEM WorkItem; } MINIPORT_SHARED_MEMORY, *PMINIPORT_SHARED_MEMORY; /* A structure of WrapperConfigurationContext (not compatible with the Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Thu Dec 1 22:31:54 2011 @@ -188,6 +188,7 @@ VOID NTAPI NdisMFreeSharedMemoryPassive( + PDEVICE_OBJECT DeviceObject, PVOID Context) /* * FUNCTION: Free a common buffer @@ -198,7 +199,6 @@ */ { PMINIPORT_SHARED_MEMORY Memory = (PMINIPORT_SHARED_MEMORY)Context; - PRKEVENT Event = Memory->Event; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -208,11 +208,8 @@ Memory->AdapterObject, Memory->Length, Memory->PhysicalAddress, Memory->VirtualAddress, Memory->Cached); + IoFreeWorkItem(Memory->WorkItem); ExFreePool(Memory); - - KeSetEvent(Event, - IO_NO_INCREMENT, - FALSE); } @@ -240,10 +237,8 @@ * Therefore we have to do this in a worker thread. */ { - HANDLE ThreadHandle; PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; - KEVENT Event; NDIS_DbgPrint(MAX_TRACE,("Called.\n")); @@ -257,8 +252,6 @@ NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return; } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject; Memory->Length = Length; @@ -266,21 +259,25 @@ Memory->VirtualAddress = VirtualAddress; Memory->Cached = Cached; Memory->Adapter = &Adapter->NdisMiniportBlock; - Memory->Event = &Event; - - PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMFreeSharedMemoryPassive, Memory); - ZwClose(ThreadHandle); - - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); + + Memory->WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + if (!Memory->WorkItem) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + ExFreePool(Memory); + return; + } + + IoQueueWorkItem(Memory->WorkItem, + NdisMFreeSharedMemoryPassive, + CriticalWorkQueue, + Memory); } VOID NTAPI NdisMAllocateSharedMemoryPassive( + PDEVICE_OBJECT DeviceObject, PVOID Context) /* * FUNCTION: Allocate a common buffer @@ -304,6 +301,7 @@ Memory->Adapter->MiniportAdapterContext, Memory->VirtualAddress, &Memory->PhysicalAddress, Memory->Length, Memory->Context); + IoFreeWorkItem(Memory->WorkItem); ExFreePool(Memory); } @@ -319,7 +317,6 @@ IN BOOLEAN Cached, IN PVOID Context) { - HANDLE ThreadHandle; PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; PMINIPORT_SHARED_MEMORY Memory; @@ -342,8 +339,18 @@ Memory->Adapter = &Adapter->NdisMiniportBlock; Memory->Context = Context; - PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMAllocateSharedMemoryPassive, Memory); - ZwClose(ThreadHandle); + Memory->WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + if (!Memory->WorkItem) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + ExFreePool(Memory); + return NDIS_STATUS_FAILURE; + } + + IoQueueWorkItem(Memory->WorkItem, + NdisMAllocateSharedMemoryPassive, + DelayedWorkQueue, + Memory); return NDIS_STATUS_PENDING; }

1 0

[jimtabor] 54556: [Win32k|User32] - Fix regressions, running RegEdit. Adding more support for scroll bar controls. Pass all but 7 tests including the two wine todos.
by jimtabor＠svn.reactos.org 01 Dec '11

01 Dec '11

Author: jimtabor Date: Thu Dec 1 12:42:05 2011 New Revision: 54556 URL: http://svn.reactos.org/svn/reactos?rev=54556&view=rev Log: [Win32k|User32] - Fix regressions, running RegEdit. Adding more support for scroll bar controls. Pass all but 7 tests including the two wine todos. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Thu Dec 1 12:42:05 2011 @@ -309,7 +309,7 @@ void IntDrawScrollBar(HWND Wnd, HDC DC, INT Bar) { - //PSBTRACK pSBTrack; + //PSBWND pSBWnd; //INT ThumbSize; SCROLLBARINFO Info; BOOL Vertical; @@ -344,7 +344,7 @@ return; } - //ThumbSize = pSBTrack->pSBCalc->pxThumbBottom - pSBTrack->pSBCalc->pxThumbTop; + //ThumbSize = pSBWnd->pSBCalc->pxThumbBottom - pSBWnd->pSBCalc->pxThumbTop; /* * Draw the arrows. @@ -482,6 +482,11 @@ RECT ClientRect; RECT WindowRect; DWORD Style, ExStyle; + PWND pWnd; + PSBINFO pSBInfo; + + pWnd = ValidateHwnd( Wnd ); + pSBInfo = DesktopPtrToUser(pWnd->pSBInfo); GetClientRect(Wnd, &ClientRect); if (SB_HORZ == Bar || SB_VERT == Bar) @@ -587,12 +592,8 @@ *ThumbSize = GetSystemMetrics(SM_CXVSCROLL); } -#if 0 /* FIXME */ - if (((pixels -= *ThumbSize ) < 0) || - ((info->flags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)) -#else - if ((Pixels -= *ThumbSize ) < 0) -#endif + if (((Pixels -= *ThumbSize ) < 0) || + (( pSBInfo->WSBflags & ESB_DISABLE_BOTH) == ESB_DISABLE_BOTH)) { /* Rectangle too small or scrollbar disabled -> no thumb */ *ThumbPos = *ThumbSize = 0; @@ -1090,13 +1091,13 @@ TRACE("hwnd=%p lpCreate=%p\n", Wnd, lpCreate); -#if 0 /* FIXME */ if (lpCreate->style & WS_DISABLED) - { - info->flags = ESB_DISABLE_BOTH; - TRACE("Created WS_DISABLED scrollbar\n"); - } -#endif + { + // info->flags = ESB_DISABLE_BOTH; + //NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); + NtUserMessageCall( Wnd, WM_ENABLE, FALSE, 0, 0, FNID_SCROLLBAR, FALSE); + ERR("Created WS_DISABLED scrollbar\n"); + } if (0 != (lpCreate->style & (SBS_SIZEGRIP | SBS_SIZEBOX))) { @@ -1152,10 +1153,10 @@ ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_POS; - if (! NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo)) - { + if (!NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo)) + { return 0; - } + } return ScrollInfo.nPos; } @@ -1167,10 +1168,10 @@ SCROLLINFO ScrollInfo; if (NULL == MinPos || NULL == MaxPos) - { + { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; - } + } ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; @@ -1276,10 +1277,15 @@ case WM_ENABLE: { - TRACE("ScrollBarWndProc WM_ENABLE\n"); - NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); - /* Refresh Scrollbars. */ - SCROLL_RefreshScrollBar(Wnd, SB_CTL, TRUE, TRUE); + PWND pWnd = ValidateHwnd(Wnd); + if (pWnd->pSBInfo) + { + ERR("ScrollBarWndProc WM_ENABLE\n"); + //NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); + NtUserMessageCall( Wnd, Msg, wParam, lParam, 0, FNID_SCROLLBAR, !unicode); + /* Refresh Scrollbars. */ + SCROLL_RefreshScrollBar(Wnd, SB_CTL, TRUE, TRUE); + } } return 0; @@ -1641,8 +1647,12 @@ INT WINAPI SetScrollPos(HWND hWnd, INT nBar, INT nPos, BOOL bRedraw) { + PWND pWnd; INT Result = 0; SCROLLINFO ScrollInfo; + + pWnd = ValidateHwnd(hWnd); + if ( !pWnd || !pWnd->pSBInfo ) return 0; ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_POS; @@ -1652,15 +1662,15 @@ * we will later return. */ if (NtUserSBGetParms(hWnd, nBar, NULL, &ScrollInfo)) - { + { Result = ScrollInfo.nPos; if (Result != nPos) - { + { ScrollInfo.nPos = nPos; /* Finally set the new position */ NtUserSetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); - } - } + } + } return Result; } @@ -1671,13 +1681,23 @@ BOOL WINAPI SetScrollRange(HWND hWnd, INT nBar, INT nMinPos, INT nMaxPos, BOOL bRedraw) { + PWND pWnd; SCROLLINFO ScrollInfo; + + pWnd = ValidateHwnd(hWnd); + if ( !pWnd ) return FALSE; + + if ((nMaxPos - nMinPos) > MAXLONG) + { + SetLastError(ERROR_INVALID_SCROLLBAR_RANGE); + return FALSE; + } ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; ScrollInfo.nMin = nMinPos; ScrollInfo.nMax = nMaxPos; - NtUserSetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); + SetScrollInfo(hWnd, nBar, &ScrollInfo, bRedraw); // do not bypass themes. return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Thu Dec 1 12:42:05 2011 @@ -107,6 +107,6 @@ /*************** SCROLLBAR.C ***************/ DWORD FASTCALL -co_UserShowScrollBar(PWND Window, int wBar, DWORD bShow); +co_UserShowScrollBar(PWND Wnd, int nBar, BOOL fShowH, BOOL fShowV); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Dec 1 12:42:05 2011 @@ -2044,6 +2044,22 @@ switch(dwType) { + case FNID_SCROLLBAR: + { + switch(Msg) + { + case WM_ENABLE: + { + Window = UserGetWindowObject(hWnd); + if (Window->pSBInfo) + { + Window->pSBInfo->WSBflags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; + } + } + break; + } + break; + } case FNID_DEFWINDOWPROC: /* Validate input */ if (hWnd) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Thu Dec 1 12:42:05 2011 @@ -400,8 +400,6 @@ else if ((nBar != SB_CTL) && bChangeParams) { action = SA_SSI_HIDE; - //co_UserShowScrollBar(Window, nBar, FALSE); - //return Info->nPos; } } else /* Show and enable scroll-bar only if no page only changed. */ @@ -411,7 +409,6 @@ if ((nBar != SB_CTL) && bChangeParams) { action |= SA_SSI_SHOW; - //co_UserShowScrollBar(Window, nBar, TRUE); } } @@ -425,12 +422,12 @@ done: if ( action & SA_SSI_HIDE ) { - co_UserShowScrollBar(Window, nBar, FALSE); + co_UserShowScrollBar(Window, nBar, FALSE, FALSE); } else { if ( action & SA_SSI_SHOW ) - if ( co_UserShowScrollBar(Window, nBar, TRUE) ) + if ( co_UserShowScrollBar(Window, nBar, TRUE, TRUE) ) return Info->nPos; /* SetWindowPos() already did the painting */ if (bRedraw) { // FIXME: Arrows and interior. @@ -521,6 +518,8 @@ } RtlZeroMemory(Window->pSBInfo, sizeof(SBINFO)); + Window->pSBInfo->Vert.posMax = 100; + Window->pSBInfo->Horz.posMax = 100; co_WinPosGetNonClientSize(Window, &Window->rcWindow, @@ -596,6 +595,62 @@ return Chg; } +/* Ported from WINE20020904 (SCROLL_ShowScrollBar) */ +DWORD FASTCALL +co_UserShowScrollBar(PWND Wnd, int nBar, BOOL fShowH, BOOL fShowV) +{ + ULONG old_style, set_bits = 0, clear_bits = 0; + + ASSERT_REFS_CO(Wnd); + + switch(nBar) + { + case SB_CTL: + { + if (Wnd->pSBInfo) IntUpdateSBInfo(Wnd, SB_CTL); // Is this needed? Was tested w/o! + + co_WinPosShowWindow(Wnd, fShowH ? SW_SHOW : SW_HIDE); + return TRUE; + } + case SB_BOTH: + case SB_HORZ: + if (fShowH) set_bits |= WS_HSCROLL; + else clear_bits |= WS_HSCROLL; + if( nBar == SB_HORZ ) break; + /* fall through */ + case SB_VERT: + if (fShowV) set_bits |= WS_VSCROLL; + else clear_bits |= WS_VSCROLL; + break; + default: + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + + old_style = Wnd->style; + Wnd->style = (Wnd->style | set_bits) & ~clear_bits; + + if (fShowH || fShowV) + { + if (!Wnd->pSBInfo) co_IntCreateScrollBars(Wnd); + } + + if ((old_style & clear_bits) != 0 || (old_style & set_bits) != set_bits) + { + ///// Is this needed? Was tested w/o! + if (Wnd->style & WS_HSCROLL) IntUpdateSBInfo(Wnd, SB_HORZ); + if (Wnd->style & WS_VSCROLL) IntUpdateSBInfo(Wnd, SB_VERT); + ///// + /* Frame has been changed, let the window redraw itself */ + co_WinPosSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOSENDCHANGING); + return TRUE; + } + return FALSE; +} + +//// BOOL APIENTRY @@ -642,7 +697,6 @@ END_CLEANUP; } - BOOL APIENTRY @@ -709,6 +763,7 @@ UINT wSBflags, UINT wArrows) { + UINT OrigArrows; PWND Window = NULL; PSCROLLBARINFO InfoV = NULL, InfoH = NULL; BOOL Chg = FALSE; @@ -729,6 +784,7 @@ RETURN( FALSE); } + OrigArrows = Window->pSBInfo->WSBflags; Window->pSBInfo->WSBflags = wArrows; if (wSBflags == SB_CTL) @@ -745,13 +801,6 @@ ERR("Trying to set scrollinfo for unknown scrollbar type %d", wSBflags); RETURN(FALSE); } - - if(!co_IntCreateScrollBars(Window)) - { - RETURN( FALSE); - } - - Window->pSBInfo->WSBflags = wArrows; switch(wSBflags) { @@ -774,10 +823,11 @@ if(InfoH) Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg); - ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d\n",wSBflags,wArrows); + ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d Chg %d\n",wSBflags,wArrows, Chg); // Done in user32: // SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); + if (OrigArrows == wArrows) RETURN( FALSE); RETURN( TRUE); CLEANUP: @@ -788,6 +838,81 @@ UserLeave(); END_CLEANUP; } + +DWORD +APIENTRY +NtUserSetScrollInfo( + HWND hWnd, + int fnBar, + LPCSCROLLINFO lpsi, + BOOL bRedraw) +{ + PWND Window = NULL; + NTSTATUS Status; + SCROLLINFO ScrollInfo; + DECLARE_RETURN(DWORD); + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserSetScrollInfo\n"); + UserEnterExclusive(); + + if(!(Window = UserGetWindowObject(hWnd))) + { + RETURN( 0); + } + UserRefObjectCo(Window, &Ref); + + Status = MmCopyFromCaller(&ScrollInfo, lpsi, sizeof(SCROLLINFO) - sizeof(ScrollInfo.nTrackPos)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( 0); + } + + RETURN(co_IntSetScrollInfo(Window, fnBar, &ScrollInfo, bRedraw)); + +CLEANUP: + if (Window) + UserDerefObjectCo(Window); + + TRACE("Leave NtUserSetScrollInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; + +} + +DWORD APIENTRY +NtUserShowScrollBar(HWND hWnd, int nBar, DWORD bShow) +{ + PWND Window; + DECLARE_RETURN(DWORD); + DWORD ret; + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserShowScrollBar\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + RETURN(0); + } + + UserRefObjectCo(Window, &Ref); + ret = co_UserShowScrollBar(Window, nBar, (nBar == SB_VERT) ? 0 : bShow, + (nBar == SB_HORZ) ? 0 : bShow); + UserDerefObjectCo(Window); + + RETURN(ret); + +CLEANUP: + TRACE("Leave NtUserShowScrollBar, ret%i\n",_ret_); + UserLeave(); + END_CLEANUP; + +} + + +//// Ugly NtUser API //// BOOL APIENTRY @@ -852,134 +977,4 @@ END_CLEANUP; } -DWORD -APIENTRY -NtUserSetScrollInfo( - HWND hWnd, - int fnBar, - LPCSCROLLINFO lpsi, - BOOL bRedraw) -{ - PWND Window = NULL; - NTSTATUS Status; - SCROLLINFO ScrollInfo; - DECLARE_RETURN(DWORD); - USER_REFERENCE_ENTRY Ref; - - TRACE("Enter NtUserSetScrollInfo\n"); - UserEnterExclusive(); - - if(!(Window = UserGetWindowObject(hWnd))) - { - RETURN( 0); - } - UserRefObjectCo(Window, &Ref); - - Status = MmCopyFromCaller(&ScrollInfo, lpsi, sizeof(SCROLLINFO) - sizeof(ScrollInfo.nTrackPos)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( 0); - } - - RETURN(co_IntSetScrollInfo(Window, fnBar, &ScrollInfo, bRedraw)); - -CLEANUP: - if (Window) - UserDerefObjectCo(Window); - - TRACE("Leave NtUserSetScrollInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; - -} - -/* Ported from WINE20020904 (SCROLL_ShowScrollBar) */ -DWORD FASTCALL -co_UserShowScrollBar(PWND Wnd, int wBar, DWORD bShow) -{ - DWORD Style, OldStyle; - - ASSERT_REFS_CO(Wnd); - - switch(wBar) - { - case SB_HORZ: - Style = WS_HSCROLL; - break; - case SB_VERT: - Style = WS_VSCROLL; - break; - case SB_BOTH: - Style = WS_HSCROLL | WS_VSCROLL; - break; - case SB_CTL: - Style = 0; - break; - default: - EngSetLastError(ERROR_INVALID_PARAMETER); - return( FALSE); - } - - if (wBar == SB_CTL) - { - if (Wnd->pSBInfo) IntUpdateSBInfo(Wnd, SB_CTL); - - co_WinPosShowWindow(Wnd, bShow ? SW_SHOW : SW_HIDE); - return( TRUE); - } - - OldStyle = Wnd->style; - if(bShow) - Wnd->style |= Style; - else - Wnd->style &= ~Style; - - if(Wnd->style != OldStyle) - { - if(Wnd->style & WS_HSCROLL) - IntUpdateSBInfo(Wnd, SB_HORZ); - if(Wnd->style & WS_VSCROLL) - IntUpdateSBInfo(Wnd, SB_VERT); - - if(Wnd->style & WS_VISIBLE) - { - /* Frame has been changed, let the window redraw itself */ - co_WinPosSetWindowPos(Wnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOSENDCHANGING); - } - } - - return( TRUE); -} - - -DWORD APIENTRY -NtUserShowScrollBar(HWND hWnd, int wBar, DWORD bShow) -{ - PWND Window; - DECLARE_RETURN(DWORD); - DWORD ret; - USER_REFERENCE_ENTRY Ref; - - TRACE("Enter NtUserShowScrollBar\n"); - UserEnterExclusive(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(0); - } - - UserRefObjectCo(Window, &Ref); - ret = co_UserShowScrollBar(Window, wBar, bShow); - UserDerefObjectCo(Window); - - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserShowScrollBar, ret%i\n",_ret_); - UserLeave(); - END_CLEANUP; - -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Dec 1 12:42:05 2011 @@ -2148,11 +2148,11 @@ /* Initialize and show the window's scrollbars */ if (Window->style & WS_VSCROLL) { - co_UserShowScrollBar(Window, SB_VERT, TRUE); + co_UserShowScrollBar(Window, SB_VERT, FALSE, TRUE); } if (Window->style & WS_HSCROLL) { - co_UserShowScrollBar(Window, SB_HORZ, TRUE); + co_UserShowScrollBar(Window, SB_HORZ, TRUE, FALSE); } /* Show the new window */

1 0

[jimtabor] 54555: [Win32k|User32] - Fix scrollbar class support. Sync ports from wine. Added the window scroll structure to the class. Pass all but 15 tests, two are wine todos lines 304 and 343.
by jimtabor＠svn.reactos.org 01 Dec '11

01 Dec '11

Author: jimtabor Date: Thu Dec 1 03:20:02 2011 New Revision: 54555 URL: http://svn.reactos.org/svn/reactos?rev=54555&view=rev Log: [Win32k|User32] - Fix scrollbar class support. Sync ports from wine. Added the window scroll structure to the class. Pass all but 15 tests, two are wine todos lines 304 and 343. Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Thu Dec 1 03:20:02 2011 @@ -1,5 +1,4 @@ -/* $Id $ - * +/* * ReactOS User32 Library * - ScrollBar control * @@ -80,7 +79,7 @@ CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW | CS_PARENTDC, /* style */ ScrollBarWndProcA, /* procA */ ScrollBarWndProcW, /* procW */ - 0, /* extra */ + sizeof(SBWND)-sizeof(WND), /* extra */ IDC_ARROW, /* cursor */ 0 /* brush */ }; @@ -310,6 +309,7 @@ void IntDrawScrollBar(HWND Wnd, HDC DC, INT Bar) { + //PSBTRACK pSBTrack; //INT ThumbSize; SCROLLBARINFO Info; BOOL Vertical; @@ -344,7 +344,7 @@ return; } - //ThumbSize = Info.xyThumbBottom - Info.xyThumbTop; + //ThumbSize = pSBTrack->pSBCalc->pxThumbBottom - pSBTrack->pSBCalc->pxThumbTop; /* * Draw the arrows. @@ -1175,11 +1175,8 @@ ScrollInfo.cbSize = sizeof(SCROLLINFO); ScrollInfo.fMask = SIF_RANGE; Result = NtUserSBGetParms(Wnd, Bar, NULL, &ScrollInfo); - if (Result) - { - *MinPos = ScrollInfo.nMin; - *MaxPos = ScrollInfo.nMax; - } + *MinPos = Result ? ScrollInfo.nMin : 0; + *MaxPos = Result ? ScrollInfo.nMax : 0; return Result; } @@ -1200,13 +1197,11 @@ if (SBType != SB_CTL) { - PWND pwnd = ValidateHwnd(Wnd); - if (!pwnd) return; - XOffset = pwnd->rcClient.left - pwnd->rcWindow.left; - YOffset = pwnd->rcClient.top - pwnd->rcWindow.top; + RECT rect; + GetClientRect(Wnd, &rect); ScreenToClient(Wnd, &Pt); - Pt.x += XOffset; - Pt.y += YOffset; + Pt.x -= rect.left; + Pt.y -= rect.top; } IntScrollHandleScrollEvent(Wnd, SBType, WM_LBUTTONDOWN, Pt); @@ -1241,7 +1236,7 @@ * ScrollBarWndProc */ LRESULT WINAPI -ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +ScrollBarWndProc_common(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { #ifdef __REACTOS__ // Do this now, remove after Server side is fixed. PWND pWnd; @@ -1279,26 +1274,14 @@ IntScrollCreateScrollBar(Wnd, (LPCREATESTRUCTW) lParam); break; -//#if 0 /* FIXME */ case WM_ENABLE: { -// SCROLLBAR_INFO *infoPtr; -// if ((infoPtr = SCROLL_GetScrollBarInfo( hwnd, SB_CTL ))) -// { -// infoPtr->flags = wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH; -// SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE); -// } - HDC hdc; - DbgPrint("ScrollBarWndProc WM_ENABLE\n"); + TRACE("ScrollBarWndProc WM_ENABLE\n"); NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ - hdc = GetDCEx( Wnd, 0, DCX_CACHE ); - if (!hdc) return 1; - IntDrawScrollBar( Wnd, hdc, SB_CTL); - ReleaseDC( Wnd, hdc ); + SCROLL_RefreshScrollBar(Wnd, SB_CTL, TRUE, TRUE); } return 0; -//#endif case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: @@ -1430,9 +1413,9 @@ case SBM_GETRANGE: return IntScrollGetScrollRange(Wnd, SB_CTL, (LPINT) wParam, (LPINT) lParam); - + case SBM_ENABLE_ARROWS: - return EnableScrollBar(Wnd, SB_CTL, wParam); + return EnableScrollBar( Wnd, SB_CTL, wParam ); case SBM_SETSCROLLINFO: return NtUserSetScrollInfo(Wnd, SB_CTL, (SCROLLINFO *) lParam, wParam); @@ -1460,7 +1443,10 @@ { WARN("unknown msg %04x wp=%04lx lp=%08lx\n", Msg, wParam, lParam); } - return DefWindowProc(Wnd, Msg, wParam, lParam ); + if (unicode) + return DefWindowProcW( Wnd, Msg, wParam, lParam ); + else + return DefWindowProcA( Wnd, Msg, wParam, lParam ); } return 0; @@ -1469,13 +1455,13 @@ LRESULT WINAPI ScrollBarWndProcW(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - return ScrollBarWndProc(DefWindowProcW, Wnd, Msg, wParam, lParam); + return ScrollBarWndProc_common(DefWindowProcW, Wnd, Msg, wParam, lParam, TRUE); } LRESULT WINAPI ScrollBarWndProcA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - return ScrollBarWndProc(DefWindowProcA, Wnd, Msg, wParam, lParam); + return ScrollBarWndProc_common(DefWindowProcA, Wnd, Msg, wParam, lParam, FALSE); } @@ -1493,8 +1479,14 @@ Hook = BeginIfHookedUserApiHook(); /* Bypass SEH and go direct. */ - if (!Hook) return NtUserEnableScrollBar(hwnd, nBar, flags); - + if (!Hook) + { + Ret = NtUserEnableScrollBar(hwnd, nBar, flags); + if (GetLastError() == ERROR_INVALID_PARAMETER) return Ret; + if (nBar == SB_CTL) return Ret; + SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); + return Ret; + } _SEH2_TRY { Ret = guah.EnableScrollBar(hwnd, nBar, flags); Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Thu Dec 1 03:20:02 2011 @@ -396,6 +396,26 @@ SBDATA Horz; SBDATA Vert; } SBINFO, *PSBINFO; + +typedef struct tagSBCALC +{ + INT posMin; + INT posMax; + INT page; + INT pos; + INT pxTop; + INT pxBottom; + INT pxLeft; + INT pxRight; + INT cpxThumb; + INT pxUpArrow; + INT pxDownArrow; + INT pxStart; + INT pxThumbBottom; + INT pxThumbTop; + INT cpx; + INT pxMin; +} SBCALC, *PSBCALC; typedef enum _GETCPD { @@ -615,6 +635,14 @@ /* Entry in the list of thread windows. */ LIST_ENTRY ThreadListEntry; } WND, *PWND; + +typedef struct _SBWND +{ + WND wnd; + BOOL fVert; + UINT wDisableFlags; + SBCALC SBCalc; +} SBWND, *PSBWND; typedef struct _PFNCLIENT { Modified: trunk/reactos/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] Thu Dec 1 03:20:02 2011 @@ -1,24 +1,4 @@ #pragma once - -typedef struct tagSBCALC -{ - INT posMin; - INT posMax; - INT page; - INT pos; - INT pxTop; - INT pxBottom; - INT pxLeft; - INT pxRight; - INT cpxThumb; - INT pxUpArrow; - INT pxDownArrow; - INT pxStart; - INT pxThumbBottom; - INT pxThumbTop; - INT cpx; - INT pxMin; -} SBCALC, *PSBCALC; typedef VOID (NEAR NTAPI *PFN_SCROLLBAR)(PWND, UINT, WPARAM, LPARAM, PSBCALC); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Dec 1 03:20:02 2011 @@ -41,7 +41,7 @@ { L"ScrollBar", CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC, NULL, // Use User32 procs - 0, + sizeof(SBWND)-sizeof(WND), IDC_ARROW, NULL, FNID_SCROLLBAR, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Thu Dec 1 03:20:02 2011 @@ -12,6 +12,12 @@ #define MINTRACKTHUMB 8 /* Minimum size of the rectangle between the arrows */ + /* What to do after SetScrollInfo() */ + #define SA_SSI_HIDE 0x0001 + #define SA_SSI_SHOW 0x0002 + #define SA_SSI_REFRESH 0x0004 + #define SA_SSI_REPAINT_ARROWS 0x0008 + #define SBRG_SCROLLBAR 0 /* the scrollbar itself */ #define SBRG_TOPRIGHTBTN 1 /* the top or right button */ #define SBRG_PAGEUPRIGHT 2 /* the page up or page right region */ @@ -160,6 +166,7 @@ LPSCROLLINFO psi; ASSERT(Window); + ASSERT(Window->pSBInfo); ASSERT(Window->pSBInfoex); sbi = IntGetScrollbarInfoFromWindow(Window, wBar); @@ -183,10 +190,7 @@ return FALSE; } - if(!co_IntCreateScrollBars(Window)) - { - return FALSE; - } + if (!Window->pSBInfo) return FALSE; psi = IntGetScrollInfoFromWindow(Window, nBar); @@ -239,6 +243,8 @@ ERR("Trying to get scrollinfo for unknown scrollbar type %d\n", nBar); return FALSE; } + + if (!pWnd->pSBInfo || !pSBTrack) return FALSE; Mask = lpsi->fMask; @@ -280,7 +286,8 @@ LPSCROLLINFO Info; PSCROLLBARINFO psbi; - /* UINT new_flags;*/ + UINT new_flags; + INT action = 0; BOOL bChangeParams = FALSE; /* don't show/hide scrollbar if params don't change */ ASSERT_REFS_CO(Window); @@ -313,7 +320,7 @@ Info = IntGetScrollInfoFromWindow(Window, nBar); /* Set the page size */ - if (0 != (lpsi->fMask & SIF_PAGE)) + if (lpsi->fMask & SIF_PAGE) { if (Info->nPage != lpsi->nPage) { @@ -323,20 +330,21 @@ } /* Set the scroll pos */ - if (0 != (lpsi->fMask & SIF_POS)) + if (lpsi->fMask & SIF_POS) { if (Info->nPos != lpsi->nPos) { Info->nPos = lpsi->nPos; + bChangeParams = TRUE; } } /* Set the scroll range */ - if (0 != (lpsi->fMask & SIF_RANGE)) + if (lpsi->fMask & SIF_RANGE) { /* Invalid range -> range is set to (0,0) */ - if (lpsi->nMin > lpsi->nMax || - 0x80000000 <= (UINT)(lpsi->nMax - lpsi->nMin)) + if ((lpsi->nMin > lpsi->nMax) || + ((UINT)(lpsi->nMax - lpsi->nMin) >= 0x80000000)) { Info->nMin = 0; Info->nMax = 0; @@ -351,7 +359,9 @@ } /* Make sure the page size is valid */ - if (Info->nMax - Info->nMin + 1 < Info->nPage) + if (Info->nPage < 0) + Info->nPage = 0; + else if (Info->nMax - Info->nMin + 1 < Info->nPage) { Info->nPage = Info->nMax - Info->nMin + 1; } @@ -370,56 +380,77 @@ * Don't change the scrollbar state if SetScrollInfo is just called * with SIF_DISABLENOSCROLL */ - if (0 == (lpsi->fMask & SIF_ALL)) - { - return Info->nPos; + if (!(lpsi->fMask & SIF_ALL)) + { + goto done; //return Info->nPos; } /* Check if the scrollbar should be hidden or disabled */ - if (0 != (lpsi->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL))) - { + if (lpsi->fMask & (SIF_RANGE | SIF_PAGE | SIF_DISABLENOSCROLL)) + { + new_flags = Window->pSBInfo->WSBflags; if (Info->nMin >= (int)(Info->nMax - max(Info->nPage - 1, 0))) { /* Hide or disable scroll-bar */ - if (0 != (lpsi->fMask & SIF_DISABLENOSCROLL)) - { - /* new_flags = ESB_DISABLE_BOTH;*/ + if (lpsi->fMask & SIF_DISABLENOSCROLL) + { + new_flags = ESB_DISABLE_BOTH; + bChangeParams = TRUE; } else if ((nBar != SB_CTL) && bChangeParams) { - co_UserShowScrollBar(Window, nBar, FALSE); - return Info->nPos; - } - } - else /* Show and enable scroll-bar */ - { - /* new_flags = 0;*/ + action = SA_SSI_HIDE; + //co_UserShowScrollBar(Window, nBar, FALSE); + //return Info->nPos; + } + } + else /* Show and enable scroll-bar only if no page only changed. */ + if (lpsi->fMask != SIF_PAGE) + { + new_flags = ESB_ENABLE_BOTH; if ((nBar != SB_CTL) && bChangeParams) { - co_UserShowScrollBar(Window, nBar, TRUE); - } - } - -#if 0 - if (infoPtr->flags != new_flags) /* check arrow flags */ - { - infoPtr->flags = new_flags; - *Action |= SA_SSI_REPAINT_ARROWS; - } -#endif - - } - - if (bRedraw) - { - RECTL UpdateRect = psbi->rcScrollBar; - UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; - UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; - UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; - co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); - } - + action |= SA_SSI_SHOW; + //co_UserShowScrollBar(Window, nBar, TRUE); + } + } + + if (Window->pSBInfo->WSBflags != new_flags) /* check arrow flags */ + { + Window->pSBInfo->WSBflags = new_flags; + action |= SA_SSI_REPAINT_ARROWS; + } + } + +done: + if ( action & SA_SSI_HIDE ) + { + co_UserShowScrollBar(Window, nBar, FALSE); + } + else + { + if ( action & SA_SSI_SHOW ) + if ( co_UserShowScrollBar(Window, nBar, TRUE) ) + return Info->nPos; /* SetWindowPos() already did the painting */ + if (bRedraw) + { // FIXME: Arrows and interior. + RECTL UpdateRect = psbi->rcScrollBar; + UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; + UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; + co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); + } // FIXME: Arrows + else if( action & SA_SSI_REPAINT_ARROWS ) + { + RECTL UpdateRect = psbi->rcScrollBar; + UpdateRect.left -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.right -= Window->rcClient.left - Window->rcWindow.left; + UpdateRect.top -= Window->rcClient.top - Window->rcWindow.top; + UpdateRect.bottom -= Window->rcClient.top - Window->rcWindow.top; + co_UserRedrawWindow(Window, &UpdateRect, 0, RDW_INVALIDATE | RDW_FRAME); + } + } /* Return current position */ return Info->nPos; } @@ -430,7 +461,6 @@ INT Bar; PSCROLLBARINFO sbi; LPSCROLLINFO psi; - ASSERT_REFS_CO(Window); Bar = SBOBJ_TO_SBID(idObject); @@ -468,7 +498,7 @@ ASSERT_REFS_CO(Window); - if(Window->pSBInfoex) + if (Window->pSBInfo && Window->pSBInfoex) { /* no need to create it anymore */ return TRUE; @@ -483,6 +513,14 @@ } RtlZeroMemory(Window->pSBInfoex, Size); + + if(!(Window->pSBInfo = DesktopHeapAlloc( Window->head.rpdesk, sizeof(SBINFO)))) + { + ERR("Unable to allocate memory for scrollbar information for window 0x%x\n", Window->head.h); + return FALSE; + } + + RtlZeroMemory(Window->pSBInfo, sizeof(SBINFO)); co_WinPosGetNonClientSize(Window, &Window->rcWindow, @@ -509,8 +547,10 @@ BOOL FASTCALL IntDestroyScrollBars(PWND Window) { - if(Window->pSBInfoex) - { + if (Window->pSBInfo && Window->pSBInfoex) + { + DesktopHeapFree(Window->head.rpdesk, Window->pSBInfo); + Window->pSBInfo = NULL; ExFreePool(Window->pSBInfoex); Window->pSBInfoex = NULL; return TRUE; @@ -662,7 +702,6 @@ END_CLEANUP; } - BOOL APIENTRY NtUserEnableScrollBar( @@ -679,19 +718,23 @@ TRACE("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd))) + if (!(Window = UserGetWindowObject(hWnd))) { RETURN(FALSE); } UserRefObjectCo(Window, &Ref); - if(wSBflags == SB_CTL) - { - /* FIXME Enable or Disable SB Ctrl*/ - ERR("Enable Scrollbar SB_CTL\n"); - InfoV = IntGetScrollbarInfoFromWindow(Window, SB_CTL); - Chg = IntEnableScrollBar(FALSE, InfoV ,wArrows); - /* Chg? Scrollbar is Refresh in user32/controls/scrollbar.c. */ + if (!co_IntCreateScrollBars(Window)) + { + RETURN( FALSE); + } + + Window->pSBInfo->WSBflags = wArrows; + + if (wSBflags == SB_CTL) + { + if ((wArrows == ESB_DISABLE_BOTH || wArrows == ESB_ENABLE_BOTH)) + IntEnableWindow(hWnd, (wArrows == ESB_ENABLE_BOTH)); RETURN(TRUE); } @@ -707,6 +750,8 @@ { RETURN( FALSE); } + + Window->pSBInfo->WSBflags = wArrows; switch(wSBflags) { @@ -728,10 +773,11 @@ if(InfoH) Chg = (IntEnableScrollBar(TRUE, InfoH, wArrows) || Chg); - - //if(Chg && (Window->style & WS_VISIBLE)) - /* FIXME - repaint scrollbars */ - + + ERR("FIXME: EnableScrollBar wSBflags %d wArrows %d\n",wSBflags,wArrows); +// Done in user32: +// SCROLL_RefreshScrollBar( hwnd, nBar, TRUE, TRUE ); + RETURN( TRUE); CLEANUP: @@ -875,14 +921,9 @@ return( FALSE); } - if(!co_IntCreateScrollBars(Wnd)) - { - return( FALSE); - } - if (wBar == SB_CTL) { - IntUpdateSBInfo(Wnd, SB_CTL); + if (Wnd->pSBInfo) IntUpdateSBInfo(Wnd, SB_CTL); co_WinPosShowWindow(Wnd, bShow ? SW_SHOW : SW_HIDE); return( TRUE);

1 0

[pschweitzer] 54554: [MSVCRT_APITEST] Add MSDN example
by pschweitzer＠svn.reactos.org 30 Nov '11

30 Nov '11

Author: pschweitzer Date: Wed Nov 30 23:47:41 2011 New Revision: 54554 URL: http://svn.reactos.org/svn/reactos?rev=54554&view=rev Log: [MSVCRT_APITEST] Add MSDN example Modified: trunk/rostests/apitests/msvcrt/ieee.c Modified: trunk/rostests/apitests/msvcrt/ieee.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/ieee.c?re… ============================================================================== --- trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] (original) +++ trunk/rostests/apitests/msvcrt/ieee.c [iso-8859-1] Wed Nov 30 23:47:41 2011 @@ -3,6 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * PURPOSE: Tests for IEEE floatting-point functions * PROGRAMMER: Pierre Schweitzer (pierre(a)reactos.org) + * REFERENCES: http://msdn.microsoft.com/en-US/library/h7zkk1bz%28v=VS.80%29.aspx */ #include <wine/test.h> @@ -61,6 +62,9 @@ ok(_finite(tested.d) == FALSE, "_finite = TRUE\n"); tested.l = 0x7FFFFFFFFFFFFFFFLL; ok(_finite(tested.d) == FALSE, "_finite = TRUE\n"); + + /* MSDN example */ + ok(_finite(2.387000) == TRUE, "_finite = FALSE\n"); } void test_fpclass(void) @@ -150,6 +154,10 @@ tested.l = 0x7FFFFFFFFFFFFFFFLL; class = _fpclass(tested.d); ok(class == _FPCLASS_QNAN, "class = %d\n", class); + + /* MSDN example */ + class = _fpclass(2.387000); + ok(class == _FPCLASS_PN, "class = %d\n", class); } void test_isnan(void) @@ -198,6 +206,9 @@ ok(_isnan(tested.d) == TRUE, "_isnan = FALSE\n"); tested.l = 0x7FFFFFFFFFFFFFFFLL; ok(_isnan(tested.d) == TRUE, "_isnan = FALSE\n"); + + /* MSDN example */ + ok(_isnan(2.387000) == FALSE, "_isnan = TRUE\n"); } void test_j0(void) @@ -334,6 +345,14 @@ result.d = _j0(tested.d); ok(result.l == expected.l, "_j0 returned: %I64x\n", result.l); ok(errno == EDOM, "errno: %d\n", errno); + + /* MSDN example */ + errno = 0xDEADBEEF; + tested.d = 2.387000; + expected.l = 0x3F83059F9F6F30CALL; + result.d = _j0(tested.d); + ok(result.l == expected.l, "_j0 returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); } void test_j1(void) @@ -470,6 +489,14 @@ result.d = _j1(tested.d); ok(result.l == expected.l, "_j1 returned: %I64x\n", result.l); ok(errno == EDOM, "errno: %d\n", errno); + + /* MSDN example */ + errno = 0xDEADBEEF; + tested.d = 2.387000; + expected.l = 0x3FE0BBEFC62ABAB1LL; + result.d = _j1(tested.d); + ok(result.l == expected.l, "_j1 returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); } void test_scalb(void) @@ -606,6 +633,14 @@ result.d = _scalb(tested.d, 3); ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); ok(errno == EDOM, "errno: %d\n", errno); + + /* MSDN example */ + errno = 0xDEADBEEF; + tested.d = 2.387000; + expected.l = 0x4033189374BC6A7FLL; + result.d = _scalb(tested.d, 3); + ok(result.l == expected.l, "_scalb returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); } void test_y0(void) @@ -742,6 +777,14 @@ result.d = _y0(tested.d); ok(result.l == expected.l, "_y0 returned: %I64x\n", result.l); ok(errno == EDOM, "errno: %d\n", errno); + + /* MSDN example */ + errno = 0xDEADBEEF; + tested.d = 2.387000; + expected.l = 0x3FE05FB1B1E49E66LL; + result.d = _y0(tested.d); + ok(result.l == expected.l, "_y0 returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); } void test_y1(void) @@ -878,6 +921,14 @@ result.d = _y1(tested.d); ok(result.l == expected.l, "_y1 returned: %I64x\n", result.l); ok(errno == EDOM, "errno: %d\n", errno); + + /* MSDN example */ + errno = 0xDEADBEEF; + tested.d = 2.387000; + expected.l = 0x3FB828EC13723EE6LL; + result.d = _y1(tested.d); + ok(result.l == expected.l, "_y1 returned: %I64x\n", result.l); + ok(errno == 0xDEADBEEF, "errno: %d\n", errno); } START_TEST(ieee)

1 0

[cgutman] 54553: [NDIS] - Fix parsing of hex strings
by cgutman＠svn.reactos.org 30 Nov '11

30 Nov '11

Author: cgutman Date: Wed Nov 30 22:27:14 2011 New Revision: 54553 URL: http://svn.reactos.org/svn/reactos?rev=54553&view=rev Log: [NDIS] - Fix parsing of hex strings Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Nov 30 22:27:14 2011 @@ -366,7 +366,7 @@ } BOOLEAN -IsValidNumericString(PNDIS_STRING String, NDIS_PARAMETER_TYPE *ParameterType) +IsValidNumericString(PNDIS_STRING String, ULONG Base) /* * FUNCTION: Determines if a string is a valid number * ARGUMENTS: @@ -375,7 +375,7 @@ * TRUE if it is valid, FALSE if not */ { - ULONG i, Base; + ULONG i; /* I don't think this will ever happen, but we warn it if it does */ if (String->Length == 0) @@ -384,25 +384,8 @@ return FALSE; } - /* Set the default parameter type */ - *ParameterType = NdisParameterInteger; - Base = 10; - for (i = 0; i < String->Length / sizeof(WCHAR); i++) { - /* Look at the second character for the base */ - if (i == 1) - { - if (String->Buffer[i] == L'X' || - String->Buffer[i] == L'x') - { - NDIS_DbgPrint(MID_TRACE, ("Identified hex string\n")); - *ParameterType = NdisParameterHexInteger; - Base = 0x10; - continue; - } - } - /* Skip any NULL characters we find */ if (String->Buffer[i] == UNICODE_NULL) continue; @@ -669,17 +652,25 @@ else if (KeyInformation->Type == REG_SZ) { UNICODE_STRING str; + ULONG Base; + + if (ParameterType == NdisParameterInteger) + Base = 10; + else if (ParameterType == NdisParameterHexInteger) + Base = 16; + else + Base = 0; str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; str.Buffer = (PWCHAR)KeyInformation->Data; - if (IsValidNumericString(&str, &(*ParameterValue)->ParameterType) && - ((*Status = RtlUnicodeStringToInteger(&str, 0, + if (Base != 0 && IsValidNumericString(&str, Base) && + ((*Status = RtlUnicodeStringToInteger(&str, Base, &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS)) { NDIS_DbgPrint(MAX_TRACE, ("NdisParameter(Hex)Integer\n")); - /* IsValidNumericString sets the parameter type when parsing the string */ + (*ParameterValue)->ParameterType = ParameterType; } else {

1 0

[pschweitzer] 54552: [CRT] Fix error handling for j0, j1, y0, y1 Bessel functions. Remove useless defines
by pschweitzer＠svn.reactos.org 30 Nov '11

30 Nov '11

Author: pschweitzer Date: Wed Nov 30 22:04:54 2011 New Revision: 54552 URL: http://svn.reactos.org/svn/reactos?rev=54552&view=rev Log: [CRT] Fix error handling for j0, j1, y0, y1 Bessel functions. Remove useless defines Modified: trunk/reactos/lib/sdk/crt/math/j0_y0.c trunk/reactos/lib/sdk/crt/math/j1_y1.c Modified: trunk/reactos/lib/sdk/crt/math/j0_y0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/j0_y0.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/j0_y0.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/j0_y0.c [iso-8859-1] Wed Nov 30 22:04:54 2011 @@ -2,8 +2,6 @@ #include <float.h> #include "ieee754/ieee754.h" -typedef int fpclass_t; -fpclass_t _fpclass(double __d); int *_errno(void); /* @@ -11,7 +9,7 @@ */ double _j0(double num) { - /* FIXME: errno handling */ + if (!_finite(num)) *_errno() = EDOM; return __ieee754_j0(num); } @@ -21,7 +19,12 @@ double _y0(double num) { double retval; - if (!_finite(num)) *_errno() = EDOM; + int fpclass = _fpclass(num); + + if (!_finite(num) || fpclass == _FPCLASS_NN || + fpclass == _FPCLASS_ND || fpclass == _FPCLASS_NZ) + *_errno() = EDOM; + retval = __ieee754_y0(num); if (_fpclass(retval) == _FPCLASS_NINF) { Modified: trunk/reactos/lib/sdk/crt/math/j1_y1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/j1_y1.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/j1_y1.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/j1_y1.c [iso-8859-1] Wed Nov 30 22:04:54 2011 @@ -2,8 +2,6 @@ #include <float.h> #include "ieee754/ieee754.h" -typedef int fpclass_t; -fpclass_t _fpclass(double __d); int *_errno(void); /* @@ -11,7 +9,7 @@ */ double _j1(double num) { - /* FIXME: errno handling */ + if (!_finite(num)) *_errno() = EDOM; return __ieee754_j1(num); } @@ -21,7 +19,12 @@ double _y1(double num) { double retval; - if (!_finite(num)) *_errno() = EDOM; + int fpclass = _fpclass(num); + + if (!_finite(num) || fpclass == _FPCLASS_NN || + fpclass == _FPCLASS_ND || fpclass == _FPCLASS_NZ) + *_errno() = EDOM; + retval = __ieee754_y1(num); if (_fpclass(retval) == _FPCLASS_NINF) {

1 0

[cgutman] 54551: [NTOSKRNL] - Only flush pages if we can't satisfy Mm's target without using dirty pages
by cgutman＠svn.reactos.org 30 Nov '11

30 Nov '11

Author: cgutman Date: Wed Nov 30 21:58:46 2011 New Revision: 54551 URL: http://svn.reactos.org/svn/reactos?rev=54551&view=rev Log: [NTOSKRNL] - Only flush pages if we can't satisfy Mm's target without using dirty pages Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=545… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Nov 30 21:58:46 2011 @@ -304,18 +304,15 @@ LIST_ENTRY FreeList; PFN_NUMBER Page; ULONG i; + BOOLEAN FlushedPages = FALSE; DPRINT("CcRosTrimCache(Target %d)\n", Target); InitializeListHead(&FreeList); - /* Flush dirty pages to disk */ - CcRosFlushDirtyPages(Target, NrFreed); - - if ((*NrFreed) != 0) DPRINT1("Flushed %d dirty cache pages to disk\n", (*NrFreed)); - *NrFreed = 0; +retry: KeAcquireGuardedMutex(&ViewLock); current_entry = CacheSegmentLRUListHead.Flink; @@ -375,6 +372,25 @@ } KeReleaseGuardedMutex(&ViewLock); + + /* Try flushing pages if we haven't met our target */ + if (Target > 0 && !FlushedPages) + { + /* Flush dirty pages to disk */ + CcRosFlushDirtyPages(Target, &PagesFreed); + FlushedPages = TRUE; + + /* We can only swap as many pages as we flushed */ + if (PagesFreed < Target) Target = PagesFreed; + + /* Check if we flushed anything */ + if (PagesFreed != 0) + { + /* Try again after flushing dirty pages */ + DPRINT1("Flushed %d dirty cache pages to disk\n", PagesFreed); + goto retry; + } + } while (!IsListEmpty(&FreeList)) {

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