Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 50772: [CMAKE] - A better, albeit temporary fix for 50714 and 50716.
by akhaldi＠svn.reactos.org 17 Feb '11

17 Feb '11

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)

1 0

[akhaldi] 50771: [CMAKE] - Fix build. Really.
by akhaldi＠svn.reactos.org 17 Feb '11

17 Feb '11

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,

1 0

[fireball] 50770: [NTOS/MM] - An accompanying change to r50768. Fixes boot.
by fireball＠svn.reactos.org 17 Feb '11

17 Feb '11

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

1 0

[tkreuzer] 50769: Try fix build
by tkreuzer＠svn.reactos.org 17 Feb '11

17 Feb '11

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 {

1 0

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

17 Feb '11

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;

1 0

[fireball] 50767: - Fix build.
by fireball＠svn.reactos.org 17 Feb '11

17 Feb '11

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;

1 0

[fireball] 50766: [RTL/DPH] - Implement allocating from the page heap along with all necessary helper routines. Some minor things are left though, so it doesn't work yet. - Change some defines name...
by fireball＠svn.reactos.org 17 Feb '11

17 Feb '11

Author: fireball Date: Thu Feb 17 14:46:30 2011 New Revision: 50766 URL: http://svn.reactos.org/svn/reactos?rev=50766&view=rev Log: [RTL/DPH] - Implement allocating from the page heap along with all necessary helper routines. Some minor things are left though, so it doesn't work yet. - Change some defines names to more meaningful/readable. 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 14:46:30 2011 @@ -146,14 +146,16 @@ #define DPH_DEBUG_VERBOSE 0x04 /* DPH ExtraFlags */ -#define DPH_EXTRA_CHECK_CORRUPTED_BLOCKS 0x10 +#define DPH_EXTRA_CHECK_UNDERRUN 0x10 +#define DPH_LOG_STACK_TRACES 0x0 //FIXME: Get correct value /* Fillers */ #define DPH_FILL 0xEEEEEEEE #define DPH_FILL_START_STAMP_1 0xABCDBBBB #define DPH_FILL_START_STAMP_2 0xABCDBBBA #define DPH_FILL_END_STAMP_1 0xDCBABBBB -#define DPH_FILL_BLOCK_END 0xD0 +#define DPH_FILL_SUFFIX 0xD0 +#define DPH_FILL_INFIX 0xC0 /* Validation info flags */ #define DPH_VALINFO_BAD_START_STAMP 0x01 @@ -186,6 +188,21 @@ VOID NTAPI RtlpDphReportCorruptedBlock(PDPH_HEAP_ROOT DphRoot, ULONG Reserved, PVOID Block, ULONG ValidationInfo); +VOID NTAPI +RtlpDphRaiseException(NTSTATUS Status) +{ + EXCEPTION_RECORD Exception; + + /* Initialize exception record */ + Exception.ExceptionCode = Status; + Exception.ExceptionAddress = RtlpDphRaiseException; + Exception.ExceptionFlags = 0; + Exception.ExceptionRecord = NULL; + Exception.NumberParameters = 0; + + /* Raise the exception */ + RtlRaiseException(&Exception); +} PVOID NTAPI RtlpDphPointerFromHandle(PVOID Handle) @@ -246,6 +263,20 @@ RtlpDphEnterCriticalSection(DphRoot, Flags); /* FIXME: Validate integrity, internal lists if necessary */ +} + +VOID NTAPI +RtlpDphPostProcessing(PDPH_HEAP_ROOT DphRoot) +{ + if (!DphRoot) return; + + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + { + /* FIXME: Validate integrity, internal lists if necessary */ + } + + /* Release the lock */ + RtlpDphLeaveCriticalSection(DphRoot); } NTSTATUS NTAPI @@ -370,6 +401,53 @@ return Status; } +BOOLEAN NTAPI +RtlpDphWritePageHeapBlockInformation(PDPH_HEAP_ROOT DphRoot, PVOID UserAllocation, SIZE_T Size, SIZE_T UserSize) +{ + PDPH_BLOCK_INFORMATION BlockInfo; + PUCHAR FillPtr; + + /* Get pointer to the block info structure */ + BlockInfo = (PDPH_BLOCK_INFORMATION)UserAllocation - 1; + + /* Set up basic fields */ + BlockInfo->Heap = DphRoot; + BlockInfo->ActualSize = UserSize; + BlockInfo->RequestedSize = Size; + BlockInfo->StartStamp = DPH_FILL_START_STAMP_1; + BlockInfo->EndStamp = DPH_FILL_END_STAMP_1; + + /* Fill with a pattern */ + FillPtr = (PUCHAR)UserAllocation + Size; + RtlFillMemory(FillPtr, ROUND_UP(FillPtr, PAGE_SIZE) - FillPtr, DPH_FILL_SUFFIX); + + /* FIXME: Check if logging stack traces is turned on */ + //if (DphRoot->ExtraFlags & + + return TRUE; +} + +VOID NTAPI +RtlpDphPlaceOnBusyList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) +{ + BOOLEAN NewElement; + PVOID AddressUserData; + + /* Add it to the AVL busy nodes table */ + AddressUserData = RtlInsertElementGenericTableAvl(&DphRoot->BusyNodesTable, + &DphNode->pUserAllocation, + sizeof(ULONG_PTR), + &NewElement); + + ASSERT(AddressUserData == &DphNode->pUserAllocation); + ASSERT(NewElement == TRUE); + + /* Update heap counters */ + DphRoot->nBusyAllocations++; + DphRoot->nBusyAllocationBytesAccessible += DphNode->nVirtualAccessSize; + DphRoot->nBusyAllocationBytesCommitted += DphNode->nVirtualBlockSize; +} + VOID NTAPI RtlpDphPlaceOnPoolList(PDPH_HEAP_ROOT DphRoot, PDPH_HEAP_BLOCK DphNode) { @@ -702,6 +780,28 @@ /* Return node we found */ return Node; +} + +NTSTATUS NTAPI +RtlpDphSetProtectionBeforeUse(PDPH_HEAP_ROOT DphRoot, PUCHAR VirtualBlock, ULONG UserSize) +{ + ULONG Protection; + PVOID Base; + + // FIXME: Check this, when we should add up usersize and when we shouldn't! + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) + { + Base = VirtualBlock; + } + else + { + Base = VirtualBlock + UserSize; + } + + // FIXME: It should be different, but for now it's fine + Protection = PAGE_READWRITE; + + return RtlpDphProtectVm(Base, PAGE_SIZE, Protection); } PDPH_HEAP_BLOCK NTAPI @@ -870,9 +970,17 @@ IN PVOID FirstStruct, IN PVOID SecondStruct) { - UNIMPLEMENTED; - ASSERT(FALSE); - return 0; + ULONG_PTR FirstBlock, SecondBlock; + + FirstBlock = *((ULONG_PTR *)FirstStruct); + SecondBlock = *((ULONG_PTR *)SecondStruct); + + if (FirstBlock < SecondBlock) + return GenericLessThan; + else if (FirstBlock > SecondBlock) + return GenericGreaterThan; + + return GenericEqual; } PVOID @@ -880,9 +988,21 @@ RtlpDphAllocateNodeForTable(IN PRTL_AVL_TABLE Table, IN CLONG ByteSize) { - UNIMPLEMENTED; - ASSERT(FALSE); - return NULL; + PDPH_HEAP_BLOCK pBlock; + PDPH_HEAP_ROOT DphRoot; + + /* This mega-assert comes from a text search over Windows 2003 checked binary of ntdll.dll */ + ASSERT((ULONG_PTR)(((PRTL_BALANCED_LINKS)0)+1) + sizeof(PUCHAR) == ByteSize); + + /* 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); + + return &(pBlock->TableLinks); } VOID @@ -890,8 +1010,7 @@ RtlpDphFreeNodeForTable(IN PRTL_AVL_TABLE Table, IN PVOID Buffer) { - UNIMPLEMENTED; - ASSERT(FALSE); + /* Nothing */ } NTSTATUS NTAPI @@ -980,6 +1099,12 @@ VOID NTAPI RtlpDphInternalValidatePageHeap(PDPH_HEAP_ROOT DphRoot, PVOID Address, ULONG Value) +{ + UNIMPLEMENTED; +} + +VOID NTAPI +RtlpDphVerifyIntegrity(PDPH_HEAP_ROOT DphRoot) { UNIMPLEMENTED; } @@ -1144,6 +1269,14 @@ DPRINT1("Page heap: pid 0x%X: page heap enabled with flags 0x%X.\n", Teb->ClientId.UniqueProcess, RtlpDphGlobalFlags); return Status; +} + +BOOLEAN NTAPI +RtlpDphShouldAllocateInPageHeap(PDPH_HEAP_ROOT DphRoot, + SIZE_T Size) +{ + UNIMPLEMENTED; + return TRUE; } HANDLE NTAPI @@ -1317,7 +1450,7 @@ while (Node) { - if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_CORRUPTED_BLOCKS)) + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) { if (!RtlpDphIsPageHeapBlock(DphRoot, Node->pUserAllocation, &Value, TRUE)) { @@ -1371,7 +1504,153 @@ IN ULONG Flags, IN SIZE_T Size) { - return NULL; + PDPH_HEAP_ROOT DphRoot; + PDPH_HEAP_BLOCK Node, AllocatedNode; + BOOLEAN Biased = FALSE; + ULONG TotalSize, UserSize; + NTSTATUS Status; + SIZE_T UserActualSize; + + /* Check requested size */ + if (Size > 0x7FF00000) + { + DPRINT1("extreme size request\n"); + + /* Generate an exception if needed */ + if (Flags & HEAP_GENERATE_EXCEPTIONS) RtlpDphRaiseException(STATUS_NO_MEMORY); + + return NULL; + } + + /* Unbias the pointer if necessary */ + if (IS_BIASED_POINTER(HeapPtr)) + { + HeapPtr = (PVOID)POINTER_REMOVE_BIAS(HeapPtr); + Biased = TRUE; + } + + /* Get a pointer to the heap root */ + DphRoot = RtlpDphPointerFromHandle(HeapPtr); + if (!DphRoot) return NULL; + + /* Acquire the heap lock */ + //RtlpDphEnterCriticalSection(DphRoot, Flags); + RtlpDphPreProcessing(DphRoot, Flags); + + /* Perform internal validation if specified by flags */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE && !Biased) + { + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + } + + /* Add heap flags */ + Flags |= DphRoot->HeapFlags; + + if (!Biased && !RtlpDphShouldAllocateInPageHeap(DphRoot, Size)) + { + /* Perform allocation from a normal heap */ + ASSERT(FALSE); + } + + /* Perform heap integrity check if specified by flags */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE) + { + RtlpDphVerifyIntegrity(DphRoot); + } + + /* Calculate sizes */ + UserSize = ROUND_UP(Size + sizeof(DPH_BLOCK_INFORMATION), PAGE_SIZE); + TotalSize = UserSize + PAGE_SIZE; + + // RtlpDphAllocateNode(DphRoot); + Node = RtlpDphFindAvailableMemory(DphRoot, TotalSize, TRUE); + if (!Node) + { + DPRINT1("Page heap: Unable to allocate virtual memory\n"); + DbgBreakPoint(); + + /* Release the lock */ + RtlpDphPostProcessing(DphRoot); + + return NULL; + } + ASSERT(Node->nVirtualBlockSize >= TotalSize); + + /* Set protection */ + Status = RtlpDphSetProtectionBeforeUse(DphRoot, Node->pVirtualBlock, UserSize); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + /* Check node's size */ + if (Node->nVirtualBlockSize > TotalSize) + { + /* The block contains too much free space, reduce it */ + Node->pVirtualBlock += TotalSize; + Node->nVirtualBlockSize -= TotalSize; + DphRoot->nAvailableAllocationBytesCommitted -= TotalSize; + + AllocatedNode = RtlpDphAllocateNode(DphRoot); + ASSERT(AllocatedNode != NULL); + AllocatedNode->pVirtualBlock = Node->pVirtualBlock - TotalSize; + AllocatedNode->nVirtualBlockSize = TotalSize; + } + else + { + /* The block's size fits exactly */ + RtlpDphRemoveFromAvailableList(DphRoot, Node); + AllocatedNode = Node; + } + + /* Calculate actual user size */ + if (DphRoot->HeapFlags & HEAP_NO_ALIGNMENT) + UserActualSize = Size; + else + UserActualSize = ROUND_UP(Size, 8); + + /* Set up the block */ + AllocatedNode->nVirtualAccessSize = UserSize; + AllocatedNode->nUserActualSize = UserActualSize; + AllocatedNode->nUserRequestedSize = Size; + + if (DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN) + AllocatedNode->pUserAllocation = AllocatedNode->pVirtualBlock + PAGE_SIZE; + else + AllocatedNode->pUserAllocation = AllocatedNode->pVirtualBlock + AllocatedNode->nVirtualAccessSize - UserActualSize; + + AllocatedNode->UserValue = NULL; + AllocatedNode->UserFlags = Flags & HEAP_SETTABLE_USER_FLAGS; + + // FIXME: Don't forget about stack traces if such flag was set + AllocatedNode->StackTrace = NULL; + + /* Place it on busy list */ + RtlpDphPlaceOnBusyList(DphRoot, AllocatedNode); + + /* Zero or patter-fill memory depending on flags */ + if (Flags & HEAP_ZERO_MEMORY) + RtlZeroMemory(AllocatedNode->pUserAllocation, Size); + else + RtlFillMemory(AllocatedNode->pUserAllocation, Size, DPH_FILL_INFIX); + + /* Write DPH info */ + if (!(DphRoot->ExtraFlags & DPH_EXTRA_CHECK_UNDERRUN)) + { + RtlpDphWritePageHeapBlockInformation(DphRoot, AllocatedNode->pUserAllocation, Size, UserSize); + } + + /* Finally allocation is done, perform validation again if required */ + if (RtlpDphDebugOptions & DPH_DEBUG_INTERNAL_VALIDATE && !Biased) + { + RtlpDphInternalValidatePageHeap(DphRoot, NULL, 0); + } + + /* Release the lock */ + RtlpDphPostProcessing(DphRoot); + + /* Return pointer to user allocation */ + return AllocatedNode->pUserAllocation; } BOOLEAN NTAPI

1 0

[tkreuzer] 50765: [MSHTML] revert r50702
by tkreuzer＠svn.reactos.org 17 Feb '11

17 Feb '11

Author: tkreuzer Date: Thu Feb 17 13:40:11 2011 New Revision: 50765 URL: http://svn.reactos.org/svn/reactos?rev=50765&view=rev Log: [MSHTML] revert r50702 Modified: branches/cmake-bringup/dll/win32/mshtml/nsiface.idl Modified: branches/cmake-bringup/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/nsiface.idl [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/nsiface.idl [iso-8859-1] Thu Feb 17 13:40:11 2011 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* +/* * NOTE: * This file is not a typical idl file. Interfaces in this file are XPCOM * interfaces (NOT MSCOM!), but we generate the header file with WIDL @@ -27,7 +27,6 @@ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; -import "unknwn.idl"; cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetForm") @@ -94,50 +93,60 @@ interface IMoniker; -#define nsISupports IUnknown +[ + object, + uuid(00000000-0000-0000-c000-000000000046), + local +] +interface nsISupports +{ + nsresult QueryInterface(nsIIDRef riid, nsQIResult result); + nsrefcnt AddRef(); + nsrefcnt Release(); +} /* Currently we don't need a full declaration of these interfaces */ -typedef nsISupports *pnsISHistory; -typedef nsISupports *pnsIWidget; -typedef nsISupports *pnsIHttpHeaderVisitor; -typedef nsISupports *pnsIDOMBarProp; -typedef nsISupports *pnsIPrompt; -typedef nsISupports *pnsIAuthPrompt; -typedef nsISupports *pnsIDOMNamedNodeMap; -typedef nsISupports *pnsIDOMAttr; -typedef nsISupports *pnsIDOMDocumentType; -typedef nsISupports *pnsIDOMDOMImplementation; -typedef nsISupports *pnsIDOMCDATASection; -typedef nsISupports *pnsIDOMProcessingInstruction; -typedef nsISupports *pnsIDOMEntityReference; -typedef nsISupports *pnsIWebProgressListener; -typedef nsISupports *pnsIDOMCSSValue; -typedef nsISupports *pnsIPrintSession; -typedef nsISupports *pnsIControllerCommandTable; -typedef nsISupports *pnsIPrincipal; -typedef nsISupports *pnsIAtom; -typedef nsISupports *pnsISupportsArray; -typedef nsISupports *pnsIContentFilter; -typedef nsISupports *pnsIDOMMediaList; -typedef nsISupports *pnsIDOMHTMLTableCaptionElement; -typedef nsISupports *pnsIDOMHTMLTableSectionElement; -typedef nsISupports *pnsIDOMClientRectList; -typedef nsISupports *pnsIDOMLocation; -typedef nsISupports *pnsIDocument; -typedef nsISupports *pnsIContent; -typedef nsISupports *pnsINode; -typedef nsISupports *pnsIStyleSheet; -typedef nsISupports *pnsIStyleRule; -typedef nsISupports *pnsIVariant; -typedef nsISupports *pnsIDOMUserDataHandler; -typedef nsISupports *pnsIDocShellLoadInfo; -typedef nsISupports *pnsISHEntry; -typedef nsISupports *pnsIPresShell; -typedef nsISupports *pnsIContentViewer; -typedef nsISupports *pnsIDocumentCharsetInfo; -typedef nsISupports *pnsILayoutHistoryState; -typedef nsISupports *pnsISecureBrowserUI; -typedef nsISupports *pnsIDOMStorage; +typedef nsISupports nsISHistory; +typedef nsISupports nsIWidget; +typedef nsISupports nsIHttpHeaderVisitor; +typedef nsISupports nsIDOMBarProp; +typedef nsISupports nsIPrompt; +typedef nsISupports nsIAuthPrompt; +typedef nsISupports nsIDOMNamedNodeMap; +typedef nsISupports nsIDOMAttr; +typedef nsISupports nsIDOMDocumentType; +typedef nsISupports nsIDOMDOMImplementation; +typedef nsISupports nsIDOMCDATASection; +typedef nsISupports nsIDOMProcessingInstruction; +typedef nsISupports nsIDOMEntityReference; +typedef nsISupports nsIWebProgressListener; +typedef nsISupports nsIDOMCSSValue; +typedef nsISupports nsIPrintSession; +typedef nsISupports nsIControllerCommandTable; +typedef nsISupports nsIPrincipal; +typedef nsISupports nsIAtom; +typedef nsISupports nsISupportsArray; +typedef nsISupports nsIContentFilter; +typedef nsISupports nsIDOMMediaList; +typedef nsISupports nsIDOMHTMLTableCaptionElement; +typedef nsISupports nsIDOMHTMLTableSectionElement; +typedef nsISupports nsIDOMClientRectList; +typedef nsISupports nsIDOMLocation; +typedef nsISupports nsIDocument; +typedef nsISupports nsIContent; +typedef nsISupports nsINode; +typedef nsISupports nsIStyleSheet; +typedef nsISupports nsIStyleRule; +typedef nsISupports nsIVariant; +typedef nsISupports nsIDOMUserDataHandler; +typedef nsISupports nsIDocShellLoadInfo; +typedef nsISupports nsISHEntry; +typedef nsISupports nsIPresShell; +typedef nsISupports nsIContentViewer; +typedef nsISupports nsIDocumentCharsetInfo; +typedef nsISupports nsILayoutHistoryState; +typedef nsISupports nsISecureBrowserUI; +typedef nsISupports nsIDOMStorage; [ object, @@ -274,7 +283,7 @@ nsresult Close(); nsresult Available(PRUint32 *_retval); nsresult Read(char *aBuf, PRUint32 aCount, PRUint32 *_retval); - nsresult ReadSegments(nsresult (*aWriter)(nsIInputStream *aInStream, + nsresult ReadSegments(nsresult (*aWriter)(nsIInputStream *aInStream, void *aClosure, const char *aFromSegment, PRUint32 aToOffset, PRUint32 aCount, PRUint32 *aWriteCount), void *aClosure, PRUint32 aCount, PRUint32 *_retval); @@ -382,7 +391,7 @@ uuid(1a637020-1482-11d3-9333-00104ba0fd40), local /* FROZEN */ -] +] interface nsIStreamListener : nsIRequestObserver { nsresult OnDataAvailable(nsIRequest *aRequest, nsISupports *aContext, @@ -449,7 +458,7 @@ nsresult SetReferrer(nsIURI *aReferrer); nsresult GetRequestHeader(const nsACString *aHeader, nsACString *_retval); nsresult SetRequestHeader(const nsACString *aHeader, const nsACString *aValue, PRBool aMerge); - nsresult VisitRequestHeaders(pnsIHttpHeaderVisitor aVisitor); + nsresult VisitRequestHeaders(nsIHttpHeaderVisitor *aVisitor); nsresult GetAllowPipelining(PRBool *aAllowPipelining); nsresult SetAllowPipelining(PRBool aAllowPipelining); nsresult GetRedirectionLimit(PRUint32 *aRedirectionLimit); @@ -459,7 +468,7 @@ nsresult GetRequestSucceeded(PRBool *aRequestSucceeded); nsresult GetResponseHeader(const nsACString *header, nsACString *_retval); nsresult SetResponseHeader(const nsACString *header, const nsACString *value, PRBool merge); - nsresult VisitResponseHeaders(pnsIHttpHeaderVisitor aVisitor); + nsresult VisitResponseHeaders(nsIHttpHeaderVisitor *aVisitor); nsresult IsNoStoreResponse(PRBool *_retval); nsresult IsNoCacheResponse(PRBool *_retval); } @@ -521,7 +530,7 @@ nsresult GetCssText(nsAString *aCssText); nsresult SetCssText(const nsAString *aCssText); nsresult GetPropertyValue(const nsAString *propertyName, nsAString *_retval); - nsresult GetPropertyCSSValue(const nsAString *propertyName, pnsIDOMCSSValue *_retval); + nsresult GetPropertyCSSValue(const nsAString *propertyName, nsIDOMCSSValue **_retval); nsresult RemoveProperty(const nsAString *propertyName, nsAString *_retval); nsresult GetPropertyPriority(const nsAString *propertyName, nsAString *_retval); nsresult SetProperty(const nsAString *propertyName, const nsAString *value, @@ -558,7 +567,7 @@ nsresult GetParentStyleSheet(nsIDOMStyleSheet **aParentStyleSheet); nsresult GetHref(nsAString *aHref); nsresult GetTitle(nsAString *aTitle); - nsresult GetMedia(pnsIDOMMediaList *aMedia); + nsresult GetMedia(nsIDOMMediaList **aMedia); } [ @@ -626,8 +635,8 @@ nsresult LookupNamespaceURI(const nsAString *prefix, nsAString _retval); nsresult IsEqualNode(nsIDOMNode *arg, PRBool *_retval); nsresult GetFeature(const nsAString *feature, const nsAString *version, nsISupports **_retval); - nsresult SetUserData(const nsAString *key, pnsIVariant data, pnsIDOMUserDataHandler handler, pnsIVariant *_retval); - nsresult GetUserData(const nsAString *key, pnsIVariant *_retval); + nsresult SetUserData(const nsAString *key, nsIVariant *data, nsIDOMUserDataHandler *handler, nsIVariant **_retval); + nsresult GetUserData(const nsAString *key, nsIVariant **_retval); } [ @@ -663,7 +672,7 @@ nsresult GetLastChild(nsIDOMNode **aLastChild); nsresult GetPreviousSibling(nsIDOMNode **aPreviousSibling); nsresult GetNextSibling(nsIDOMNode **aNextSibling); - nsresult GetAttributes(pnsIDOMNamedNodeMap *aAttributes); + nsresult GetAttributes(nsIDOMNamedNodeMap **aAttributes); nsresult GetOwnerDocument(nsIDOMDocument **aOwnerDocument); nsresult InsertBefore(nsIDOMNode *newChild, nsIDOMNode *refChild, nsIDOMNode **_retval); nsresult ReplaceChild(nsIDOMNode *newChild, nsIDOMNode *oldChild, nsIDOMNode **_retval); @@ -692,9 +701,9 @@ nsresult GetAttribute(const nsAString *name, nsAString *_retval); nsresult SetAttribute(const nsAString *name, const nsAString *value); nsresult RemoveAttribute(const nsAString *name); - nsresult GetAttributeNode(const nsAString *name, pnsIDOMAttr *_retval); - nsresult SetAttributeNode(pnsIDOMAttr newAttr, pnsIDOMAttr *_retval); - nsresult RemoveAttributeNode(pnsIDOMAttr oldAttr, pnsIDOMAttr *_retval); + nsresult GetAttributeNode(const nsAString *name, nsIDOMAttr **_retval); + nsresult SetAttributeNode(nsIDOMAttr *newAttr, nsIDOMAttr **_retval); + nsresult RemoveAttributeNode(nsIDOMAttr *oldAttr, nsIDOMAttr **_retval); nsresult GetElementsByTagName(const nsAString *name, nsIDOMNodeList **_retval); nsresult GetAttributeNS(const nsAString *namespaceURI, const nsAString *localName, nsAString *_retval); @@ -702,8 +711,8 @@ const nsAString *value); nsresult RemoveAttributeNS(const nsAString *namespaceURI, const nsAString *localName); nsresult GetAttributeNodeNS(const nsAString *namespaceURI, const nsAString *localName, - pnsIDOMAttr *_retval); - nsresult SetAttributeNodeNS(pnsIDOMAttr newAttr, pnsIDOMAttr *_retval); + nsIDOMAttr **_retval); + nsresult SetAttributeNodeNS(nsIDOMAttr *newAttr, nsIDOMAttr **_retval); nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNodeList **_retval); nsresult HasAttribute(const nsAString *name, PRBool *_retval); @@ -747,7 +756,7 @@ interface nsIDOMNSElement : nsISupports { nsresult GetElementsByClassName(const nsAString *classes, nsIDOMNodeList **_retval); - nsresult GetClientRects(pnsIDOMClientRectList *_retval); + nsresult GetClientRects(nsIDOMClientRectList **_retval); nsresult GetBoundingClientRect(nsIDOMClientRect **_retval); nsresult GetScrollTop(PRInt32 *aScrollTop); nsresult SetScrollTop(PRInt32 aScrollTop); @@ -909,24 +918,24 @@ ] interface nsIDOMDocument : nsIDOMNode { - nsresult GetDoctype(pnsIDOMDocumentType *aDoctype); - nsresult GetImplementation(pnsIDOMDOMImplementation *aImplementation); + nsresult GetDoctype(nsIDOMDocumentType **aDoctype); + nsresult GetImplementation(nsIDOMDOMImplementation **aImplementation); nsresult GetDocumentElement(nsIDOMElement **aDocumentElement); nsresult CreateElement(const nsAString *tagName, nsIDOMElement **_retval); nsresult CreateDocumentFragment(nsIDOMDocumentFragment **_retval); nsresult CreateTextNode(const nsAString *data, nsIDOMText **_retval); nsresult CreateComment(const nsAString *data, nsIDOMComment **_retval); - nsresult CreateCDATASection(const nsAString *data, pnsIDOMCDATASection *_retval); + nsresult CreateCDATASection(const nsAString *data, nsIDOMCDATASection **_retval); nsresult CreateProcessingInstruction(const nsAString *target, const nsAString *data, - pnsIDOMProcessingInstruction *_retval); - nsresult CreateAttribute(const nsAString *name, pnsIDOMAttr *_retval); - nsresult CreateEntityReference(const nsAString *name, pnsIDOMEntityReference *_retval); + nsIDOMProcessingInstruction **_retval); + nsresult CreateAttribute(const nsAString *name, nsIDOMAttr **_retval); + nsresult CreateEntityReference(const nsAString *name, nsIDOMEntityReference **_retval); nsresult GetElementsByTagName(const nsAString *tagname, nsIDOMNodeList **_retval); nsresult ImportNode(nsIDOMNode *importedNode, PRBool deep, nsIDOMNode **_retval); nsresult CreateElementNS(const nsAString *namespaceURI, const nsAString *qualifiedName, nsIDOMElement **_retval); nsresult CreateAttributeNS(const nsAString *namespaceURI, const nsAString *qualifiedName, - pnsIDOMAttr *_retval); + nsIDOMAttr **_retval); nsresult GetElementsByTagNameNS(const nsAString *namespaceURI, const nsAString *localName, nsIDOMNodeList **_retval); nsresult GetElementById(const nsAString *elementId, nsIDOMElement **_retval); @@ -943,7 +952,7 @@ nsresult GetCharacterSet(nsAString *aCharacterSet); nsresult GetDir(nsAString *aDir); nsresult SetDir(const nsAString *aDir); - nsresult GetLocation(pnsIDOMLocation *aLocation); + nsresult GetLocation(nsIDOMLocation **aLocation); nsresult GetTitle(nsAString *aTitle); nsresult SetTitle(const nsAString *aTitle); nsresult GetContentType(nsAString *aContentType); @@ -1188,7 +1197,7 @@ nsresult GetDocument(nsIDOMDocument **aDocument); nsresult GetParent(nsIDOMWindow **aParent); nsresult GetTop(nsIDOMWindow **aTop); - nsresult GetScrollbars(pnsIDOMBarProp *aScrollbars); + nsresult GetScrollbars(nsIDOMBarProp **aScrollbars); nsresult GetFrames(nsIDOMWindowCollection **aFrames); nsresult GetName(nsAString *aName); nsresult SetName(const nsAString *aName); @@ -1506,12 +1515,12 @@ ] interface nsIDOMHTMLTableElement : nsIDOMHTMLElement { - nsresult GetCaption(pnsIDOMHTMLTableCaptionElement *aCaption); - nsresult SetCaption(pnsIDOMHTMLTableCaptionElement aCaption); - nsresult GetTHead(pnsIDOMHTMLTableSectionElement *aTHead); - nsresult SetTHead(pnsIDOMHTMLTableSectionElement aTHead); - nsresult GetTFoot(pnsIDOMHTMLTableSectionElement *aTFoot); - nsresult SetTFoot(pnsIDOMHTMLTableSectionElement aTFoot); + nsresult GetCaption(nsIDOMHTMLTableCaptionElement **aCaption); + nsresult SetCaption(nsIDOMHTMLTableCaptionElement *aCaption); + nsresult GetTHead(nsIDOMHTMLTableSectionElement **aTHead); + nsresult SetTHead(nsIDOMHTMLTableSectionElement *aTHead); + nsresult GetTFoot(nsIDOMHTMLTableSectionElement **aTFoot); + nsresult SetTFoot(nsIDOMHTMLTableSectionElement *aTFoot); nsresult GetRows(nsIDOMHTMLCollection **aRows); nsresult GetTBodies(nsIDOMHTMLCollection **aTBodies); nsresult GetAlign(nsAString *aAlign); @@ -1698,7 +1707,7 @@ ] interface nsIBaseWindow : nsISupports { - nsresult InitWindow(nativeWindow parentNativeWindow, pnsIWidget parentWidget, PRInt32 x, + nsresult InitWindow(nativeWindow parentNativeWindow, nsIWidget *parentWidget, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy); nsresult Create(); nsresult Destroy(); @@ -1709,8 +1718,8 @@ nsresult SetPositionAndSize(PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy, PRBool fRepaint); nsresult GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt32 *cx, PRInt32 *cy); nsresult Repaint(PRBool force); - nsresult GetParentWidget(pnsIWidget *aParentWidget); - nsresult SetParentWidget(pnsIWidget aParentWidget); + nsresult GetParentWidget(nsIWidget **aParentWidget); + nsresult SetParentWidget(nsIWidget *aParentWidget); nsresult GetParentNativeWindow(nativeWindow *aParentNativeWindow); nsresult SetParentNativeWindow(nativeWindow aParentNativeWindow); nsresult GetVisibility(PRBool *aVisibility); @@ -1719,7 +1728,7 @@ nsresult SetEnabled(PRBool aEnabled); nsresult GetBlurSuppression(PRBool *aBlurSuppression); nsresult SetBlurSuppression(PRBool aBlurSuppression); - nsresult GetMainWidget(pnsIWidget *aMainWidget); + nsresult GetMainWidget(nsIWidget **aMainWidget); nsresult SetFocus(); nsresult GetTitle(PRUnichar **aTitle); nsresult SetTitle(const PRUnichar *aTitle); @@ -1748,8 +1757,8 @@ nsresult GetDocument(nsIDOMDocument **aDocument); nsresult GetCurrentURI(nsIURI **aCurrentURI); nsresult GetReferringURI(nsIURI **aReferringURI); - nsresult GetSessionHistory(pnsISHistory *aSessionHistory); - nsresult SetSessionHistory(pnsISHistory aSessionHistory); + nsresult GetSessionHistory(nsISHistory **aSessionHistory); + nsresult SetSessionHistory(nsISHistory *aSessionHistory); } [ @@ -1760,8 +1769,8 @@ ] interface nsIWebProgress : nsISupports { - nsresult AddProgressListener(pnsIWebProgressListener aListener, PRUint32 aNotifyMask); - nsresult RemoveProgressListener(pnsIWebProgressListener aListener); + nsresult AddProgressListener(nsIWebProgressListener *aListener, PRUint32 aNotifyMask); + nsresult RemoveProgressListener(nsIWebProgressListener *aListener); nsresult GetDOMWindow(nsIDOMWindow **aDOMWindow); nsresult GetIsLoadingDocument(PRBool *aIsLoadingDocument); } @@ -1782,8 +1791,8 @@ nsresult GetEffectivePageSize(double *aWidth, double *aHeight); nsresult Clone(nsIPrintSettings **_retval); nsresult Assign(nsIPrintSettings *aPS); - nsresult GetPrintSession(pnsIPrintSession *aPrintSession); - nsresult SetPrintSession(pnsIPrintSession aPrintSession); + nsresult GetPrintSession(nsIPrintSession **aPrintSession); + nsresult SetPrintSession(nsIPrintSession *aPrintSession); nsresult GetStartPageRange(PRInt32 *aStartPageRange); nsresult SetStartPageRange(PRInt32 aStartPageRange); nsresult GetEndPageRange(PRInt32 *aEndPageRange); @@ -1921,9 +1930,9 @@ nsresult GetIsIFrameSelected(PRBool *aIsIFrameSelected); nsresult GetIsRangeSelection(PRBool *aIsRangeSelection); nsresult GetPrintPreviewNumPages(PRInt32 *aPrintPreviewNumPages); - nsresult Print(nsIPrintSettings *aThePrintSettings, pnsIWebProgressListener aWPListener); + nsresult Print(nsIPrintSettings *aThePrintSettings, nsIWebProgressListener *aWPListener); nsresult PrintPreview(nsIPrintSettings *aThePrintSettings, nsIDOMWindow *aChildDOMWin, - pnsIWebProgressListener aWPListener); + nsIWebProgressListener *aWPListener); nsresult PrintPreviewNavigate(PRInt16 aNavType, PRInt32 aPageNum); nsresult Cancel(); nsresult EnumerateDocumentNames(PRUint32 *aCount, PRUnichar ***aResult); @@ -2421,8 +2430,8 @@ nsresult RegisterNotification(nsIObserver *aObserver); nsresult UnregisterNotification(nsIObserver *aObserver); nsresult GetWindowEnumerator(nsISimpleEnumerator **_retval); - nsresult GetNewPrompter(nsIDOMWindow *aParent, pnsIPrompt *_retval); - nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, pnsIAuthPrompt *_retval); + nsresult GetNewPrompter(nsIDOMWindow *aParent, nsIPrompt **_retval); + nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, nsIAuthPrompt **_retval); nsresult SetWindowCreator(nsIWindowCreator *creator); nsresult GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome **_retval); nsresult GetWindowByName(const PRUnichar *aTargetName, nsIDOMWindow *aCurrentWindow, @@ -2506,7 +2515,7 @@ ] interface nsIControllerContext : nsISupports { - nsresult Init(pnsIControllerCommandTable aCommandTable); + nsresult Init(nsIControllerCommandTable *aCommandTable); nsresult SetCommandContext(nsISupports *aCommandContext); } @@ -2535,13 +2544,13 @@ nsresult Init(PRUint32 flags, PRUint32 aWrapColumn, const char* aCharSet, PRBool aIsCopying, PRBool aIsWholeDocument); nsresult AppendText(nsIDOMText *aText, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendCDATASection(pnsIDOMCDATASection aCDATASection, PRInt32 aStartOffset, + nsresult AppendCDATASection(nsIDOMCDATASection *aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendProcessingInstruction(pnsIDOMProcessingInstruction aPI, PRInt32 aStartOffset, + nsresult AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); nsresult AppendComment(nsIDOMComment *aComment, PRInt32 aStartOffset, PRInt32 aEndOffset, nsAString *aStr); - nsresult AppendDoctype(pnsIDOMDocumentType aDoctype, nsAString *aStr); + nsresult AppendDoctype(nsIDOMDocumentType *aDoctype, nsAString *aStr); nsresult AppendElementStart(nsIDOMElement *aElement, nsIDOMElement *aOriginalElement, nsAString *aStr); nsresult AppendElementEnd(nsIDOMElement *aElement, nsAString *aStr); @@ -2592,7 +2601,7 @@ nsresult CanRedo([out] PRBool *isEnabled, [out] PRBool *canRedo); nsresult BeginTransaction(); nsresult EndTransaction(); - nsresult BeginPlaceHolderTransaction([in] pnsIAtom name); + nsresult BeginPlaceHolderTransaction([in] nsIAtom *name); nsresult EndPlaceHolderTransaction(); nsresult ShouldTxnSetSelection([out] PRBool *_retval); nsresult SetShouldTxnSetSelection([in] PRBool should); @@ -2645,15 +2654,15 @@ ] interface nsIHTMLEditor : nsISupports { - nsresult AddDefaultProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult RemoveDefaultProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult AddDefaultProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult RemoveDefaultProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); nsresult RemoveAllDefaultProperties(); - nsresult SetCSSInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult SetInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); - nsresult GetInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll); - nsresult GetInlinePropertyWithAttrValue([in] pnsIAtom aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll, [out] nsAString *_retval); + nsresult SetCSSInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult SetInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue); + nsresult GetInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll); + nsresult GetInlinePropertyWithAttrValue([in] nsIAtom *aProperty, [in] nsAString *aAttribute, [in] nsAString *aValue, [out] PRBool *aFirst, [out] PRBool *aAny, [out] PRBool *aAll, [out] nsAString *_retval); nsresult RemoveAllInlineProperties(); - nsresult RemoveInlineProperty([in] pnsIAtom aProperty, [in] nsAString *aAttribute); + nsresult RemoveInlineProperty([in] nsIAtom *aProperty, [in] nsAString *aAttribute); nsresult IncreaseFontSize(); nsresult DecreaseFontSize(); nsresult CanDrag([in] nsIDOMEvent *aEvent, [out] PRBool *_retval); @@ -2692,11 +2701,11 @@ nsresult SetBackgroundColor([in] nsAString *aColor); nsresult SetBodyAttribute([in] nsAString *aAttr, [in] nsAString *aValue); nsresult IgnoreSpuriousDragEvent([in] PRBool aIgnoreSpuriousDragEvent); - nsresult GetLinkedObjects([out] pnsISupportsArray *_retval); + nsresult GetLinkedObjects([out] nsISupportsArray **_retval); nsresult GetIsCSSEnabled([out] PRBool *_retval); nsresult SetIsCSSEnabled([in] PRBool prb); - nsresult AddInsertionListener([in] pnsIContentFilter inFilter); - nsresult RemoveInsertionListener([in] pnsIContentFilter inFilter); + nsresult AddInsertionListener([in] nsIContentFilter *inFilter); + nsresult RemoveInsertionListener([in] nsIContentFilter *inFilter); nsresult CreateAnonymousElement([in] nsAString *aTag, [in] nsIDOMNode *aParentNode, [in] nsAString *aAnonClass, [in] PRBool aIsCreatedHidden, [out] nsIDOMElement **_retval); nsresult GetSelectionContainer([out] nsIDOMElement **_retval); nsresult CheckSelectionStateForAnonymousButtons([in] nsISelection *aSelection); @@ -2713,24 +2722,24 @@ ] interface nsIDocShell : nsISupports { - nsresult LoadURI(nsIURI *uri, pnsIDocShellLoadInfo loadInfo, PRUint32 aLoadFlags, PRBool firstParty); + nsresult LoadURI(nsIURI *uri, nsIDocShellLoadInfo *loadInfo, PRUint32 aLoadFlags, PRBool firstParty); nsresult LoadStream(nsIInputStream *aStream, nsIURI *aURI, const nsACString *aContentType, - const nsACString *aContentCharset, pnsIDocShellLoadInfo aLoadInfo); + const nsACString *aContentCharset, nsIDocShellLoadInfo *aLoadInfo); nsresult InternalLoad(nsIURI *aURI, nsIURI *aReferrer, nsISupports *aOwner, PRUint32 aFlags, const PRUnichar *aWindowTarget, const char *aTypeHint, nsIInputStream *aPostDataStream, nsIInputStream *aHeadersStream, PRUint32 aLoadFlags, - pnsISHEntry aSHEntry, PRBool firstParty, nsIDocShell **aDocShell, nsIRequest **aRequest); - nsresult CreateLoadInfo(pnsIDocShellLoadInfo *loadInfo); + nsISHEntry *aSHEntry, PRBool firstParty, nsIDocShell **aDocShell, nsIRequest **aRequest); + nsresult CreateLoadInfo(nsIDocShellLoadInfo **loadInfo); nsresult PrepareForNewContentModel(); nsresult SetCurrentURI(nsIURI *aURI); nsresult FirePageHideNotification(PRBool isUnload); nsresult GetPresContext(void /*nsPresContext*/ **aPresContext); - nsresult GetPresShell(pnsIPresShell *aPresShell); - nsresult GetEldestPresShell(pnsIPresShell *aEldestPresShell); - nsresult GetContentViewer(pnsIContentViewer *aContentViewer); + nsresult GetPresShell(nsIPresShell **aPresShell); + nsresult GetEldestPresShell(nsIPresShell **aEldestPresShell); + nsresult GetContentViewer(nsIContentViewer **aContentViewer); nsresult GetChromeEventHandler(nsIDOMEventTarget **aChromeEventHandler); nsresult SetChromeEventHandler(nsIDOMEventTarget *aChromeEventHandler); - nsresult GetDocumentCharsetInfo(pnsIDocumentCharsetInfo *aDocumentCharsetInfo); - nsresult SetDocumentCharsetInfo(pnsIDocumentCharsetInfo aDocumentCharsetInfo); + nsresult GetDocumentCharsetInfo(nsIDocumentCharsetInfo **aDocumentCharsetInfo); + nsresult SetDocumentCharsetInfo(nsIDocumentCharsetInfo *aDocumentCharsetInfo); nsresult GetAllowPlugins(PRBool *aAllowPlugins); nsresult SetAllowPlugins(PRBool aAllowPlugins); nsresult GetAllowJavascript(PRBool *aAllowJavascript); @@ -2760,14 +2769,14 @@ nsresult SetLoadType(PRUint32 aLoadType); nsresult IsBeingDestroyed(PRBool *_retval); nsresult GetIsExecutingOnLoadHandler(PRBool *aIsExecutingOnLoadHandler); - nsresult GetLayoutHistoryState(pnsILayoutHistoryState *aLayoutHistoryState); - nsresult SetLayoutHistoryState(pnsILayoutHistoryState aLayoutHistoryState); + nsresult GetLayoutHistoryState(nsILayoutHistoryState **aLayoutHistoryState); + nsresult SetLayoutHistoryState(nsILayoutHistoryState *aLayoutHistoryState); nsresult GetShouldSaveLayoutState(PRBool *aShouldSaveLayoutState); - nsresult GetSecurityUI(pnsISecureBrowserUI *aSecurityUI); - nsresult SetSecurityUI(pnsISecureBrowserUI aSecurityUI); + nsresult GetSecurityUI(nsISecureBrowserUI **aSecurityUI); + nsresult SetSecurityUI(nsISecureBrowserUI *aSecurityUI); nsresult SuspendRefreshURIs(); nsresult ResumeRefreshURIs(); - nsresult BeginRestore(pnsIContentViewer viewer, PRBool top); + nsresult BeginRestore(nsIContentViewer *viewer, PRBool top); nsresult FinishRestore(); nsresult GetRestoringDocument(PRBool *aRestoringDocument); nsresult GetUseErrorPages(PRBool *aUseErrorPages); @@ -2775,9 +2784,9 @@ nsresult GetPreviousTransIndex(PRInt32 *aPreviousTransIndex); nsresult GetLoadedTransIndex(PRInt32 *aLoadedTransIndex); nsresult HistoryPurged(PRInt32 numEntries); - nsresult GetSessionStorageForURI(nsIURI *uri, pnsIDOMStorage *_retval); - nsresult GetSessionStorageForPrincipal(pnsIPrincipal principal, PRBool create, pnsIDOMStorage *_retval); - nsresult AddSessionStorage(pnsIPrincipal principal, pnsIDOMStorage storage); + nsresult GetSessionStorageForURI(nsIURI *uri, nsIDOMStorage **_retval); + nsresult GetSessionStorageForPrincipal(nsIPrincipal *principal, PRBool create, nsIDOMStorage **_retval); + nsresult AddSessionStorage(nsIPrincipal *principal, nsIDOMStorage *storage); nsresult GetCurrentDocumentChannel(nsIChannel **aCurrentDocumentChannel); nsresult SetChildOffset(PRUint32 offset); nsresult GetIsInUnload(PRBool *aIsInUnload); @@ -2795,21 +2804,21 @@ ] interface nsIMutationObserver : nsISupports { - void CharacterDataWillChange(pnsIDocument aDocument, pnsIContent aContent, + void CharacterDataWillChange(nsIDocument *aDocument, nsIContent *aContent, void /*CharacterDataChangeInfo*/ *aInfo); - void CharacterDataChanged(pnsIDocument aDocument, pnsIContent aContent, + void CharacterDataChanged(nsIDocument *aDocument, nsIContent *aContent, void /*CharacterDataChangeInfo*/ *aInfo); - void AttributeWillChange(pnsIDocument aDocument, pnsIContent aContent, PRInt32 aNameSpaceID, - pnsIAtom aAttribute, PRInt32 aModType); - void AttributeChanged(pnsIDocument aDocument, pnsIContent aContent, PRInt32 aNameSpaceID, - pnsIAtom aAttribute, PRInt32 aModType, PRUint32 aStateMask); - void ContentAppended(pnsIDocument aDocument, pnsIContent aContainer, PRInt32 aNewIndexInContainer); - void ContentInserted(pnsIDocument aDocument, pnsIContent aContainer, pnsIContent aChild, + void AttributeWillChange(nsIDocument *aDocument, nsIContent * aContent, PRInt32 aNameSpaceID, + nsIAtom *aAttribute, PRInt32 aModType); + void AttributeChanged(nsIDocument *aDocument, nsIContent *aContent, PRInt32 aNameSpaceID, + nsIAtom *aAttribute, PRInt32 aModType, PRUint32 aStateMask); + void ContentAppended(nsIDocument *aDocument, nsIContent *aContainer, PRInt32 aNewIndexInContainer); + void ContentInserted(nsIDocument *aDocument, nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer); - void ContentRemoved(pnsIDocument aDocument, pnsIContent aContainer, pnsIContent aChild, + void ContentRemoved(nsIDocument *aDocument, nsIContent *aContainer, nsIContent *aChild, PRInt32 aIndexInContainer); - void NodeWillBeDestroyed(const pnsINode aNode); - void ParentChainChanged(pnsIContent aContent); + void NodeWillBeDestroyed(const nsINode *aNode); + void ParentChainChanged(nsIContent *aContent); } [ @@ -2822,20 +2831,20 @@ { typedef int nsUpdateType; - void BeginUpdate(pnsIDocument aDocument, nsUpdateType aUpdateType); - void EndUpdate(pnsIDocument aDocument, nsUpdateType aUpdateType); - void BeginLoad(pnsIDocument aDocument); - void EndLoad(pnsIDocument aDocument); - void ContentStatesChanged(pnsIDocument aDocument, pnsIContent aContent1, pnsIContent aContent2, + void BeginUpdate(nsIDocument *aDocument, nsUpdateType aUpdateType); + void EndUpdate(nsIDocument *aDocument, nsUpdateType aUpdateType); + void BeginLoad(nsIDocument *aDocument); + void EndLoad(nsIDocument *aDocument); + void ContentStatesChanged(nsIDocument *aDocument, nsIContent *aContent1, nsIContent *aContent2, PRInt32 aStateMask); - void StyleSheetAdded(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, PRBool aDocumentSheet); - void StyleSheetRemoved(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, PRBool aDocumentSheet); - void StyleSheetApplicableStateChanged(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, + void StyleSheetAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); + void StyleSheetRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aDocumentSheet); + void StyleSheetApplicableStateChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, PRBool aApplicable); - void StyleRuleChanged(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aOldStyleRule, - pnsIStyleRule aNewStyleRule); - void StyleRuleAdded(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aStyleRule); - void StyleRuleRemoved(pnsIDocument aDocument, pnsIStyleSheet aStyleSheet, pnsIStyleRule aStyleRule); - void BindToDocument(pnsIDocument aDocument, pnsIContent aContent); - void DoneAddingChildren(pnsIContent aContent, PRBool aHaveNotified); -} + void StyleRuleChanged(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aOldStyleRule, + nsIStyleRule *aNewStyleRule); + void StyleRuleAdded(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); + void StyleRuleRemoved(nsIDocument *aDocument, nsIStyleSheet *aStyleSheet, nsIStyleRule *aStyleRule); + void BindToDocument(nsIDocument *aDocument, nsIContent *aContent); + void DoneAddingChildren(nsIContent *aContent, PRBool aHaveNotified); +}

1 0

[tkreuzer] 50764: [WIN32K] In IntEngGradientFillRect, take the translate value into account, that we need when drawing happens on an intermediate surface. Patch by Thomas Faber (ThFabba at gmx dot ...
by tkreuzer＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: tkreuzer Date: Wed Feb 16 23:29:50 2011 New Revision: 50764 URL: http://svn.reactos.org/svn/reactos?rev=50764&view=rev Log: [WIN32K] In IntEngGradientFillRect, take the translate value into account, that we need when drawing happens on an intermediate surface. Patch by Thomas Faber (ThFabba at gmx dot de) See issue #5805 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Wed Feb 16 23:29:50 2011 @@ -130,7 +130,7 @@ { Color = XLATEOBJ_iXlate(pxlo, RGB(c[0], c[1], c[2])); DibFunctionsForBitmapFormat[psoOutput->iBitmapFormat].DIB_VLine( - psoOutput, y, FillRect.top, FillRect.bottom, Color); + psoOutput, y + Translate.x, FillRect.top + Translate.y, FillRect.bottom + Translate.y, Color); } HVSTEPCOL(0); HVSTEPCOL(1); @@ -158,7 +158,7 @@ { Color = XLATEOBJ_iXlate(pxlo, RGB(c[0], c[1], c[2])); DibFunctionsForBitmapFormat[psoOutput->iBitmapFormat].DIB_HLine( - psoOutput, FillRect.left, FillRect.right, y, Color); + psoOutput, FillRect.left + Translate.x, FillRect.right + Translate.x, y + Translate.y, Color); } HVSTEPCOL(0); HVSTEPCOL(1); @@ -187,7 +187,7 @@ for(; FillRect.top < FillRect.bottom; FillRect.top++) { DibFunctionsForBitmapFormat[psoOutput->iBitmapFormat].DIB_HLine( - psoOutput, FillRect.left, FillRect.right, FillRect.top, Color); + psoOutput, FillRect.left + Translate.x, FillRect.right + Translate.x, FillRect.top + Translate.y, Color); } } } @@ -318,7 +318,7 @@ //ULONG i; POINTL Translate; INTENG_ENTER_LEAVE EnterLeave; - RECTL FillRect; + RECTL FillRect = { 0, 0, 0, 0 }; //ULONG Color; //BOOL sx[NLINES];

1 0

[tkreuzer] 50763: [HEADERS] - Remove include/reactos and include/reactos/wine include directories for host tools - Add include/host/wine directory - Move wpp.h to include/host/wine - Put a seperate...
by tkreuzer＠svn.reactos.org 16 Feb '11

16 Feb '11

Author: tkreuzer Date: Wed Feb 16 22:48:56 2011 New Revision: 50763 URL: http://svn.reactos.org/svn/reactos?rev=50763&view=rev Log: [HEADERS] - Remove include/reactos and include/reactos/wine include directories for host tools - Add include/host/wine directory - Move wpp.h to include/host/wine - Put a seperate config.h into include/host - Add a dummy debug.h and guiddef.h, wine/list.h, wine/port.h and wine/rpcfc.h that link to the original ones to include/host Added: branches/cmake-bringup/include/host/config.h (with props) branches/cmake-bringup/include/host/debug.h (with props) branches/cmake-bringup/include/host/guiddef.h (with props) branches/cmake-bringup/include/host/wine/ (with props) branches/cmake-bringup/include/host/wine/list.h (with props) branches/cmake-bringup/include/host/wine/port.h (with props) branches/cmake-bringup/include/host/wine/rpcfc.h (with props) branches/cmake-bringup/include/host/wine/wpp.h - copied unchanged from r50761, branches/cmake-bringup/include/reactos/wine/wpp.h Removed: branches/cmake-bringup/include/reactos/wine/wpp.h 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] Wed Feb 16 22:48:56 2011 @@ -46,8 +46,6 @@ ${REACTOS_SOURCE_DIR}/tools/unicode include include/host - include/reactos - include/reactos/wine ${REACTOS_BINARY_DIR}/include) add_subdirectory(tools) Added: branches/cmake-bringup/include/host/config.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/conf… ============================================================================== --- branches/cmake-bringup/include/host/config.h (added) +++ branches/cmake-bringup/include/host/config.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,140 @@ +/* include/config.h. Generated by configure. */ +/* include/config.h.in. Generated from configure.ac by autoheader. */ + +#include "reactos/buildno.h" + +#define __WINE_CONFIG_H + +/* Define to 1 if you have the <float.h> header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if the system has the type `long long'. */ +#define HAVE_LONG_LONG 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if the system has the type `mode_t'. */ +#define HAVE_MODE_T 1 + +/* Define to 1 if the system has the type `size_t'. */ +#define HAVE_SIZE_T 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if the system has the type `ssize_t'. */ +#define HAVE_SSIZE_T 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#if !defined(_WIN32) && !defined(_WIN64) +#define HAVE_STRCASECMP 1 +#endif + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#if !defined(_WIN32) && !defined(_WIN64) +#define HAVE_STRNCASECMP 1 +#endif + +/* Define to 1 if you have the <tiffio.h> header file. */ +#define HAVE_TIFFIO_H 1 + +/* Define to 1 if you have the <sys/param.h> header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +#ifndef _MSC_VER + #define HAVE_SYS_TIME_H 1 +#endif + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the timezone variable */ +#define HAVE_TIMEZONE 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#if !defined(_MSC_VER) +#define HAVE_UNISTD_H 1 +#endif + +/* Define to 1 if you have the <utime.h> header file. */ +#define HAVE_UTIME_H 1 + +/* Define if we have va_copy */ +#define HAVE_VA_COPY 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `_snprintf' function. */ +#define HAVE__SNPRINTF 1 + +/* Define to 1 if you have the `_stricmp' function. */ +#if defined(_WIN32) || defined(_WIN64) +#define HAVE__STRICMP 1 +#endif + +/* Define to 1 if you have the `_strnicmp' function. */ +#if defined(_WIN32) || defined(_WIN64) +#define HAVE__STRNICMP 1 +#endif + +/* Define to 1 if you have the `_vsnprintf' function. */ +#define HAVE__VSNPRINTF 1 + +/* Define if we have __va_copy */ +#define HAVE___VA_COPY 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "ros-dev(a)reactos.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "ReactOS" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "ReactOS" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION KERNEL_VERSION_STR + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the X Window System is missing or not being used. */ +#define X_DISPLAY_MISSING 1 + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + +#if defined(_MSC_VER) +#define inline __inline +#endif Propchange: branches/cmake-bringup/include/host/config.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/host/debug.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/debu… ============================================================================== --- branches/cmake-bringup/include/host/debug.h (added) +++ branches/cmake-bringup/include/host/debug.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,6 @@ +#ifndef __WINE_DEBUG_H +#define __WINE_DEBUG_H + +/* This file is intentionally left blank */ + +#endif /* __WINE_DEBUG_H */ Propchange: branches/cmake-bringup/include/host/debug.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/host/guiddef.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/guid… ============================================================================== --- branches/cmake-bringup/include/host/guiddef.h (added) +++ branches/cmake-bringup/include/host/guiddef.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,1 @@ +#include "../psdk/guiddef.h" Propchange: branches/cmake-bringup/include/host/guiddef.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/cmake-bringup/include/host/wine/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 16 22:48:56 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/cmake-bringup/include/host/wine/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/cmake-bringup/include/host/wine/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/cmake-bringup/include/host/wine/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/cmake-bringup/include/host/wine/list.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine… ============================================================================== --- branches/cmake-bringup/include/host/wine/list.h (added) +++ branches/cmake-bringup/include/host/wine/list.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,1 @@ +#include "../../reactos/wine/list.h" Propchange: branches/cmake-bringup/include/host/wine/list.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/host/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine… ============================================================================== --- branches/cmake-bringup/include/host/wine/port.h (added) +++ branches/cmake-bringup/include/host/wine/port.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,1 @@ +#include "../../reactos/wine/port.h" Propchange: branches/cmake-bringup/include/host/wine/port.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/include/host/wine/rpcfc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/host/wine… ============================================================================== --- branches/cmake-bringup/include/host/wine/rpcfc.h (added) +++ branches/cmake-bringup/include/host/wine/rpcfc.h [iso-8859-1] Wed Feb 16 22:48:56 2011 @@ -1,0 +1,1 @@ +#include "../../reactos/wine/rpcfc.h" Propchange: branches/cmake-bringup/include/host/wine/rpcfc.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/include/reactos/wine/wpp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/wpp.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/wpp.h (removed) @@ -1,36 +1,0 @@ -/* - * Exported functions of the Wine preprocessor - * - * Copyright 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WPP_H -#define __WINE_WPP_H - -#include <stdio.h> - -extern void wpp_add_define( const char *name, const char *value ); -extern void wpp_del_define( const char *name ); -extern void wpp_add_cmdline_define( const char *value ); -extern void wpp_set_debug( int lex_debug, int parser_debug, int msg_debug ); -extern void wpp_set_pedantic( int on ); -extern void wpp_add_include_path( const char *path ); -extern char *wpp_find_include( const char *name, const char *parent_name ); -extern int wpp_parse( const char *input, FILE *output ); -extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); - -#endif /* __WINE_WPP_H */

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