Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 71312: [APPHELP] Remove imagehlp.dll dependency. CORE-10367
by mjansen＠svn.reactos.org 10 May '16

10 May '16

Author: mjansen Date: Tue May 10 20:42:37 2016 New Revision: 71312 URL: http://svn.reactos.org/svn/reactos?rev=71312&view=rev Log: [APPHELP] Remove imagehlp.dll dependency. CORE-10367 Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c Modified: trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/CMak… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/CMakeLists.txt [iso-8859-1] Tue May 10 20:42:37 2016 @@ -16,7 +16,6 @@ set_module_type(apphelp win32dll) target_link_libraries(apphelp wine) -# When binutils is fixed, we should move imagehlp to delay! CORE-6504 add_delay_importlibs(apphelp version) -add_importlibs(apphelp msvcrt imagehlp kernel32 ntdll) +add_importlibs(apphelp msvcrt kernel32 ntdll) add_cd_file(TARGET apphelp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/sdbf… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/sdbfileattr.c [iso-8859-1] Tue May 10 20:42:37 2016 @@ -18,11 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "apphelp.h" #include "imagehlp.h" #include "winver.h" +#include "rtlfuncs.h" #include "wine/unicode.h" @@ -334,11 +336,11 @@ SdbpSetDWORDAttr(&attr_info[23], TAG_LINK_DATE, headers->FileHeader.TimeDateStamp); SdbpSetDWORDAttr(&attr_info[24], TAG_UPTO_LINK_DATE, headers->FileHeader.TimeDateStamp); - export_dir = (PIMAGE_EXPORT_DIRECTORY)ImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); + export_dir = (PIMAGE_EXPORT_DIRECTORY)RtlImageDirectoryEntryToData(mapped.view, FALSE, IMAGE_DIRECTORY_ENTRY_EXPORT, &export_dir_size); if (export_dir && ((PBYTE)(export_dir+1) <= mapping_end)) { PIMAGE_SECTION_HEADER section = NULL; - PBYTE export_name = ImageRvaToVa(headers, mapped.view, export_dir->Name, &section); + PBYTE export_name = RtlImageRvaToVa(headers, mapped.view, export_dir->Name, &section); if (export_name) SdbpSetStringAttrFromAnsiString(&attr_info[25], TAG_EXPORT_NAME, export_name, strlen((char*)export_name)); else

1 0

[tfaber] 71311: [FASTFAT] - Fix a use after free in VfatFlushVolume CORE-11224 #resolve
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 18:29:06 2016 New Revision: 71311 URL: http://svn.reactos.org/svn/reactos?rev=71311&view=rev Log: [FASTFAT] - Fix a use after free in VfatFlushVolume CORE-11224 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] Tue May 10 18:29:06 2016 @@ -115,7 +115,7 @@ if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; + Status = IoStatusBlock.Status; } /* Ignore device not supporting flush operation */

1 0

[akhaldi] 71310: [0.4.1] Merge the uninitialized variable usage fix by Alter in r71309. CORE-11157
by akhaldi＠svn.reactos.org 10 May '16

10 May '16

Author: akhaldi Date: Tue May 10 18:20:37 2016 New Revision: 71310 URL: http://svn.reactos.org/svn/reactos?rev=71310&view=rev Log: [0.4.1] Merge the uninitialized variable usage fix by Alter in r71309. CORE-11157 Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 18:20:37 2016 @@ -1 +1 @@ -/trunk:71217,71231,71245,71252,71255,71296 +/trunk:71217,71231,71245,71252,71255,71296,71309 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 10 18:20:37 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309 Modified: branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/driver… ============================================================================== --- branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Tue May 10 18:20:37 2016 @@ -1538,7 +1538,7 @@ if(deviceExtension->DevID == ATA_I82371FB) { KdPrint2((PRINT_PREFIX " I82371FB\n")); USHORT reg4x; - USHORT control; + USHORT control=0; for(i=wdmamode; i>=0; i--) { idx = 5+i; if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { @@ -1559,9 +1559,9 @@ } GetPciConfig2(0x40+Channel*2, reg4x); if(apiomode > ATA_PIO0) { - control = 0x03; /* IORDY|TIME0 */ + control |= 0x03; /* IORDY|TIME0 */ } else { - control = 0x02; /* IORDY */ + control |= 0x02; /* IORDY */ } // if (ata_pio_need_iordy(adev)) //control |= 2; /* IE */

1 0

[mjansen] 71309: [UNIATA] Fix uninitialized variable usage. Patch by 'Alter'. CORE-11157 #resolve #comment Thanks!
by mjansen＠svn.reactos.org 10 May '16

10 May '16

Author: mjansen Date: Tue May 10 18:15:35 2016 New Revision: 71309 URL: http://svn.reactos.org/svn/reactos?rev=71309&view=rev Log: [UNIATA] Fix uninitialized variable usage. Patch by 'Alter'. CORE-11157 #resolve #comment Thanks! Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Tue May 10 18:15:35 2016 @@ -1538,7 +1538,7 @@ if(deviceExtension->DevID == ATA_I82371FB) { KdPrint2((PRINT_PREFIX " I82371FB\n")); USHORT reg4x; - USHORT control; + USHORT control=0; for(i=wdmamode; i>=0; i--) { idx = 5+i; if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { @@ -1559,9 +1559,9 @@ } GetPciConfig2(0x40+Channel*2, reg4x); if(apiomode > ATA_PIO0) { - control = 0x03; /* IORDY|TIME0 */ + control |= 0x03; /* IORDY|TIME0 */ } else { - control = 0x02; /* IORDY */ + control |= 0x02; /* IORDY */ } // if (ata_pio_need_iordy(adev)) //control |= 2; /* IE */

1 0

[tfaber] 71308: [IPHLPAPI] - Don't use uninitialized values in AllocateAndGet*TableFromStack functions. CID 716757 - Free buffers on failure CORE-11227 #resolve
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 17:53:36 2016 New Revision: 71308 URL: http://svn.reactos.org/svn/reactos?rev=71308&view=rev Log: [IPHLPAPI] - Don't use uninitialized values in AllocateAndGet*TableFromStack functions. CID 716757 - Free buffers on failure CORE-11227 #resolve 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] Tue May 10 17:53:36 2016 @@ -117,10 +117,15 @@ else { DWORD dwSize = 0; + *ppIfTable = NULL; ret = GetIfTable(*ppIfTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppIfTable = (PMIB_IFTABLE)HeapAlloc(heap, flags, dwSize); ret = GetIfTable(*ppIfTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppIfTable); + *ppIfTable = NULL; + } } } TRACE("returning %ld\n", ret); @@ -156,10 +161,15 @@ else { DWORD dwSize = 0; + *ppIpAddrTable = NULL; ret = GetIpAddrTable(*ppIpAddrTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppIpAddrTable = (PMIB_IPADDRTABLE)HeapAlloc(heap, flags, dwSize); ret = GetIpAddrTable(*ppIpAddrTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppIpAddrTable); + *ppIpAddrTable = NULL; + } } } TRACE("returning %ld\n", ret); @@ -193,10 +203,15 @@ else { DWORD dwSize = 0; + *ppIpForwardTable = NULL; ret = GetIpForwardTable(*ppIpForwardTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppIpForwardTable = (PMIB_IPFORWARDTABLE)HeapAlloc(heap, flags, dwSize); ret = GetIpForwardTable(*ppIpForwardTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppIpForwardTable); + *ppIpForwardTable = NULL; + } } } TRACE("returning %ld\n", ret); @@ -232,10 +247,15 @@ else { DWORD dwSize = 0; + *ppIpNetTable = NULL; ret = GetIpNetTable(*ppIpNetTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppIpNetTable = (PMIB_IPNETTABLE)HeapAlloc(heap, flags, dwSize); ret = GetIpNetTable(*ppIpNetTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppIpNetTable); + *ppIpNetTable = NULL; + } } } TRACE("returning %ld\n", ret); @@ -271,10 +291,15 @@ else { DWORD dwSize = 0; + *ppTcpTable = NULL; ret = GetTcpTable(*ppTcpTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppTcpTable = (PMIB_TCPTABLE)HeapAlloc(heap, flags, dwSize); ret = GetTcpTable(*ppTcpTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppTcpTable); + *ppTcpTable = NULL; + } } } TRACE("returning %ld\n", ret); @@ -310,10 +335,15 @@ else { DWORD dwSize = 0; + *ppUdpTable = NULL; ret = GetUdpTable(*ppUdpTable, &dwSize, bOrder); if (ret == ERROR_INSUFFICIENT_BUFFER) { *ppUdpTable = (PMIB_UDPTABLE)HeapAlloc(heap, flags, dwSize); ret = GetUdpTable(*ppUdpTable, &dwSize, bOrder); + if (ret != NO_ERROR) { + HeapFree(heap, flags, *ppUdpTable); + *ppUdpTable = NULL; + } } } TRACE("returning %ld\n", ret);

1 0

[tfaber] 71307: [HAL] - Create a wrapper version of HalpEndSoftwareInterrupt that frees its stack before calling the noreturn version of the next software interrupt handler. Fixes excessive stack u...
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 15:03:56 2016 New Revision: 71307 URL: http://svn.reactos.org/svn/reactos?rev=71307&view=rev Log: [HAL] - Create a wrapper version of HalpEndSoftwareInterrupt that frees its stack before calling the noreturn version of the next software interrupt handler. Fixes excessive stack usage when DPCs are queued in quick succession. CORE-11123 #resolve Added: trunk/reactos/hal/halx86/up/pic.S (with props) Modified: trunk/reactos/hal/halx86/pic.cmake trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/pic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pic.cmake?rev=7… ============================================================================== --- trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] Tue May 10 15:03:56 2016 @@ -1,7 +1,8 @@ list(APPEND HAL_PIC_ASM_SOURCE generic/systimer.S - generic/trap.S) + generic/trap.S + up/pic.S) list(APPEND HAL_PIC_SOURCE generic/profil.c Added: trunk/reactos/hal/halx86/up/pic.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.S?rev=71… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.S (added) +++ trunk/reactos/hal/halx86/up/pic.S [iso-8859-1] Tue May 10 15:03:56 2016 @@ -0,0 +1,48 @@ +/* + * FILE: hal/halx86/up/pic.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: HAL PIC Management and Control Code + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +#include <ks386.inc> + +EXTERN _HalpEndSoftwareInterrupt2@8:PROC + +/* GLOBALS *******************************************************************/ + +.data +ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING + +/* FUNCTIONS *****************************************************************/ + +.code +PUBLIC _HalpEndSoftwareInterrupt@8 +.PROC _HalpEndSoftwareInterrupt@8 + FPO 0, 2, 0, 0, 0, FRAME_FPO + + /* Call the C function with the same arguments we got */ + push [esp+8] + push [esp+8] + call _HalpEndSoftwareInterrupt2@8 + + /* Check if we got a pointer back */ + test eax, eax + jnz CallIntHandler + + /* No? Just return */ + ret 8 + +CallIntHandler: + /* We got a pointer to call. Since it won't return, free up our stack + space, or we could end up with some nasty deep recursion */ + mov ecx, [esp+8] + add esp, 12 + jmp eax +.ENDP + +END Propchange: trunk/reactos/hal/halx86/up/pic.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=71… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Tue May 10 15:03:56 2016 @@ -11,6 +11,11 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +VOID +NTAPI +HalpEndSoftwareInterrupt(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame); /* GLOBALS ********************************************************************/ @@ -263,7 +268,7 @@ * so it will always preempt until we reach PROFILE_LEVEL. */ 0b00000000000000000001011111110000, /* IRQL 20 */ - 0b00000000000000000001001111110000, /* IRQL 20 */ + 0b00000000000000000001001111110000, /* IRQL 21 */ 0b00000000000000000001000111110000, /* IRQL 22 */ 0b00000000000000000001000011110000, /* IRQL 23 */ 0b00000000000000000001000001110000, /* IRQL 24 */ @@ -732,15 +737,17 @@ KeGetPcr()->IRR &= ~(1 << Irql); } -VOID -NTAPI -HalpEndSoftwareInterrupt(IN KIRQL OldIrql, - IN PKTRAP_FRAME TrapFrame) +PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY +NTAPI +HalpEndSoftwareInterrupt2(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame) { ULONG PendingIrql, PendingIrqlMask, PendingIrqMask; PKPCR Pcr = KeGetPcr(); PIC_MASK Mask; + UNREFERENCED_PARAMETER(TrapFrame); + /* Set old IRQL */ Pcr->Irql = OldIrql; @@ -749,10 +756,10 @@ { /* Check for pending software interrupts and compare with current IRQL */ PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (!PendingIrqlMask) return; + if (!PendingIrqlMask) return NULL; /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; + if (Pcr->IrrActive & 0xFFFFFFF0) return NULL; /* Check if pending IRQL affects hardware state */ BitScanReverse(&PendingIrql, PendingIrqlMask); @@ -777,10 +784,11 @@ else { /* No need to loop checking for hardware interrupts */ - SWInterruptHandlerTable2[PendingIrql](TrapFrame); - UNREACHABLE; + return SWInterruptHandlerTable2[PendingIrql]; } } + + return NULL; } /* EDGE INTERRUPT DISMISSAL FUNCTIONS *****************************************/

1 0

[tfaber] 71306: [IPHLPAPI] - Fix memory leaks in getInterfaceInfoSet (CIDs 716370 and 716371) - Fix a benign uninitialized variable use (CID 500783) CORE-11224 #resolve
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 13:59:41 2016 New Revision: 71306 URL: http://svn.reactos.org/svn/reactos?rev=71306&view=rev Log: [IPHLPAPI] - Fix memory leaks in getInterfaceInfoSet (CIDs 716370 and 716371) - Fix a benign uninitialized variable use (CID 500783) CORE-11224 #resolve Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Tue May 10 13:59:41 2016 @@ -155,7 +155,7 @@ IFInfo **infoSet, PDWORD numInterfaces ) { DWORD numEntities; - TDIEntityID *entIDSet = 0; + TDIEntityID *entIDSet = NULL; NTSTATUS status = tdiGetEntityIDSet( tcpFile, &entIDSet, &numEntities ); IFInfo *infoSetInt = 0; int curInterf = 0, i; @@ -187,7 +187,7 @@ if( NT_SUCCESS(status) ) status = tdiGetIpAddrsForIpEntity ( tcpFile, &ip_ent, &addrs, &numAddrs ); - for( j = 0; j < numAddrs && NT_SUCCESS(status); j++ ) { + for( j = 0; NT_SUCCESS(status) && j < numAddrs; j++ ) { TRACE("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index); if( addrs[j].iae_index == infoSetInt[curInterf].if_info.ent.if_index ) { @@ -198,6 +198,8 @@ break; } } + if ( NT_SUCCESS(status) ) + tdiFreeThingSet(addrs); } } } @@ -213,6 +215,7 @@ return status; } else { + tdiFreeThingSet(entIDSet); return STATUS_INSUFFICIENT_RESOURCES; } }

1 0

[tfaber] 71305: [IPHLPAPI] - Tabs to spaces. No code changes.
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 13:42:57 2016 New Revision: 71305 URL: http://svn.reactos.org/svn/reactos?rev=71305&view=rev Log: [IPHLPAPI] - Tabs to spaces. No code changes. Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c [iso-8859-1] Tue May 10 13:42:57 2016 @@ -183,21 +183,21 @@ TDIEntityID ip_ent; int j; - status = getNthIpEntity( tcpFile, curInterf, &ip_ent ); - if( NT_SUCCESS(status) ) - status = tdiGetIpAddrsForIpEntity - ( tcpFile, &ip_ent, &addrs, &numAddrs ); - for( j = 0; j < numAddrs && NT_SUCCESS(status); j++ ) { - TRACE("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index); - if( addrs[j].iae_index == - infoSetInt[curInterf].if_info.ent.if_index ) { - memcpy( &infoSetInt[curInterf].ip_addr, - &addrs[j], - sizeof( addrs[j] ) ); - curInterf++; - break; - } - } + status = getNthIpEntity( tcpFile, curInterf, &ip_ent ); + if( NT_SUCCESS(status) ) + status = tdiGetIpAddrsForIpEntity + ( tcpFile, &ip_ent, &addrs, &numAddrs ); + for( j = 0; j < numAddrs && NT_SUCCESS(status); j++ ) { + TRACE("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index); + if( addrs[j].iae_index == + infoSetInt[curInterf].if_info.ent.if_index ) { + memcpy( &infoSetInt[curInterf].ip_addr, + &addrs[j], + sizeof( addrs[j] ) ); + curInterf++; + break; + } + } } } } @@ -243,7 +243,7 @@ for( i = 0; i < numEntities; i++ ) { if( isInterface( &entitySet[i] ) && (!onlyNonLoopback || - (onlyNonLoopback && !isLoopback( tcpFile, &entitySet[i] ))) ) + (onlyNonLoopback && !isLoopback( tcpFile, &entitySet[i] ))) ) numInterfaces++; } @@ -406,9 +406,9 @@ status = getInterfaceInfoSet( tcpFile, &ifInfo, &numInterfaces ); TRACE("InterfaceInfoSet: %08x, %04x:%08x\n", - status, - ifInfo->entity_id.tei_entity, - ifInfo->entity_id.tei_instance); + status, + ifInfo->entity_id.tei_entity, + ifInfo->entity_id.tei_instance); if( NT_SUCCESS(status) ) { ret = (InterfaceIndexTable *) @@ -418,13 +418,13 @@ if (ret) { ret->numAllocated = numInterfaces; - TRACE("NumInterfaces = %d\n", numInterfaces); + TRACE("NumInterfaces = %d\n", numInterfaces); for( i = 0; i < numInterfaces; i++ ) { - TRACE("Examining interface %d\n", i); + TRACE("Examining interface %d\n", i); if( !nonLoopbackOnly || !isLoopback( tcpFile, &ifInfo[i].entity_id ) ) { - TRACE("Interface %d matches (%d)\n", i, curInterface); + TRACE("Interface %d matches (%d)\n", i, curInterface); ret->indexes[curInterface++] = ifInfo[i].if_info.ent.if_index; } @@ -633,7 +633,7 @@ if (string) strncpy(string, inet_ntoa(iAddr), 16); - + return inet_ntoa(iAddr); }

1 0

[tfaber] 71304: [NTOS:MM] - Keep track of physical pages allocated for special pool, and respect the initially calculated MiSpecialPagesNonPagedMaximum
by tfaber＠svn.reactos.org 10 May '16

10 May '16

Author: tfaber Date: Tue May 10 11:47:05 2016 New Revision: 71304 URL: http://svn.reactos.org/svn/reactos?rev=71304&view=rev Log: [NTOS:MM] - Keep track of physical pages allocated for special pool, and respect the initially calculated MiSpecialPagesNonPagedMaximum Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/special.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/special.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/special.c [iso-8859-1] Tue May 10 11:47:05 2016 @@ -44,8 +44,12 @@ PMMPTE MiSpecialPoolLastPte; PFN_COUNT MmSpecialPagesInUse; +PFN_COUNT MmSpecialPagesInUsePeak; +PFN_COUNT MiSpecialPagesPagable; +PFN_COUNT MiSpecialPagesPagablePeak; PFN_COUNT MiSpecialPagesNonPaged; -PFN_NUMBER MiSpecialPagesNonPagedMaximum; +PFN_COUNT MiSpecialPagesNonPagedPeak; +PFN_COUNT MiSpecialPagesNonPagedMaximum; BOOLEAN MmSpecialPoolCatchOverruns = TRUE; @@ -135,7 +139,9 @@ /* Reserve those PTEs */ do { - PointerPte = MiReserveAlignedSystemPtes(SpecialPoolPtes, 0, /*0x400000*/0); // FIXME: + PointerPte = MiReserveAlignedSystemPtes(SpecialPoolPtes, + SystemPteSpace, + /*0x400000*/0); // FIXME: if (PointerPte) break; /* Reserving didn't work, so try to reduce the requested size */ @@ -238,6 +244,7 @@ LARGE_INTEGER TickCount; PVOID Entry; PPOOL_HEADER Header; + PFN_COUNT PagesInUse; DPRINT("MmAllocateSpecialPool(%x %x %x %x)\n", NumberOfBytes, Tag, PoolType, SpecialType); @@ -262,8 +269,13 @@ } /* TODO: Take into account various limitations */ - /*if ((PoolType != NonPagedPool) && - MiSpecialPagesNonPaged > MiSpecialPagesNonPagedMaximum)*/ + + /* Heed the maximum limit of nonpaged pages */ + if ((PoolType == NonPagedPool) && + (MiSpecialPagesNonPaged > MiSpecialPagesNonPagedMaximum)) + { + return NULL; + } /* Lock PFN database */ Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -311,6 +323,11 @@ /* Release the PFN database lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + /* Increase page counter */ + PagesInUse = InterlockedIncrementUL(&MmSpecialPagesInUse); + if (PagesInUse > MmSpecialPagesInUsePeak) + MmSpecialPagesInUsePeak = PagesInUse; + /* Put some content into the page. Low value of tick count would do */ Entry = MiPteToAddress(PointerPte); RtlFillMemory(Entry, PAGE_SIZE, TickCount.LowPart); @@ -347,11 +364,21 @@ /* Also mark the next PTE as special-pool-paged */ PointerPte[1].u.Soft.PageFileHigh |= SPECIAL_POOL_PAGED_PTE; + + /* Increase pagable counter */ + PagesInUse = InterlockedIncrementUL(&MiSpecialPagesPagable); + if (PagesInUse > MiSpecialPagesPagablePeak) + MiSpecialPagesPagablePeak = PagesInUse; } else { /* Mark the next PTE as special-pool-nonpaged */ PointerPte[1].u.Soft.PageFileHigh |= SPECIAL_POOL_NONPAGED_PTE; + + /* Increase nonpaged counter */ + PagesInUse = InterlockedIncrementUL(&MiSpecialPagesNonPaged); + if (PagesInUse > MiSpecialPagesNonPagedPeak) + MiSpecialPagesNonPagedPeak = PagesInUse; } /* Finally save tag and put allocation time into the header's blocksize. @@ -547,6 +574,9 @@ /* Non pagable. Get PFN element corresponding to the PTE */ Pfn = MI_PFN_ELEMENT(PointerPte->u.Hard.PageFrameNumber); + /* Count the page as free */ + InterlockedDecrementUL(&MiSpecialPagesNonPaged); + /* Lock PFN database */ Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -567,6 +597,9 @@ /* Pagable. Delete that virtual address */ MiDeleteSystemPageableVm(PointerPte, 1, 0, NULL); + /* Count the page as free */ + InterlockedDecrementUL(&MiSpecialPagesPagable); + /* Lock PFN database */ Irql = KeAcquireQueuedSpinLock(LockQueuePfnLock); } @@ -586,6 +619,9 @@ /* Release the PFN database lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, Irql); + + /* Update page counter */ + InterlockedDecrementUL(&MmSpecialPagesInUse); } VOID

1 0

[hbelusca] 71303: [CONSOLE.CPL]: Fix a test condition. Reviewed by Thomas Faber; initially patched by Victor Martinez Calvo Should fix CID 1322302 "Fix an use after free". Please reanalyze with Cov...
by hbelusca＠svn.reactos.org 09 May '16

09 May '16

Author: hbelusca Date: Mon May 9 22:06:27 2016 New Revision: 71303 URL: http://svn.reactos.org/svn/reactos?rev=71303&view=rev Log: [CONSOLE.CPL]: Fix a test condition. Reviewed by Thomas Faber; initially patched by Victor Martinez Calvo Should fix CID 1322302 "Fix an use after free". Please reanalyze with Coverity :) CORE-11179 Modified: trunk/reactos/dll/cpl/console/console.c Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Mon May 9 22:06:27 2016 @@ -227,9 +227,9 @@ } psh.pszCaption = szTitle; - if (/* pSharedInfo != NULL && */ ConInfo->hWnd != NULL) - { - /* We were started from a console window: this is our parent. */ + if (pSharedInfo != NULL) + { + /* We were started from a console window: this is our parent (or ConInfo->hWnd is NULL) */ psh.hwndParent = ConInfo->hWnd; } else

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