Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 50202: [NTOSKRNL] Plumber work part 1. To prevent leaks
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 21:12:51 2010 New Revision: 50202 URL: http://svn.reactos.org/svn/reactos?rev=50202&view=rev Log: [NTOSKRNL] Plumber work part 1. To prevent leaks Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:12:51 2010 @@ -210,6 +210,8 @@ Status = IoStatus.Status; } + IoFreeMdl(Mdl); + if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) { DPRINT1("IoPageRead failed, Status %x\n", Status); @@ -262,6 +264,7 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatus.Status; } + IoFreeMdl(Mdl); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("IoPageWrite failed, Status %x\n", Status);

1 0

[pschweitzer] 50201: [NTOSKRNL] Hoover a bit in CC part 1. Should make MM happier. But MS fastfat driver not yet
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 20:59:24 2010 New Revision: 50201 URL: http://svn.reactos.org/svn/reactos?rev=50201&view=rev Log: [NTOSKRNL] Hoover a bit in CC part 1. Should make MM happier. But MS fastfat driver not yet Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 20:59:24 2010 @@ -199,8 +199,7 @@ { Size = CacheSeg->Bcb->CacheSegmentSize; } - Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -253,8 +252,7 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE);

1 0

[tkreuzer] 50200: [CMAKE] Fix compilation of kddll
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 20:29:34 2010 New Revision: 50200 URL: http://svn.reactos.org/svn/reactos?rev=50200&view=rev Log: [CMAKE] Fix compilation of kddll Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt branches/cmake-bringup/drivers/base/kddll/kddll.h Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Tue Dec 28 20:29:34 2010 @@ -1,11 +1,11 @@ -spec2def(kdcom.dll kdcom.spec) +spec2def(kdcom.dll kddll.spec) add_library(kdcom SHARED kdcom.c kddll.c kdserial.c - ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) + ${CMAKE_CURRENT_BINARY_DIR}/kddll.def) set_entrypoint(kdcom 0) set_subsystem(kdcom native) @@ -14,3 +14,4 @@ add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk buildno_header bugcodes) +add_importlib_target(kddll.spec kdcom.dll) Modified: branches/cmake-bringup/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/kddll.h [iso-8859-1] Tue Dec 28 20:29:34 2010 @@ -12,14 +12,14 @@ #include <ntifs.h> #define NDEBUG #include <halfuncs.h> -#include <stdio.h> -#include <stdlib.h> #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +long atol(const char *str); typedef UCHAR BYTE, *PBYTE;

1 0

[tkreuzer] 50199: [CMAKE] Build the right kdcom when _WINKD_ is set
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 19:56:55 2010 New Revision: 50199 URL: http://svn.reactos.org/svn/reactos?rev=50199&view=rev Log: [CMAKE] Build the right kdcom when _WINKD_ is set Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/CMak… ============================================================================== --- branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] Tue Dec 28 19:56:55 2010 @@ -2,11 +2,11 @@ add_subdirectory(beep) add_subdirectory(bootvid) -if(_WINKD_ MATCHES 1) +if(_WINKD_) add_subdirectory(kddll) else() add_subdirectory(kdcom) -endif(_WINKD_ MATCHES 1) +endif() add_subdirectory(nmidebug) add_subdirectory(null)

1 0

[tkreuzer] 50198: [ASM] KTIMER_TABLE are for win7 only
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 19:12:01 2010 New Revision: 50198 URL: http://svn.reactos.org/svn/reactos?rev=50198&view=rev Log: [ASM] KTIMER_TABLE are for win7 only Modified: branches/cmake-bringup/include/asm/ksamd64.template.h Modified: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… ============================================================================== --- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Tue Dec 28 19:12:01 2010 @@ -551,12 +551,14 @@ OFFSET(TrCodePatchCycle, KTRAP_FRAME, CodePatchCycle), SIZE(KTRAP_FRAME_LENGTH, KTRAP_FRAME), +#if (NTDDI_VERSION >= NTDDI_WIN7) HEADER("KTIMER_TABLE"), OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), OFFSET(TtTime, KTIMER_TABLE_ENTRY, Time), SIZE(TIMER_ENTRY_SIZE, KTIMER_TABLE_ENTRY), SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), +#endif HEADER("KTSS"), OFFSET(TssRsp0, KTSS64, Rsp0),

1 0

[tkreuzer] 50197: [DRIVERS] Add missing breaks. Patch by Samuel Serapion.
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 18:20:28 2010 New Revision: 50197 URL: http://svn.reactos.org/svn/reactos?rev=50197&view=rev Log: [DRIVERS] Add missing breaks. Patch by Samuel Serapion. Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -436,7 +436,7 @@ DbgPrint("CompBatt: Couldn't register for PnP notification - %x\n", Status); } - + break; case IRP_MN_CANCEL_STOP_DEVICE: /* Explicitly say ok */ Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -1361,7 +1361,7 @@ NICUpdateCounters(Adapter); Adapter->ReceiveError = TRUE; - + break; case ISR_PRX: NDIS_DbgPrint(MID_TRACE, ("Receive interrupt.\n")); @@ -1380,7 +1380,7 @@ NICUpdateCounters(Adapter); Adapter->TransmitError = TRUE; - + break; case ISR_PTX: NDIS_DbgPrint(MID_TRACE, ("Transmit interrupt.\n")); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -287,6 +287,7 @@ case ETYPE_ARP: TI_DbgPrint(MID_TRACE,("Received ARP Packet\n")); ARPReceive(Adapter->Context, &IPPacket); + break; default: IPPacket.Free(&IPPacket); break; Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -1908,8 +1908,9 @@ case EXECUTE_OFFLINE_DIAGS: controlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; - - default: + break; + + default: status = STATUS_INVALID_PARAMETER; break; } Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -3502,6 +3502,7 @@ } } + break; } default: { Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -113,6 +113,7 @@ KdPrint2((PRINT_PREFIX "New ATI PATA 1 chan\n")); break; } + break; case ATA_SILICON_IMAGE_ID: if(ChipFlags & SIIBUG) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -6006,6 +6006,7 @@ default: TRAP(); } + break; } case URB_FLAG_STATE_DOORBELL: { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c [iso-8859-1] Tue Dec 28 18:20:28 2010 @@ -214,6 +214,7 @@ EXIT_DISPATCH(STATUS_SUCCESS, irp); } } + break; } case IRP_MJ_CREATE: case IRP_MJ_CLOSE:

1 0

[tkreuzer] 50196: [CMAKE/ROSSYM] Use _WIN32 instead of WIN32
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:12:58 2010 New Revision: 50196 URL: http://svn.reactos.org/svn/reactos?rev=50196&view=rev Log: [CMAKE/ROSSYM] Use _WIN32 instead of WIN32 Modified: branches/cmake-bringup/lib/rossym/compat.h Modified: branches/cmake-bringup/lib/rossym/compat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/compat… ============================================================================== --- branches/cmake-bringup/lib/rossym/compat.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/compat.h [iso-8859-1] Tue Dec 28 17:12:58 2010 @@ -15,7 +15,7 @@ typedef unsigned long long u64int; typedef long long s64int; -#ifndef WIN32 +#ifndef _WIN32 typedef ulong size_t; #endif

1 0

[tkreuzer] 50195: [CMAKE/AMD64] - add missing definitions for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:10:53 2010 New Revision: 50195 URL: http://svn.reactos.org/svn/reactos?rev=50195&view=rev Log: [CMAKE/AMD64] - add missing definitions for amd64 Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Dec 28 17:10:53 2010 @@ -195,6 +195,7 @@ // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) @@ -229,8 +230,13 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE

1 0

[tkreuzer] 50194: [CMAKE] - Add _WINKD_ definition - fix DBG and KDBG
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 17:08:11 2010 New Revision: 50194 URL: http://svn.reactos.org/svn/reactos?rev=50194&view=rev Log: [CMAKE] - Add _WINKD_ definition - fix DBG and KDBG Modified: branches/cmake-bringup/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Tue Dec 28 17:08:11 2010 @@ -98,14 +98,14 @@ if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) - else() - add_definitions(-DDBG=0) endif() if(KDBG) add_definitions(-DKDBG=1) - else() - add_definitions(-DKDBG=0) + endif() + + if(_WINKD_) + add_definitions(-D_WINKD_=1) endif() # Version Options @@ -167,7 +167,7 @@ # nci generated intermediate files - list(APPEND nci_output + list(APPEND nci_output ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S @@ -218,7 +218,7 @@ add_custom_command( OUTPUT ${OUTPUT_FILES} COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib - DEPENDS native-gendib) + DEPENDS native-gendib) add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})

1 0

[tkreuzer] 50193: [CMAKE/GENINC] Allow amd64 machine type
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 16:39:27 2010 New Revision: 50193 URL: http://svn.reactos.org/svn/reactos?rev=50193&view=rev Log: [CMAKE/GENINC] Allow amd64 machine type Modified: branches/cmake-bringup/tools/geninc/geninc.c Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Tue Dec 28 16:39:27 2010 @@ -111,7 +111,7 @@ goto quit; } - if (Machine != 0x14c) + if (Machine != 0x14c && Machine != 0x8664) { fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); goto quit;

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