Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50782: - Revert all changes made to wuapi. This doesnt work properly with gcc
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 02:27:40 2011 New Revision: 50782 URL: http://svn.reactos.org/svn/reactos?rev=50782&view=rev Log: - Revert all changes made to wuapi. This doesnt work properly with gcc 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 02:27:40 2011 @@ -23,7 +23,6 @@ add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) -target_link_libraries(wuapi uuid wine wuapi_idl_header) +target_link_libraries(wuapi uuid wine) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wuapi 1) -add_dependencies(wuapi wuapi_idl_header) 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 02:27:40 2011 @@ -97,6 +97,7 @@ wincodec.idl winsxs.idl wtypes.idl + wuapi.idl xmldom.idl xmldso.idl ctfutb.idl @@ -109,6 +110,4 @@ add_idl_headers(psdk ${SOURCE}) -add_iid_library(wuapi_idl_header wuapi.idl) - add_typelib(stdole2 stdole2.idl)

1 0

[janderwald] 50781: try fix build
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 02:16:29 2011 New Revision: 50781 URL: http://svn.reactos.org/svn/reactos?rev=50781&view=rev Log: try fix build 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 02:16:29 2011 @@ -26,4 +26,4 @@ target_link_libraries(wuapi uuid wine wuapi_idl_header) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) add_cab_target(wuapi 1) - +add_dependencies(wuapi wuapi_idl_header)

1 0

[janderwald] 50780: - Fix batt msvc build
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 01:22:32 2011 New Revision: 50780 URL: http://svn.reactos.org/svn/reactos?rev=50780&view=rev Log: - Fix batt msvc build Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Fri Feb 18 01:22:32 2011 @@ -12,6 +12,6 @@ add_importlib_target(batt.spec) -add_importlibs(batt msvcrt kernel32) +add_importlibs(batt msvcrt kernel32 ntdll) add_cab_target(batt 1)

1 0

[janderwald] 50779: - Fix pcix msvc build
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 01:09:42 2011 New Revision: 50779 URL: http://svn.reactos.org/svn/reactos?rev=50779&view=rev Log: - Fix pcix msvc build Modified: branches/cmake-bringup/drivers/bus/pcix/pci/busno.c Modified: branches/cmake-bringup/drivers/bus/pcix/pci/busno.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/pci/busno.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcix/pci/busno.c [iso-8859-1] Fri Feb 18 01:09:42 2011 @@ -20,8 +20,9 @@ NTAPI PciAreBusNumbersConfigured(IN PPCI_PDO_EXTENSION PdoExtension) { + UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; + PAGED_CODE(); - UCHAR PrimaryBus, BaseBus, SecondaryBus, SubordinateBus; /* Get all relevant bus number details */ PrimaryBus = PdoExtension->Dependent.type1.PrimaryBus;

1 0

[janderwald] 50778: - Fix linking error
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 01:06:17 2011 New Revision: 50778 URL: http://svn.reactos.org/svn/reactos?rev=50778&view=rev Log: - Fix linking error Modified: branches/cmake-bringup/drivers/bus/acpi/power.c Modified: branches/cmake-bringup/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/power.c [iso-8859-1] Fri Feb 18 01:06:17 2011 @@ -224,7 +224,7 @@ return status; } -#ifndef NDEBUG +#if !defined(NDEBUG) && !defined(_MSC_VER) PCHAR PowerMinorFunctionString (

1 0

[janderwald] 50777: - Fix xinput msvc build - Powered by Amine
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

Author: janderwald Date: Fri Feb 18 00:39:31 2011 New Revision: 50777 URL: http://svn.reactos.org/svn/reactos?rev=50777&view=rev Log: - Fix xinput msvc build - Powered by Amine Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:39:31 2011 @@ -12,5 +12,5 @@ add_library(xinput1_1 SHARED ${SOURCE}) set_module_type(xinput1_1 win32dll) -add_importlibs(xinput1_1 msvcrt kernel32) +add_importlibs(xinput1_1 msvcrt kernel32 xinput1_3) add_cab_target(xinput1_1 1) Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:39:31 2011 @@ -12,5 +12,5 @@ add_library(xinput1_2 SHARED ${SOURCE}) set_module_type(xinput1_2 win32dll) -add_importlibs(xinput1_2 msvcrt kernel32) +add_importlibs(xinput1_2 msvcrt kernel32 xinput1_3) add_cab_target(xinput1_2 1) Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:39:31 2011 @@ -11,6 +11,7 @@ add_library(xinput1_3 SHARED ${SOURCE}) +add_importlib_target(xinput1_3.spec) set_module_type(xinput1_3 win32dll) target_link_libraries(xinput1_3 wine) add_importlibs(xinput1_3 msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Fri Feb 18 00:39:31 2011 @@ -12,5 +12,5 @@ add_library(xinput9_1_0 SHARED ${SOURCE}) set_module_type(xinput9_1_0 win32dll) -add_importlibs(xinput9_1_0 msvcrt kernel32) +add_importlibs(xinput9_1_0 msvcrt kernel32 xinput1_3) add_cab_target(xinput9_1_0 1)

1 0

[janderwald] 50776: - Amine fixes msvc linking of wuapi elegantly - All complaints to him ; )
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

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)

1 0

[janderwald] 50775: - Amine wins ;)
by janderwald＠svn.reactos.org 18 Feb '11

18 Feb '11

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)

1 0

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

17 Feb '11

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

1 0

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

17 Feb '11

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

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