Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 13:30:37 2011 New Revision: 50736 URL: http://svn.reactos.org/svn/reactos?rev=50736&view=rev Log: - Fix build d3d8 Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Feb 16 13:30:37 2011 @@ -29,6 +29,7 @@ volume.c volumetexture.c version.rc + ${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) add_library(d3d8 SHARED ${SOURCE})

13 years, 10 months

[janderwald] 50735: - Fix build of msdmo

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 13:24:36 2011 New Revision: 50735 URL: http://svn.reactos.org/svn/reactos?rev=50735&view=rev Log: - Fix build of msdmo Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/msdmo… ============================================================================== --- branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/msdmo/CMakeLists.txt [iso-8859-1] Wed Feb 16 13:24:36 2011 @@ -11,6 +11,7 @@ dmort.c stubs.c rsrc.rc + ${REACTOS_BINARY_DIR}/include/dxsdk/mediaobj_i.c ${CMAKE_CURRENT_BINARY_DIR}/msdmo.def) set_entrypoint(msdmo 0)

13 years, 10 months

[fireball] 50734: [RTL/DPH] - Connect debug page heap routines in the debug heap implementation, so they are going to be actually called now. - Implement delayed free queue initialization and freeing.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 16 13:09:18 2011 New Revision: 50734 URL: http://svn.reactos.org/svn/reactos?rev=50734&view=rev Log: [RTL/DPH] - Connect debug page heap routines in the debug heap implementation, so they are going to be actually called now. - Implement delayed free queue initialization and freeing. Modified: trunk/reactos/lib/rtl/heapdbg.c trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heapdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapdbg.c?rev=5073… ============================================================================== --- trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapdbg.c [iso-8859-1] Wed Feb 16 13:09:18 2011 @@ -136,8 +136,8 @@ BOOLEAN HeapLocked = FALSE; PVOID Result; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlpPageHeapAllocateHeap(HeapPtr, Flags, Size); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapAllocate(HeapPtr, Flags, Size); if (Heap->Signature != HEAP_SIGNATURE) { @@ -203,8 +203,8 @@ PVOID Result = NULL; PHEAP_ENTRY HeapEntry; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlpPageHeapReAllocateHeap(HeapPtr, Flags, Size); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapReAllocate(HeapPtr, Flags, Ptr, Size); if (Heap->Signature != HEAP_SIGNATURE) { @@ -273,8 +273,8 @@ PHEAP_ENTRY HeapEntry; BOOLEAN Result = FALSE; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlpPageHeapFreeHeap(HeapPtr, Flags, Size); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapFree(HeapPtr, Flags, Ptr); if (Heap->Signature != HEAP_SIGNATURE) { @@ -330,8 +330,8 @@ PHEAP_ENTRY HeapEntry; BOOLEAN Result = FALSE; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlpPageHeapGetUserInfoHeap(HeapPtr, Flags, Size); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapGetUserInfo(HeapHandle, Flags, BaseAddress, UserValue, UserFlags); if (Heap->Signature != HEAP_SIGNATURE) { @@ -382,8 +382,8 @@ PHEAP_ENTRY HeapEntry; BOOLEAN Result = FALSE; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlpPageHeapSetUserValueHeap(HeapPtr, Flags, Size); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapSetUserValue(HeapHandle, Flags, BaseAddress, UserValue); if (Heap->Signature != HEAP_SIGNATURE) { @@ -439,8 +439,8 @@ PHEAP_ENTRY HeapEntry; BOOLEAN Result = FALSE; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlPageHeapSetUserFlagsHeap(HeapPtr, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapSetUserFlags(HeapHandle, Flags, BaseAddress, UserFlagsReset, UserFlagsSet); /* Check if this heap allows flags to be set at all */ if (UserFlagsSet & ~HEAP_SETTABLE_USER_FLAGS || @@ -500,8 +500,8 @@ PHEAP_ENTRY HeapEntry; SIZE_T Result = ~(SIZE_T)0; - //if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) - //return RtlPageHeapSizeHeap(HeapPtr, Flags, Ptr); + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) + return RtlpPageHeapSize(HeapPtr, Flags, Ptr); /* Check heap signature */ if (Heap->Signature != HEAP_SIGNATURE) Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=507… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Feb 16 13:09:18 2011 @@ -117,6 +117,12 @@ ULONG RtlpDphPageHeapListLength; UNICODE_STRING RtlpDphTargetDllsUnicode; +RTL_CRITICAL_SECTION RtlpDphDelayedFreeQueueLock; +LIST_ENTRY RtlpDphDelayedFreeQueue; +SLIST_HEADER RtlpDphDelayedTemporaryPushList; +ULONG RtlpDphMemoryUsedByDelayedFreeBlocks; +ULONG RtlpDphNumberOfDelayedFreeBlocks; + /* Counters */ LONG RtlpDphCounter; LONG RtlpDphAllocFails; @@ -174,6 +180,13 @@ BOOLEAN NTAPI RtlpDphGrowVirtual(PDPH_HEAP_ROOT DphRoot, SIZE_T Size); +BOOLEAN NTAPI +RtlpDphIsNormalFreeHeapBlock(PVOID Block, PULONG ValidationInformation, BOOLEAN CheckFillers); + +VOID NTAPI +RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, ULONG Reserved, PVOID Block, ULONG ValidationInfo); + + PVOID NTAPI RtlpDphPointerFromHandle(PVOID Handle) { @@ -884,15 +897,78 @@ NTSTATUS NTAPI RtlpDphInitializeDelayedFreeQueue() { - UNIMPLEMENTED; - return STATUS_SUCCESS; + NTSTATUS Status; + + Status = RtlInitializeCriticalSection(&RtlpDphDelayedFreeQueueLock); + if (!NT_SUCCESS(Status)) + { + // TODO: Log this error! + DPRINT1("Failure initializing delayed free queue critical section\n"); + return Status; + } + + /* Initialize lists */ + InitializeListHead(&RtlpDphDelayedFreeQueue); + RtlInitializeSListHead(&RtlpDphDelayedTemporaryPushList); + + /* Reset counters */ + RtlpDphMemoryUsedByDelayedFreeBlocks = 0; + RtlpDphNumberOfDelayedFreeBlocks = 0; + + return Status; } VOID NTAPI RtlpDphFreeDelayedBlocksFromHeap(PDPH_HEAP_ROOT DphRoot, PHEAP NormalHeap) { - UNIMPLEMENTED; + PLIST_ENTRY Current, Next; + PDPH_BLOCK_INFORMATION BlockInfo; + ULONG ValidationInfo; + + /* The original routine seems to use a temporary SList to put blocks to be freed, + then it releases the lock and frees the blocks. But let's make it simple for now */ + + /* Acquire the delayed free queue lock */ + RtlEnterCriticalSection(&RtlpDphDelayedFreeQueueLock); + + /* Traverse the list */ + Current = RtlpDphDelayedFreeQueue.Flink; + while (Current != &RtlpDphDelayedFreeQueue); + { + /* Get the next entry pointer */ + Next = Current->Flink; + + BlockInfo = CONTAINING_RECORD(Current, DPH_BLOCK_INFORMATION, FreeQueue); + + /* Check if it belongs to the same heap */ + if (BlockInfo->Heap == DphRoot) + { + /* Remove it from the list */ + RemoveEntryList(Current); + + /* Reset its heap to NULL */ + BlockInfo->Heap = NULL; + + if (!RtlpDphIsNormalFreeHeapBlock(BlockInfo + 1, &ValidationInfo, TRUE)) + { + RtlpDphReportCorruptedBlock(DphRoot, 10, BlockInfo + 1, ValidationInfo); + } + + /* Decrement counters */ + RtlpDphMemoryUsedByDelayedFreeBlocks -= BlockInfo->ActualSize; + RtlpDphNumberOfDelayedFreeBlocks--; + + /* Free the normal heap */ + RtlFreeHeap (NormalHeap, 0, BlockInfo); + } + + /* Move to the next one */ + Current = Next; + } + + /* Release the delayed free queue lock */ + RtlLeaveCriticalSection(&RtlpDphDelayedFreeQueueLock); } NTSTATUS NTAPI @@ -1025,6 +1101,18 @@ } return (SomethingWrong == FALSE); +} + +BOOLEAN NTAPI +RtlpDphIsNormalFreeHeapBlock(PVOID Block, + PULONG ValidationInformation, + BOOLEAN CheckFillers) +{ + ASSERT(ValidationInformation != NULL); + + UNIMPLEMENTED; + *ValidationInformation = 0; + return TRUE; } NTSTATUS NTAPI

13 years, 10 months

[janderwald] 50733: - Fix linker warning

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 13:04:34 2011 New Revision: 50733 URL: http://svn.reactos.org/svn/reactos?rev=50733&view=rev Log: - Fix linker warning Modified: branches/cmake-bringup/dll/win32/msisip/msisip.spec Modified: branches/cmake-bringup/dll/win32/msisip/msisip.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisip/… ============================================================================== --- branches/cmake-bringup/dll/win32/msisip/msisip.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisip/msisip.spec [iso-8859-1] Wed Feb 16 13:04:34 2011 @@ -4,5 +4,5 @@ 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData 10 stub MsiSIPVerifyIndirectData -11 stdcall DllRegisterServer() -12 stdcall DllUnregisterServer() +11 stdcall -private DllRegisterServer() +12 stdcall -private DllUnregisterServer()

13 years, 10 months

[tkreuzer] 50732: [WINED3D] Replace 0/0, 1/0 with NAN and INFINITY

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 16 12:54:58 2011 New Revision: 50732 URL: http://svn.reactos.org/svn/reactos?rev=50732&view=rev Log: [WINED3D] Replace 0/0, 1/0 with NAN and INFINITY Modified: branches/cmake-bringup/dll/directx/wine/wined3d/wined3d_private.h Modified: branches/cmake-bringup/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Wed Feb 16 12:54:58 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if(m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } } @@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if (m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } }

13 years, 10 months

[tkreuzer] 50731: [WINE] Add math.h for wine code, with NAN and INFINITY as portable constants.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Feb 16 12:53:21 2011 New Revision: 50731 URL: http://svn.reactos.org/svn/reactos?rev=50731&view=rev Log: [WINE] Add math.h for wine code, with NAN and INFINITY as portable constants. Added: branches/cmake-bringup/include/reactos/wine/math.h (with props) Added: branches/cmake-bringup/include/reactos/wine/math.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/math.h (added) +++ branches/cmake-bringup/include/reactos/wine/math.h [iso-8859-1] Wed Feb 16 12:53:21 2011 @@ -1,0 +1,26 @@ +#ifndef __WINE_MATH_H_ +#define __WINE_MATH_H_ + +#include <crt/math.h> + +#ifdef _MSC_VER +__forceinline float _NaN() +{ + unsigned long NaN = 0x7fc00000; + return *(float*)&NaN; +} +#define NAN _NaN() + +__forceinline float _Infinity() +{ + unsigned long Infinity = 0x7f800000; + return *(float*)&Infinity; +} +#define INFINITY _Infinity() + +#else +#define NAN (0.0f / 0.0f) +#define INFINITY (1.0F/0.0F) +#endif + +#endif /* __WINE_MATH_H_ */ Propchange: branches/cmake-bringup/include/reactos/wine/math.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[fireball] 50730: [RTL/DPH] - Use better names for validation information flags based on application verifier messages. - Implement a simple RtlpDphReportCorruptedBlock routine which just prints th...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 16 11:49:51 2011 New Revision: 50730 URL: http://svn.reactos.org/svn/reactos?rev=50730&view=rev Log: [RTL/DPH] - Use better names for validation information flags based on application verifier messages. - Implement a simple RtlpDphReportCorruptedBlock routine which just prints the problem description for now, without any additional info. Modified: trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=507… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Feb 16 11:49:51 2011 @@ -150,10 +150,16 @@ #define DPH_FILL_BLOCK_END 0xD0 /* Validation info flags */ -#define DPH_VALINFO_BAD_START_STAMP 0x01 -#define DPH_VALINFO_BAD_END_STAMP 0x02 -#define DPH_VALINFO_BAD_POINTER 0x04 -#define DPH_VALINFO_BAD_END_FILL 0x10 +#define DPH_VALINFO_BAD_START_STAMP 0x01 +#define DPH_VALINFO_BAD_END_STAMP 0x02 +#define DPH_VALINFO_BAD_POINTER 0x04 +#define DPH_VALINFO_BAD_PREFIX_PATTERN 0x08 +#define DPH_VALINFO_BAD_SUFFIX_PATTERN 0x10 +#define DPH_VALINFO_EXCEPTION 0x20 +#define DPH_VALINFO_1 0x40 +#define DPH_VALINFO_BAD_INFIX_PATTERN 0x80 +#define DPH_VALINFO_ALREADY_FREED 0x100 +#define DPH_VALINFO_CORRUPTED_AFTER_FREE 0x200 /* Signatures */ #define DPH_SIGNATURE 0xFFEEDDCC @@ -908,7 +914,54 @@ PVOID Block, ULONG ValidationInfo) { - UNIMPLEMENTED; + //RtlpDphGetBlockSizeFromCorruptedBlock(); + + if (ValidationInfo & DPH_VALINFO_CORRUPTED_AFTER_FREE) + { + DPRINT1("block corrupted after having been freed\n"); + } + + if (ValidationInfo & DPH_VALINFO_ALREADY_FREED) + { + DPRINT1("block already freed\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_INFIX_PATTERN) + { + DPRINT1("corrupted infix pattern for freed block\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_POINTER) + { + DPRINT1("corrupted heap pointer or using wrong heap\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_SUFFIX_PATTERN) + { + DPRINT1("corrupted suffix pattern\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_PREFIX_PATTERN) + { + DPRINT1("corrupted prefix pattern\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_START_STAMP) + { + DPRINT1("corrupted start stamp\n"); + } + + if (ValidationInfo & DPH_VALINFO_BAD_END_STAMP) + { + DPRINT1("corrupted end stamp\n"); + } + + if (ValidationInfo & DPH_VALINFO_EXCEPTION) + { + DPRINT1("exception raised while verifying block\n"); + } + + DPRINT1("Corrupted heap block %p\n", Block); } BOOLEAN NTAPI @@ -964,7 +1017,7 @@ { if (*Byte != DPH_FILL_BLOCK_END) { - *ValidationInformation |= DPH_VALINFO_BAD_END_FILL; + *ValidationInformation |= DPH_VALINFO_BAD_SUFFIX_PATTERN; SomethingWrong = TRUE; break; }

13 years, 10 months

[janderwald] 50729: - Fix msvc build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 10:51:49 2011 New Revision: 50729 URL: http://svn.reactos.org/svn/reactos?rev=50729&view=rev Log: - Fix msvc build Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Wed Feb 16 10:51:49 2011 @@ -11,6 +11,6 @@ set_entrypoint(wing32 0) -add_importlibs(wing32 user32 gdi32) +add_importlibs(wing32 user32 gdi32 msvcrt) add_dependencies(wing32 psdk) add_cab_target(wing32 1)

13 years, 10 months

[janderwald] 50728: - Fix msvc framebuf build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 10:46:02 2011 New Revision: 50728 URL: http://svn.reactos.org/svn/reactos?rev=50728&view=rev Log: - Fix msvc framebuf build Modified: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt Modified: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Wed Feb 16 10:46:02 2011 @@ -13,7 +13,7 @@ set_entrypoint(framebuf DrvEnableDriver@12) set_subsystem(framebuf native) set_image_base(framebuf 0x00010000) - +target_link_libraries(framebuf libcntpr) add_importlibs(framebuf win32k) add_dependencies(framebuf psdk bugcodes) add_cab_target(framebuf 1)

13 years, 10 months

[janderwald] 50727: - Fix vgaddi build (msvc)

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Feb 16 10:43:59 2011 New Revision: 50727 URL: http://svn.reactos.org/svn/reactos?rev=50727&view=rev Log: - Fix vgaddi build (msvc) Modified: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt Modified: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] Wed Feb 16 10:43:59 2011 @@ -20,5 +20,6 @@ set_image_base(vgaddi 0x00010000) add_importlibs(vgaddi win32k) +target_link_libraries(vgaddi libcntpr) add_dependencies(vgaddi psdk bugcodes) add_cab_target(vgaddi 1)

13 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
36
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 February 2011