Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[jroeloffzen] 48571: [user32] - Don't update visible regions of hidden windows. Fixes bug 5303

by jroeloffzen＠svn.reactos.org

Author: jroeloffzen Date: Thu Aug 19 23:36:22 2010 New Revision: 48571 URL: http://svn.reactos.org/svn/reactos?rev=48571&view=rev Log: [user32] - Don't update visible regions of hidden windows. Fixes bug 5303 Modified: branches/arwinss/reactos/dll/win32/user32/painting.c Modified: branches/arwinss/reactos/dll/win32/user32/painting.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/painting.c [iso-8859-1] Thu Aug 19 23:36:22 2010 @@ -911,10 +911,13 @@ const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; + BOOL bWndVisible; HWND parent; + HWND desktop = GetDesktopWindow(); LONG window_style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (!hwnd) hwnd = GetDesktopWindow(); + LONG parent_style; + + if (!hwnd) hwnd = desktop; else hwnd = WIN_GetFullHandle( hwnd ); TRACE("hwnd %p, hrgnClip %p, flags %08x\n", hwnd, hrgnClip, flags); @@ -942,17 +945,18 @@ if (flags & DCX_WINDOW) flags &= ~DCX_CLIPCHILDREN; - parent = GetAncestor( hwnd, GA_PARENT ); - if (!parent || (parent == GetDesktopWindow())) + if ( !(parent = GetAncestor( hwnd, GA_PARENT)) ) parent = desktop; + if (parent == desktop) flags = (flags & ~DCX_PARENTCLIP) | DCX_CLIPSIBLINGS; + parent_style = GetWindowLongW( parent, GWL_STYLE ); + bWndVisible = (window_style & WS_VISIBLE) && (parent_style & WS_VISIBLE); /* it seems parent clip is ignored when clipping siblings or children */ if (flags & (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN)) flags &= ~DCX_PARENTCLIP; if( flags & DCX_PARENTCLIP ) { - LONG parent_style = GetWindowLongW( parent, GWL_STYLE ); - if( (window_style & WS_VISIBLE) && (parent_style & WS_VISIBLE) ) + if (bWndVisible) { flags &= ~DCX_CLIPCHILDREN; if (parent_style & WS_CLIPSIBLINGS) flags |= DCX_CLIPSIBLINGS; @@ -1036,7 +1040,7 @@ if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ - if (bUpdateVisRgn) update_visible_region( dce ); + if (bWndVisible && bUpdateVisRgn) update_visible_region( dce ); TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); return dce->hdc;

14 years, 4 months

[cgutman] 48570: [NTOSKRNL] - Add a special case to IopInitializeDevice for raw devices - Call IopInitializeDevice to set up our device node and ready it to start - Fixes assertions hit by ACPI and PCIX

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 19 23:26:44 2010 New Revision: 48570 URL: http://svn.reactos.org/svn/reactos?rev=48570&view=rev Log: [NTOSKRNL] - Add a special case to IopInitializeDevice for raw devices - Call IopInitializeDevice to set up our device node and ready it to start - Fixes assertions hit by ACPI and PCIX Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu Aug 19 23:26:44 2010 @@ -64,6 +64,13 @@ { PDEVICE_OBJECT Fdo; NTSTATUS Status; + + if (!DriverObject) + { + /* Special case for bus driven devices */ + DeviceNode->Flags |= DNF_ADDED; + return STATUS_SUCCESS; + } if (!DriverObject->DriverExtension->AddDevice) { @@ -1897,11 +1904,15 @@ { /* We don't need to worry about loading the driver because we're * being driven in raw mode so our parent must be loaded to get here */ - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); + Status = IopInitializeDevice(DeviceNode, NULL); + if (NT_SUCCESS(Status)) + { + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", + &DeviceNode->InstancePath, Status); + } } } else

14 years, 4 months

[cgutman] 48569: [OSKITTCP] - Disable routing because oskit needs to let our code do that - Comment out the ACK hack and restore the default BSD behavior

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 19 22:15:58 2010 New Revision: 48569 URL: http://svn.reactos.org/svn/reactos?rev=48569&view=rev Log: [OSKITTCP] - Disable routing because oskit needs to let our code do that - Comment out the ACK hack and restore the default BSD behavior Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Thu Aug 19 22:15:58 2010 @@ -129,6 +129,7 @@ if( !error ) { so->so_connection = context; so->so_state |= SS_NBIO; + so->so_options |= SO_DONTROUTE; *aso = so; } OSKUnlock(); Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Thu Aug 19 22:15:58 2010 @@ -84,6 +84,7 @@ * Set DELACK for segments received in order, but ack immediately * when segments are out of order (so fast retransmit can work). */ +#ifdef TCP_ACK_HACK #define TCP_REASS(tp, ti, m, so, flags) { \ if ((ti)->ti_seq == (tp)->rcv_nxt && \ (tp)->seg_next == (struct tcpiphdr *)(tp) && \ @@ -103,6 +104,24 @@ tp->t_flags |= TF_ACKNOW; \ } \ } +#else +#define TCP_REASS(tp, ti, m, so, flags) { \ + if ((ti)->ti_seq == (tp)->rcv_nxt && \ + (tp)->seg_next == (struct tcpiphdr *)(tp) && \ + (tp)->t_state == TCPS_ESTABLISHED) { \ + tp->t_flags |= TF_DELACK; \ + (tp)->rcv_nxt += (ti)->ti_len; \ + flags = (ti)->ti_flags & TH_FIN; \ + tcpstat.tcps_rcvpack++;\ + tcpstat.tcps_rcvbyte += (ti)->ti_len;\ + sbappend(&(so)->so_rcv, (m)); \ + sorwakeup(so); \ + } else { \ + (flags) = tcp_reass((tp), (ti), (m)); \ + tp->t_flags |= TF_ACKNOW; \ + } \ +} +#endif #ifndef TUBA_INCLUDE int @@ -573,6 +592,7 @@ */ sbappend(&so->so_rcv, m); sorwakeup(so); +#ifdef TCP_ACK_HACK /* * If this is a short packet, then ACK now - with Nagel * congestion avoidance sender won't send more until @@ -584,6 +604,9 @@ } else { tp->t_flags |= TF_DELACK; } +#else + tp->t_flags |= TF_DELACK; +#endif return; } } Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c [iso-8859-1] Thu Aug 19 22:15:58 2010 @@ -560,6 +560,7 @@ tcp_rtlookup(inp) struct inpcb *inp; { +#ifndef __REACTOS__ struct route *ro; struct rtentry *rt; @@ -576,7 +577,10 @@ rt = ro->ro_rt; } } - return rt; + return rt; +#else + return NULL; +#endif } /*

14 years, 4 months

[mjmartin] 48568: [Win32k] - For SetTimer nIDEvent can be 0 in which case return 1. Zero still needs to be used for nIDEvent when killing the timer. Fixes bug 5553. - Modify windowless timers to use IDEvent values decrementing from the max number of windowless timers vice incrementing from 1. Done to match windows behavior.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Aug 19 10:52:36 2010 New Revision: 48568 URL: http://svn.reactos.org/svn/reactos?rev=48568&view=rev Log: [Win32k] - For SetTimer nIDEvent can be 0 in which case return 1. Zero still needs to be used for nIDEvent when killing the timer. Fixes bug 5553. - Modify windowless timers to use IDEvent values decrementing from the max number of windowless timers vice incrementing from 1. Done to match windows behavior. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Thu Aug 19 10:52:36 2010 @@ -30,7 +30,7 @@ static FAST_MUTEX Mutex; static RTL_BITMAP WindowLessTimersBitMap; static PVOID WindowLessTimersBitMapBuffer; -static ULONG HintIndex = 0; +static ULONG HintIndex = 1; ERESOURCE TimerLock; @@ -97,9 +97,11 @@ RemoveEntryList(&pTmr->ptmrList); if ((pTmr->pWnd == NULL) && (!(pTmr->flags & TMRF_SYSTEM))) { - DPRINT("Clearing Bit %d)\n", pTmr->nID); + UINT_PTR IDEvent; + + IDEvent = NUM_WINDOW_LESS_TIMERS - pTmr->nID; IntLockWindowlessTimerBitmap(); - RtlClearBit(&WindowLessTimersBitMap, pTmr->nID); + RtlClearBit(&WindowLessTimersBitMap, IDEvent); IntUnlockWindowlessTimerBitmap(); } UserDereferenceObject(pTmr); @@ -155,7 +157,7 @@ break; pLE = pTmr->ptmrList.Flink; - pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); + pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); TimerLeave(); @@ -200,7 +202,7 @@ INT Type) { PTIMER pTmr; - UINT Ret= IDEvent; + UINT Ret = IDEvent; LARGE_INTEGER DueTime; DueTime.QuadPart = (LONGLONG)(-5000000); @@ -227,8 +229,10 @@ Elapse = 10; } + /* Passing an IDEvent of 0 and the SetTimer returns 1. + It will create the timer with an ID of 0 */ if ((Window) && (IDEvent == 0)) - IDEvent = 1; + Ret = 1; pTmr = FindTimer(Window, IDEvent, Type); @@ -243,11 +247,13 @@ IntUnlockWindowlessTimerBitmap(); DPRINT1("Unable to find a free window-less timer id\n"); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + ASSERT(FALSE); return 0; } + IDEvent = NUM_WINDOW_LESS_TIMERS - IDEvent; Ret = IDEvent; - //HintIndex = IDEvent + 1; + IntUnlockWindowlessTimerBitmap(); } @@ -271,7 +277,7 @@ pTmr->cmsRate = Elapse; pTmr->pfn = TimerFunc; pTmr->nID = IDEvent; - pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. + pTmr->flags = Type|TMRF_INIT; } else { @@ -319,6 +325,7 @@ if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); + DPRINT("SysemTimerSet: Access Denied!\n"); return 0; } return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); @@ -509,9 +516,6 @@ DPRINT("IntKillTimer Window %x id %p systemtimer %s\n", Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); - if ((Window) && (IDEvent == 0)) - IDEvent = 1; - pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0); if (pTmr) @@ -532,7 +536,7 @@ ExInitializeFastMutex(&Mutex); BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; - WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(PagedPool, BitmapBytes, TAG_TIMERBMP); + WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(NonPagedPool, BitmapBytes, TAG_TIMERBMP); if (WindowLessTimersBitMapBuffer == NULL) { return STATUS_UNSUCCESSFUL;

14 years, 4 months

[tkreuzer] 48567: [NTOSKRNL] - Add missing parentheses. Fixes "cont"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 19 10:03:03 2010 New Revision: 48567 URL: http://svn.reactos.org/svn/reactos?rev=48567&view=rev Log: [NTOSKRNL] - Add missing parentheses. Fixes "cont" Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Aug 19 10:03:03 2010 @@ -1683,7 +1683,7 @@ /* Clear dr6 status flags. */ TrapFrame->Dr6 &= ~0x0000e00f; - if (!KdbEnteredOnSingleStep && KdbSingleStepOver) + if (!(KdbEnteredOnSingleStep && KdbSingleStepOver)) { /* Skip the current instruction */ Context->Eip++;

14 years, 4 months

[tkreuzer] 48566: [NTOSKRNL] Fix handling of next instruction in kdbg. Patch by Daniel Zimmermann, modified by Aleksey Bragin See issue #4457 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 19 09:03:36 2010 New Revision: 48566 URL: http://svn.reactos.org/svn/reactos?rev=48566&view=rev Log: [NTOSKRNL] Fix handling of next instruction in kdbg. Patch by Daniel Zimmermann, modified by Aleksey Bragin See issue #4457 for more details. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Thu Aug 19 09:03:36 2010 @@ -1413,6 +1413,8 @@ /* Delete the temporary breakpoint which was used to step over or into the instruction. */ KdbpDeleteBreakPoint(-1, BreakPoint); + TrapFrame->Eip--; + if (--KdbNumSingleSteps > 0) { if ((KdbSingleStepOver && !KdbpStepOverInstruction(TrapFrame->Eip)) || @@ -1681,8 +1683,11 @@ /* Clear dr6 status flags. */ TrapFrame->Dr6 &= ~0x0000e00f; - /* Skip the current instruction */ - Context->Eip++; + if (!KdbEnteredOnSingleStep && KdbSingleStepOver) + { + /* Skip the current instruction */ + Context->Eip++; + } } return ContinueType;

14 years, 4 months

[tkreuzer] 48565: [NTOSKRNL] - Implement support for /BURNMEMORY option. - Don't stop boot on bad memory type Patch by Jay Smith, modified by Aleksey, even more modified by me. See issue #4957 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 19 08:50:23 2010 New Revision: 48565 URL: http://svn.reactos.org/svn/reactos?rev=48565&view=rev Log: [NTOSKRNL] - Implement support for /BURNMEMORY option. - Don't stop boot on bad memory type Patch by Jay Smith, modified by Aleksey, even more modified by me. See issue #4957 for more details. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=485… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Aug 19 08:50:23 2010 @@ -817,6 +817,51 @@ VOID NTAPI +ExBurnMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN ULONG PagesToDestroy, + IN TYPE_OF_MEMORY MemoryType) +{ + PLIST_ENTRY ListEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MemDescriptor; + + DPRINT1("Burn RAM amount: %d pages\n", PagesToDestroy); + + /* Loop the memory descriptors, beginning at the end */ + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Blink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Blink) + { + /* Get the memory descriptor structure */ + MemDescriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Is memory free there or is it temporary? */ + if (MemDescriptor->MemoryType == LoaderFree || + MemDescriptor->MemoryType == LoaderFirmwareTemporary) + { + /* Check if the descriptor has more pages than we want */ + if (MemDescriptor->PageCount > PagesToDestroy) + { + /* Change block's page count, ntoskrnl doesn't care much */ + MemDescriptor->PageCount -= PagesToDestroy; + break; + } + else + { + /* Change block type */ + MemDescriptor->MemoryType = MemoryType; + PagesToDestroy -= MemDescriptor->PageCount; + + /* Check if we are done */ + if (PagesToDestroy == 0) break; + } + } + } +} + +VOID +NTAPI ExpInitializeExecutive(IN ULONG Cpu, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { @@ -919,12 +964,7 @@ { /* Read the number of pages we'll use */ PerfMemUsed = atol(PerfMem + 1) * (1024 * 1024 / PAGE_SIZE); - if (PerfMem) - { - /* FIXME: TODO */ - DPRINT1("Burnable memory support not yet present." - "/BURNMEM option ignored.\n"); - } + if (PerfMemUsed) ExBurnMemory(LoaderBlock, PerfMemUsed, LoaderBad); } } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Thu Aug 19 08:50:23 2010 @@ -831,8 +831,7 @@ /* Check for bad RAM */ case LoaderBad: - DPRINT1("You have damaged RAM modules. Stopping boot\n"); - while (TRUE); + DPRINT1("You either have specified /BURNMEMORY or damaged RAM modules.\n"); break; /* Check for free RAM */

14 years, 4 months

[cgutman] 48564: [NETSTAT] - Allocate memory for the TCP table properly - Only netstat -a should show UDP connections - Patch by Jan Roeloffzen [jroeloffzen at hotmail dot com]

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 19 06:25:20 2010 New Revision: 48564 URL: http://svn.reactos.org/svn/reactos?rev=48564&view=rev Log: [NETSTAT] - Allocate memory for the TCP table properly - Only netstat -a should show UDP connections - Patch by Jan Roeloffzen [jroeloffzen at hotmail dot com] Modified: trunk/reactos/base/applications/network/netstat/netstat.c Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/netstat/netstat.c [iso-8859-1] Thu Aug 19 06:25:20 2010 @@ -237,12 +237,13 @@ ShowUdpStatistics(); return EXIT_SUCCESS; } - else //if (bDoShowAllCons) + else { _tprintf(_T("\nActive Connections\n")); _tprintf(_T("\n Proto Local Address Foreign Address State\n")); ShowTcpTable(); - ShowUdpTable(); + if (bDoShowAllCons) + ShowUdpTable(); } return EXIT_SUCCESS; } @@ -422,21 +423,22 @@ CHAR Remote[ADDRESSLEN]; /* Get the table of TCP endpoints */ - dwSize = 0; - error = GetTcpTable(NULL, &dwSize, TRUE); - if (error != ERROR_INSUFFICIENT_BUFFER) + dwSize = sizeof (MIB_TCPTABLE); + /* Should also work when we get new connections between 2 GetTcpTable() + * calls: */ + do + { + tcpTable = (PMIB_TCPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize); + error = GetTcpTable(tcpTable, &dwSize, TRUE); + if ( error != NO_ERROR ) + HeapFree(GetProcessHeap(), 0, tcpTable); + } + while ( error == ERROR_INSUFFICIENT_BUFFER ); + + if (error != NO_ERROR) { printf("Failed to snapshot TCP endpoints.\n"); DoFormatMessage(error); - exit(EXIT_FAILURE); - } - tcpTable = (PMIB_TCPTABLE) HeapAlloc(GetProcessHeap(), 0, dwSize); - error = GetTcpTable(tcpTable, &dwSize, TRUE ); - if (error) - { - printf("Failed to snapshot TCP endpoints table.\n"); - DoFormatMessage(error); - HeapFree(GetProcessHeap(), 0, tcpTable); exit(EXIT_FAILURE); }

14 years, 4 months

[cgutman] 48563: [IPHLPAPI] - Copy our TCP table into the caller's buffer if we actually get one (not yet!) - Return ERROR_NO_DATA if we fail to get anything from TCP/IP - Fixes bug #4185

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Aug 19 06:05:35 2010 New Revision: 48563 URL: http://svn.reactos.org/svn/reactos?rev=48563&view=rev Log: [IPHLPAPI] - Copy our TCP table into the caller's buffer if we actually get one (not yet!) - Return ERROR_NO_DATA if we fail to get anything from TCP/IP - Fixes bug #4185 Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Thu Aug 19 06:05:35 2010 @@ -1747,7 +1747,7 @@ */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret = NO_ERROR; + DWORD ret = ERROR_NO_DATA; TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, (DWORD)bOrder); @@ -1764,18 +1764,31 @@ ret = ERROR_INSUFFICIENT_BUFFER; } else { - PMIB_TCPTABLE pTcpTable = getTcpTable(); - if (pTcpTable) + PMIB_TCPTABLE pOurTcpTable = getTcpTable(); + if (pOurTcpTable) { size = sizeof(MIB_TCPTABLE); - if (pTcpTable->dwNumEntries > 1) - size += (pTcpTable->dwNumEntries - 1) * sizeof(MIB_TCPROW); - *pdwSize = size; - - if (bOrder) - qsort(pTcpTable->table, pTcpTable->dwNumEntries, - sizeof(MIB_TCPROW), TcpTableSorter); - ret = NO_ERROR; + if (pOurTcpTable->dwNumEntries > 1) + size += (pOurTcpTable->dwNumEntries - 1) * sizeof(MIB_TCPROW); + + if (*pdwSize < size) + { + *pdwSize = size; + + ret = ERROR_INSUFFICIENT_BUFFER; + } + else + { + memcpy(pTcpTable, pOurTcpTable, size); + + if (bOrder) + qsort(pTcpTable->table, pTcpTable->dwNumEntries, + sizeof(MIB_TCPROW), TcpTableSorter); + + ret = NO_ERROR; + } + + free(pOurTcpTable); } } }

14 years, 4 months

[tkreuzer] 48562: [NTOSKRNL] - Initialize the Parent member of the new Vad to NULL. This also initializes the Balance to 0 aka RtlBalancedAvlTree Should fix the failed assertion that randomly occurs.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 19 05:10:16 2010 New Revision: 48562 URL: http://svn.reactos.org/svn/reactos?rev=48562&view=rev Log: [NTOSKRNL] - Initialize the Parent member of the new Vad to NULL. This also initializes the Balance to 0 aka RtlBalancedAvlTree Should fix the failed assertion that randomly occurs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Aug 19 05:10:16 2010 @@ -121,6 +121,7 @@ Vad->EndingVpn = ((*Base) + Size - 1) >> PAGE_SHIFT; Vad->u3.Secured.StartVpn = *Base; Vad->u3.Secured.EndVpn = (Vad->EndingVpn << PAGE_SHIFT) | (PAGE_SIZE - 1); + Vad->u1.Parent = NULL; /* FIXME: Should setup VAD bitmap */ Status = STATUS_SUCCESS;

14 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010