Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50742: - Fix batt build
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: janderwald Date: Wed Feb 16 14:12:09 2011 New Revision: 50742 URL: http://svn.reactos.org/svn/reactos?rev=50742&view=rev Log: - Fix batt build Modified: branches/cmake-bringup/dll/win32/batt/resource.h Modified: branches/cmake-bringup/dll/win32/batt/resource.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/re… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/resource.h [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/resource.h [iso-8859-1] Wed Feb 16 14:12:09 2011 @@ -1,1 +1,1 @@ -#define IDI_BATTERY 2 +#define IDI_BATTERY 2

1 0

[janderwald] 50741: - Fix atl build
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: janderwald Date: Wed Feb 16 14:09:37 2011 New Revision: 50741 URL: http://svn.reactos.org/svn/reactos?rev=50741&view=rev Log: - Fix atl build Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/atl/atl.spec Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Wed Feb 16 14:09:37 2011 @@ -17,6 +17,7 @@ registrar.c stubs.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/atliface_i.c ${CMAKE_CURRENT_BINARY_DIR}/atl.def) add_library(atl SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/atl… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] Wed Feb 16 14:09:37 2011 @@ -1,7 +1,7 @@ -1 stdcall -private DllCanUnloadNow() -2 stdcall -private DllGetClassObject(ptr ptr ptr) -3 stdcall -private DllRegisterServer() -4 stdcall -private DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 10 stdcall AtlAdvise(ptr ptr ptr ptr) 11 stdcall AtlUnadvise(ptr ptr long) 12 stdcall AtlFreeMarshalStream(ptr)

1 0

[janderwald] 50740: - Fix wined3d compilation with msvc - Does not link yet
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: janderwald Date: Wed Feb 16 13:57:06 2011 New Revision: 50740 URL: http://svn.reactos.org/svn/reactos?rev=50740&view=rev Log: - Fix wined3d compilation with msvc - Does not link yet Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/state.c branches/cmake-bringup/include/reactos/wine/wined3d.idl Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Feb 16 13:57:06 2011 @@ -46,6 +46,7 @@ volumetexture.c wined3d_main.c version.rc + ${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) if(ARCH MATCHES amd64) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/state.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/state.c [iso-8859-1] Wed Feb 16 13:57:06 2011 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Direct3D state management * * Copyright 2002 Lionel Ulmer @@ -1027,7 +1027,7 @@ fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; Modified: branches/cmake-bringup/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/wined3d.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/wined3d.idl [iso-8859-1] Wed Feb 16 13:57:06 2011 @@ -1,4 +1,4 @@ -/* +ï»¿/* * Copyright 2002-2003 The wine-d3d team * Copyright 2002-2003 Jason Edmeades * Copyright 2002-2003 Raphael Junqueira @@ -3374,7 +3374,7 @@ ); } -IWineD3D *WineDirect3DCreate(UINT dxVersion, void *parent); -IWineD3DClipper *WineDirect3DCreateClipper(void); -void wined3d_mutex_lock(void); -void wined3d_mutex_unlock(void); +IWineD3D * __stdcall WineDirect3DCreate(UINT dxVersion, void *parent); +IWineD3DClipper * __stdcall WineDirect3DCreateClipper(void); +void __stdcall wined3d_mutex_lock(void); +void __stdcall wined3d_mutex_unlock(void);

1 0

[janderwald] 50739: - Fix build ddraw
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: janderwald Date: Wed Feb 16 13:38:51 2011 New Revision: 50739 URL: http://svn.reactos.org/svn/reactos?rev=50739&view=rev Log: - Fix build ddraw Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Wed Feb 16 13:38:51 2011 @@ -30,6 +30,7 @@ vertexbuffer.c viewport.c version.rc + ${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)

1 0

[tkreuzer] 50738: [CMAKE] Fix include dir for wined3d
by tkreuzer＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: tkreuzer Date: Wed Feb 16 13:36:34 2011 New Revision: 50738 URL: http://svn.reactos.org/svn/reactos?rev=50738&view=rev Log: [CMAKE] Fix include dir for wined3d Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Feb 16 13:36:34 2011 @@ -4,7 +4,7 @@ -D_USE_MATH_DEFINES -DUSE_WIN32_OPENGL) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler()

1 0

[janderwald] 50737: Fix build d3d9
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

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

1 0

[janderwald] 50736: - Fix build d3d8
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

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})

1 0

[janderwald] 50735: - Fix build of msdmo
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

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)

1 0

[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 16 Feb '11

16 Feb '11

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

1 0

[janderwald] 50733: - Fix linker warning
by janderwald＠svn.reactos.org 16 Feb '11

16 Feb '11

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()

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