Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[janderwald] 50776: - Amine fixes msvc linking of wuapi elegantly - All complaints to him ; )

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 18 00:25:53 2011 New Revision: 50776 URL: http://svn.reactos.org/svn/reactos?rev=50776&view=rev Log: - Amine fixes msvc linking of wuapi elegantly - All complaints to him ;) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:25:53 2011 @@ -18,12 +18,12 @@ searcher.c session.c updates.c - #${REACTOS_BINARY_DIR}/include/psdk/wuapi_i.c ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) -target_link_libraries(wuapi uuid wine) +target_link_libraries(wuapi uuid wine wuapi_idl_header) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wuapi 1) + Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:25:53 2011 @@ -97,7 +97,6 @@ wincodec.idl winsxs.idl wtypes.idl - wuapi.idl xmldom.idl xmldso.idl ctfutb.idl @@ -110,4 +109,6 @@ add_idl_headers(psdk ${SOURCE}) +add_iid_library(wuapi_idl_header wuapi.idl) + add_typelib(stdole2 stdole2.idl)

13 years, 10 months

[janderwald] 50775: - Amine wins ;)

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 18 00:00:56 2011 New Revision: 50775 URL: http://svn.reactos.org/svn/reactos?rev=50775&view=rev Log: - Amine wins ;) Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:00:56 2011 @@ -5,8 +5,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine - ${REACTOS_BINARY_DIR}/include/psdk) + ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wuapi.dll wuapi.spec)

13 years, 10 months

[janderwald] 50774: - Add wuapi.idl to build - Include psdk dir for header search - Fixes wuapi compile with msvc, though doesnt link yet

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Feb 17 23:54:23 2011 New Revision: 50774 URL: http://svn.reactos.org/svn/reactos?rev=50774&view=rev Log: - Add wuapi.idl to build - Include psdk dir for header search - Fixes wuapi compile with msvc, though doesnt link yet Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Thu Feb 17 23:54:23 2011 @@ -4,7 +4,10 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_BINARY_DIR}/include/psdk) + spec2def(wuapi.dll wuapi.spec) @@ -16,6 +19,7 @@ searcher.c session.c updates.c + #${REACTOS_BINARY_DIR}/include/psdk/wuapi_i.c ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) add_library(wuapi SHARED ${SOURCE}) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Thu Feb 17 23:54:23 2011 @@ -97,6 +97,7 @@ wincodec.idl winsxs.idl wtypes.idl + wuapi.idl xmldom.idl xmldso.idl ctfutb.idl @@ -104,8 +105,7 @@ if(NOT MSVC) list(APPEND SOURCE - wbemcli.idl - wuapi.idl) + wbemcli.idl) endif() add_idl_headers(psdk ${SOURCE})

13 years, 10 months

[fireball] 50773: [RTL/DPH] - Various fixes: set NodeToAllocate member of the heap root so it could be used lated in AVL allocation routine, initialize the AvailableAllocation list. - Comment out b...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 17 22:29:49 2011 New Revision: 50773 URL: http://svn.reactos.org/svn/reactos?rev=50773&view=rev Log: [RTL/DPH] - Various fixes: set NodeToAllocate member of the heap root so it could be used lated in AVL allocation routine, initialize the AvailableAllocation list. - Comment out biased pointer checks for now, and fix biasing the AdjacencyEntry pointer (spotted by rafalh). 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] Thu Feb 17 22:29:49 2011 @@ -434,6 +434,7 @@ PVOID AddressUserData; /* Add it to the AVL busy nodes table */ + DphRoot->NodeToAllocate = DphNode; AddressUserData = RtlInsertElementGenericTableAvl(&DphRoot->BusyNodesTable, &DphNode->pUserAllocation, sizeof(ULONG_PTR), @@ -518,8 +519,8 @@ PDPH_HEAP_BLOCK Node) { /* Make sure Adjacency list pointers are biased */ - ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); - ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); + //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); + //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); /* Remove it from the list */ RemoveEntryList(&Node->AvailableEntry); @@ -529,8 +530,8 @@ DphRoot->nAvailableAllocationBytesCommitted -= Node->nVirtualBlockSize; /* Remove bias from the AdjacencyEntry pointer */ - POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Flink); - POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Blink); + Node->AdjacencyEntry.Flink = (PLIST_ENTRY)POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Flink); + Node->AdjacencyEntry.Blink = (PLIST_ENTRY)POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Blink); } VOID NTAPI @@ -720,8 +721,8 @@ } /* Make sure Adjacency list pointers are biased */ - ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); - ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); + //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink)); + //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink)); return Node; } @@ -997,7 +998,6 @@ /* Get pointer to the containing heap root record */ DphRoot = CONTAINING_RECORD(Table, DPH_HEAP_ROOT, BusyNodesTable); pBlock = DphRoot->NodeToAllocate; - ASSERT(pBlock == (PDPH_HEAP_BLOCK)(Table+1)); // FIXME: Delete once confirmed DphRoot->NodeToAllocate = NULL; ASSERT(pBlock); @@ -1348,6 +1348,7 @@ DphRoot->Seed = PerfCounter.LowPart; RtlInitializeCriticalSection(DphRoot->HeapCritSect); + InitializeListHead(&DphRoot->AvailableAllocationHead); /* Create a normal heap for this paged heap */ DphRoot->NormalHeap = RtlCreateHeap(Flags, NULL, TotalSize, CommitSize, NULL, (PRTL_HEAP_PARAMETERS)-1);

13 years, 10 months

[akhaldi] 50772: [CMAKE] - A better, albeit temporary fix for 50714 and 50716.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 17 22:12:27 2011 New Revision: 50772 URL: http://svn.reactos.org/svn/reactos?rev=50772&view=rev Log: [CMAKE] - A better, albeit temporary fix for 50714 and 50716. Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio… ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Thu Feb 17 22:12:27 2011 @@ -10,8 +10,19 @@ add_library(drmk SHARED ${SOURCE}) +if(NOT MSVC) + set_module_type(drmk kernelmodedriver) +else() + set_target_properties(drmk PROPERTIES SUFFIX ".sys") + set_subsystem(drmk native) + set_image_base(drmk 0x00010000) + add_linkerflag(drmk "/DRIVER") + add_dependencies(drmk bugcodes) + target_link_libraries(drmk msvcsup) + add_dependencies(drmk psdk buildno_header) +endif() + set_entrypoint(drmk 0) -set_target_properties(drmk PROPERTIES SUFFIX ".sys") add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec) Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Thu Feb 17 22:12:27 2011 @@ -8,6 +8,18 @@ add_library(wmilib SHARED ${SOURCE}) +if(NOT MSVC) + set_module_type(wmilib kernelmodedriver) +else() + set_target_properties(wmilib PROPERTIES SUFFIX ".sys") + set_subsystem(wmilib native) + set_image_base(wmilib 0x00010000) + add_linkerflag(wmilib "/DRIVER") + add_dependencies(wmilib bugcodes) + target_link_libraries(wmilib msvcsup) + add_dependencies(wmilib psdk buildno_header) +endif() + set_entrypoint(wmilib 0) set_target_properties(wmilib PROPERTIES SUFFIX ".sys") add_importlibs(wmilib ntoskrnl)

13 years, 10 months

[akhaldi] 50771: [CMAKE] - Fix build. Really.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Feb 17 22:11:00 2011 New Revision: 50771 URL: http://svn.reactos.org/svn/reactos?rev=50771&view=rev Log: [CMAKE] - Fix build. Really. Modified: branches/cmake-bringup/include/psdk/mstask.idl Modified: branches/cmake-bringup/include/psdk/mstask.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/msta… ============================================================================== --- branches/cmake-bringup/include/psdk/mstask.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/mstask.idl [iso-8859-1] Thu Feb 17 22:11:00 2011 @@ -59,10 +59,10 @@ cpp_quote("#define TASK_TRIGGER_FLAG_KILL_AT_DURATION_END 0x2") cpp_quote("#define TASK_TRIGGER_FLAG_DISABLED 0x4") - +#ifdef _MSC_VER cpp_quote("DEFINE_GUID(CLSID_CTaskScheduler, 0x148bd52a, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") cpp_quote("DEFINE_GUID(CLSID_CTask, 0x148bd520, 0xa2ab, 0x11ce, 0xb1,0x1f, 0x00,0xaa,0x00,0x53,0x05,0x03);") - +#endif [ local,

13 years, 10 months

[fireball] 50770: [NTOS/MM] - An accompanying change to r50768. Fixes boot.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 17 21:58:08 2011 New Revision: 50770 URL: http://svn.reactos.org/svn/reactos?rev=50770&view=rev Log: [NTOS/MM] - An accompanying change to r50768. Fixes boot. Modified: trunk/reactos/ntoskrnl/mm/ARM3/miavl.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miavl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miavl.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] Thu Feb 17 21:58:08 2011 @@ -44,7 +44,7 @@ IN PVOID Buffer, IN PVOID UserData) { - PRTL_BALANCED_LINKS CurrentNode = (PVOID)((ULONG_PTR)UserData - sizeof(LIST_ENTRY) - sizeof(RTL_BALANCED_LINKS)); + PRTL_BALANCED_LINKS CurrentNode = (PVOID)((ULONG_PTR)UserData - sizeof(RTL_BALANCED_LINKS)); ULONG_PTR StartingVpn = (ULONG_PTR)Buffer; if (StartingVpn < CurrentNode->StartingVpn) {

13 years, 10 months

[tkreuzer] 50769: Try fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 17 20:09:56 2011 New Revision: 50769 URL: http://svn.reactos.org/svn/reactos?rev=50769&view=rev Log: Try fix build Modified: branches/cmake-bringup/include/psdk/dimm.idl Modified: branches/cmake-bringup/include/psdk/dimm.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/dimm… ============================================================================== --- branches/cmake-bringup/include/psdk/dimm.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/dimm.idl [iso-8859-1] Thu Feb 17 20:09:56 2011 @@ -21,7 +21,9 @@ #endif cpp_quote("#include <imm.h>") +#ifdef _MSC_VER cpp_quote("DEFINE_GUID(CLSID_CActiveIMM, 0x4955dd33, 0xb159, 0x11d0, 0x8f,0xcf, 0x00,0xaa,0x00,0x6b,0xcc,0x59);") +#endif cpp_quote("#if 0") typedef struct {

13 years, 10 months

[fireball] 50768: [RTL/AVL] - Remove unnecessary field from TABLE_ENTRY_HEADER. Spotted by (the only in ReactOS?) user of RTL AVL tables - page heap.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 17 16:52:06 2011 New Revision: 50768 URL: http://svn.reactos.org/svn/reactos?rev=50768&view=rev Log: [RTL/AVL] - Remove unnecessary field from TABLE_ENTRY_HEADER. Spotted by (the only in ReactOS?) user of RTL AVL tables - page heap. Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5076… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Thu Feb 17 16:52:06 2011 @@ -12,7 +12,6 @@ typedef struct _TABLE_ENTRY_HEADER { RTL_BALANCED_LINKS BalancedLinks; - LIST_ENTRY ListEntry; LONGLONG UserData; } TABLE_ENTRY_HEADER, *PTABLE_ENTRY_HEADER;

13 years, 10 months

[fireball] 50767: - Fix build.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 17 15:31:19 2011 New Revision: 50767 URL: http://svn.reactos.org/svn/reactos?rev=50767&view=rev Log: - Fix build. 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] Thu Feb 17 15:31:19 2011 @@ -419,7 +419,7 @@ /* Fill with a pattern */ FillPtr = (PUCHAR)UserAllocation + Size; - RtlFillMemory(FillPtr, ROUND_UP(FillPtr, PAGE_SIZE) - FillPtr, DPH_FILL_SUFFIX); + RtlFillMemory(FillPtr, ROUND_UP(FillPtr, PAGE_SIZE) - (ULONG_PTR)FillPtr, DPH_FILL_SUFFIX); /* FIXME: Check if logging stack traces is turned on */ //if (DphRoot->ExtraFlags & @@ -1216,7 +1216,7 @@ End = (PUCHAR)ROUND_UP(Start, PAGE_SIZE); for (Byte = Start; Byte < End; Byte++) { - if (*Byte != DPH_FILL_BLOCK_END) + if (*Byte != DPH_FILL_SUFFIX) { *ValidationInformation |= DPH_VALINFO_BAD_SUFFIX_PATTERN; SomethingWrong = TRUE;

13 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
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