Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[dreimer] 44986: Update some Versions in the RosBE readme.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jan 7 17:28:51 2010 New Revision: 44986 URL: http://svn.reactos.org/svn/reactos?rev=44986&view=rev Log: Update some Versions in the RosBE readme. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

14 years, 11 months

[arty] 44985: Remove vestigal parts.

by arty＠svn.reactos.org

Author: arty Date: Thu Jan 7 01:08:31 2010 New Revision: 44985 URL: http://svn.reactos.org/svn/reactos?rev=44985&view=rev Log: Remove vestigal parts. Removed: branches/arty-newcc/ntoskrnl/cc/cacheman.c branches/arty-newcc/ntoskrnl/cc/copy.c branches/arty-newcc/ntoskrnl/cc/fs.c branches/arty-newcc/ntoskrnl/cc/mdl.c branches/arty-newcc/ntoskrnl/cc/pin.c branches/arty-newcc/ntoskrnl/cc/view.c branches/arty-newcc/ntoskrnl/include/internal/newcc.h branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/mm/elf.inc.h branches/arty-newcc/ntoskrnl/mm/elf32.c branches/arty-newcc/ntoskrnl/mm/elf64.c branches/arty-newcc/ntoskrnl/mm/pe.c branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/config.template.rbuild branches/arty-newcc/ntoskrnl/ex/shutdown.c branches/arty-newcc/ntoskrnl/include/internal/cc.h branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/mm/procsup.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/virtual.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/config.template.rbui… Removed: branches/arty-newcc/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/cacheman… Removed: branches/arty-newcc/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/copy.c?r… Removed: branches/arty-newcc/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/fs.c?rev… Removed: branches/arty-newcc/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/mdl.c?re… Removed: branches/arty-newcc/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/pin.c?re… Removed: branches/arty-newcc/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cc/view.c?r… Modified: branches/arty-newcc/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/shutdown… Modified: branches/arty-newcc/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Removed: branches/arty-newcc/ntoskrnl/include/internal/newcc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Removed: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Removed: branches/arty-newcc/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf.inc.… Removed: branches/arty-newcc/ntoskrnl/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf32.c?… Removed: branches/arty-newcc/ntoskrnl/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/elf64.c?… Removed: branches/arty-newcc/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/pe.c?rev… Modified: branches/arty-newcc/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/procsup.… Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… Removed: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… Modified: branches/arty-newcc/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/virtual.… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge…

14 years, 11 months

[arty] 44984: We now actually write a page (which make require evicting a cache stripe) after fixing up the accompanying segment (which could be the one evicted). We bail early if a process is being killed. Silence a lot of printing.

by arty＠svn.reactos.org

Author: arty Date: Thu Jan 7 00:35:55 2010 New Revision: 44984 URL: http://svn.reactos.org/svn/reactos?rev=44984&view=rev Log: We now actually write a page (which make require evicting a cache stripe) after fixing up the accompanying segment (which could be the one evicted). We bail early if a process is being killed. Silence a lot of printing. Modified: branches/arty-newcc/ntoskrnl/include/internal/ps.h branches/arty-newcc/ntoskrnl/mm/anonmem.c branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/freelist.c branches/arty-newcc/ntoskrnl/mm/mmfault.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/fault.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c branches/arty-newcc/ntoskrnl/ps/kill.c Modified: branches/arty-newcc/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/ps.h [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -110,6 +110,12 @@ NTAPI PsGetNextProcess( IN PEPROCESS OldProcess OPTIONAL +); + +BOOLEAN +NTAPI +PsIsProcessExiting( + IN PEPROCESS Process ); NTSTATUS Modified: branches/arty-newcc/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/anonmem.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -225,7 +225,7 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); KIRQL OldIrql; - DPRINT1("Not Present %x in (%x-%x)\n", Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); + DPRINT("Not Present %x in (%x-%x)\n", Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); /* * There is a window between taking the page fault and locking the @@ -291,11 +291,11 @@ Required->Consumer = MC_USER; Required->Amount = 1; Required->DoAcquisition = MiGetOnePage; - DPRINT1("Allocate\n"); + DPRINT("Allocate\n"); return STATUS_MORE_PROCESSING_REQUIRED; } - DPRINT1("Using page %x\n", Required->Page[0]); + DPRINT("Using page %x\n", Required->Page[0]); /* * Set the page. If we fail because we are out of memory then @@ -330,7 +330,7 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } - DPRINT1("Success!\n"); + DPRINT("Success!\n"); return(STATUS_SUCCESS); } Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -33,7 +33,7 @@ BOOLEAN MiBalancerInitialized = FALSE; MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; -/*static*/ ULONG MiMinimumAvailablePages = 128; +/*static*/ ULONG MiMinimumAvailablePages = 0x3000; static ULONG MiNrTotalPages; static LIST_ENTRY AllocationListHead; static KSPIN_LOCK AllocationListLock; @@ -270,7 +270,7 @@ if(BALANCER_CAN_EVICT(Consumer)) MmInsertLRULastUserPage(Page); - DPRINT1("Successful alloc %x after balancer (consumer %d)\n", Page, Consumer); + DPRINT("Successful alloc %x after balancer (consumer %d)\n", Page, Consumer); *AllocatedPage = Page; return(STATUS_SUCCESS); Modified: branches/arty-newcc/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/freelist… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -867,7 +867,7 @@ Page = MiGetPfnEntry(Pfn); ASSERT(Page); - DPRINT1("MmReferencePage(PysicalAddress %x,%s:%d,%d)\n", Pfn << PAGE_SHIFT, file, line, Page->ReferenceCount); + DPRINT("MmReferencePage(PysicalAddress %x,%s:%d,%d)\n", Pfn << PAGE_SHIFT, file, line, Page->ReferenceCount); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { Modified: branches/arty-newcc/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mmfault.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -136,7 +136,7 @@ { MmUnlockAddressSpace(AddressSpace); } - DPRINT1("Address: %x\n", Address); + DPRINT("Address: %x\n", Address); return (STATUS_ACCESS_VIOLATION); } @@ -161,7 +161,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... - DPRINT1("Waiting for %x\n", Address); + DPRINT("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -170,7 +170,7 @@ FALSE, NULL))) ASSERT(FALSE); - DPRINT1("Restarting fault %x\n", Address); + DPRINT("Restarting fault %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) @@ -211,8 +211,8 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Completed page fault handling %x %x\n", Address, Status); - DPRINT1 + DPRINT("Completed page fault handling %x %x\n", Address, Status); + DPRINT ("Type %x (%x -> %x)\n", MemoryArea->Type, MemoryArea->StartingAddress, @@ -316,7 +316,7 @@ break; } - DPRINT1 + DPRINT ("Type %x (%x -> %x)\n", MemoryArea->Type, MemoryArea->StartingAddress, @@ -343,7 +343,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... - DPRINT1("Waiting for %x\n", Address); + DPRINT("Waiting for %x\n", Address); if (!NT_SUCCESS (KeWaitForSingleObject (&MmWaitPageEvent, @@ -352,7 +352,7 @@ FALSE, NULL))) ASSERT(FALSE); - DPRINT1("Done waiting for %x\n", Address); + DPRINT("Done waiting for %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -221,7 +221,14 @@ if (Process && Address < MmSystemRangeStart) { + // Make sure we don't try to page out part of an exiting process Status = ObReferenceObject(Process); + if (PsIsProcessExiting(Process)) + { + ObDereferenceObject(Process); + ExReleaseFastMutex(&RmapListLock); + goto bail; + } if (!NT_SUCCESS(Status)) { DPRINT("bail\n"); @@ -355,7 +362,10 @@ Evicted = NT_SUCCESS(Status) && NT_SUCCESS(MmFinalizeSectionPageOut(Segment, &FileOffset, Page, Dirty)); - + + /* Note: on success, segment might not exist anymore, due to cache segment + * replacement in cc */ + if (!Evicted && SectionPage) { DPRINT1 Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -90,7 +90,7 @@ NTAPI _MmLockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) { - DPRINT1("MmLockSectionSegment(%p,%s:%d)\n", Segment, file, line); + DPRINT("MmLockSectionSegment(%p,%s:%d)\n", Segment, file, line); ExAcquireFastMutex(&Segment->Lock); } @@ -99,7 +99,7 @@ _MmUnlockSectionSegment(PMM_SECTION_SEGMENT Segment, const char *file, int line) { ExReleaseFastMutex(&Segment->Lock); - DPRINT1("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); + DPRINT("MmUnlockSectionSegment(%p,%s:%d)\n", Segment, file, line); } VOID @@ -260,7 +260,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1 + DPRINT ("Writeback from section flush %08x%08x (%x) %x@%x (%08x%08x:%wZ) failed %x\n", FileOffset.u.HighPart, FileOffset.u.LowPart, (ULONG)(FileSize->QuadPart - FileOffset.QuadPart), @@ -894,7 +894,7 @@ BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { - DPRINT1("Mapping between 0x%.8X and 0x%.8X failed (%X).\n", + DPRINT("Mapping between 0x%.8X and 0x%.8X failed (%X).\n", (*BaseAddress), (char*)(*BaseAddress) + ViewSize, Status); return(Status); } @@ -1170,7 +1170,7 @@ if (IS_DIRTY_SSE(Entry) && FileObject) { - DPRINT1("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart); MiWriteBackPage(FileObject, FileOffset, PAGE_SIZE, OldPage); DPRINT("Dereference page %x\n", OldPage); } Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -46,7 +46,7 @@ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> extern KEVENT MmWaitPageEvent; @@ -164,7 +164,7 @@ MmUnlockSectionSegment(Segment); DPRINT("XXX Set Event %x\n", Status); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); - DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); return Status; } else if (MmIsPageSwapEntry(Process, Address)) @@ -173,7 +173,7 @@ MmGetPageFileMapping(Process, Address, &SwapEntry); if (SwapEntry == MM_WAIT_ENTRY) { - DPRINT1("Wait for page entry in section\n"); + DPRINT("Wait for page entry in section\n"); MmUnlockSectionSegment(Segment); return STATUS_SUCCESS + 1; } @@ -194,7 +194,7 @@ SWAPENTRY SwapEntry = SWAPENTRY_FROM_SSE(Entry); if (SwapEntry == MM_WAIT_ENTRY) { - DPRINT1("Wait for page entry in section\n"); + DPRINT("Wait for page entry in section\n"); MmUnlockSectionSegment(Segment); return STATUS_SUCCESS + 1; } @@ -225,7 +225,7 @@ DPRINT("XXX Set Event %x\n", Status); KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); MmUnlockSectionSegment(Segment); - DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); return Status; } else @@ -286,7 +286,7 @@ BoundaryAddressMultiple.QuadPart = 0; - DPRINT1("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); + DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); /* * There is a window between taking the page fault and locking the @@ -706,7 +706,7 @@ if (!Private) { ASSERT(SwapEntry == 0); - DPRINT1("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); + DPRINT("MiWriteBackPage(%wZ,%08x%08x)\n", &FileObject->FileName, Offset.u.HighPart, Offset.u.LowPart); Status = MiWriteBackPage(FileObject, &Offset, PAGE_SIZE, Page); MmSetCleanAllRmaps(Page); MmUnlockSectionSegment(Segment); @@ -730,7 +730,7 @@ /* * Write the page to the pagefile */ - DPRINT1("Writing swap entry: %x %x\n", SwapEntry, Page); + DPRINT("Writing swap entry: %x %x\n", SwapEntry, Page); Status = MmWriteToSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { @@ -790,7 +790,7 @@ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); if (SwapEntry == MM_WAIT_ENTRY) { - DPRINT1 + DPRINT ("SwapEntry is a WAIT, our swap to is %x, State is %x for (%x:%x) on page %x\n", Required->SwapEntry, Required->State, @@ -833,7 +833,7 @@ MmUnlockSectionSegment(Segment); return STATUS_PAGEFILE_QUOTA; } - DPRINT1("MiWriteSwapPage (%x -> %x)\n", OurPage, Required->SwapEntry); + DPRINT("MiWriteSwapPage (%x -> %x)\n", OurPage, Required->SwapEntry); Required->DoAcquisition = MiWriteSwapPage; MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockSectionSegment(Segment); @@ -841,7 +841,7 @@ } else { - DPRINT1("Out of swap space for page %x\n", OurPage); + DPRINT("Out of swap space for page %x\n", OurPage); MmUnlockSectionSegment(Segment); return STATUS_PAGEFILE_QUOTA; } Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -153,20 +153,20 @@ BOOLEAN Dirty) { NTSTATUS Status = STATUS_SUCCESS; - BOOLEAN WriteZero = FALSE; + BOOLEAN WriteZero = FALSE, WritePage = FALSE; SWAPENTRY Swap = MmGetSavedSwapEntryPage(Page); MmLockSectionSegment(Segment); + if (Dirty) { - DPRINT1("Finalize (dirty) Segment %x Page %x\n", Segment, Page); + DPRINT("Finalize (dirty) Segment %x Page %x\n", Segment, Page); DPRINT("Segment->FileObject %x\n", Segment->FileObject); DPRINT("Segment->Flags %x\n", Segment->Flags); if (Segment->FileObject && !(Segment->Flags & MM_IMAGE_SEGMENT)) { - DPRINT1("Segment %x FileObject %x Offset %x\n", Segment, Segment->FileObject, FileOffset->LowPart); - Status = MiWriteBackPage(Segment->FileObject, FileOffset, PAGE_SIZE, Page); - WriteZero = NT_SUCCESS(Status); + WriteZero = TRUE; + WritePage = TRUE; } else { @@ -193,24 +193,32 @@ if (WriteZero) { - DPRINT1("Setting page entry in segment %x:%x to swap %x\n", Segment, FileOffset->LowPart, Swap); + DPRINT("Setting page entry in segment %x:%x to swap %x\n", Segment, FileOffset->LowPart, Swap); MiSetPageEntrySectionSegment(Segment, FileOffset, Swap ? MAKE_SWAP_SSE(Swap) : 0); } else { - DPRINT1("Setting page entry in segment %x:%x to page %x\n", Segment, FileOffset->LowPart, Page); + DPRINT("Setting page entry in segment %x:%x to page %x\n", Segment, FileOffset->LowPart, Page); MiSetPageEntrySectionSegment (Segment, FileOffset, Page ? (Dirty ? DIRTY_SSE(MAKE_PFN_SSE(Page)) : MAKE_PFN_SSE(Page)) : 0); } + MmUnlockSectionSegment(Segment); + + if (WritePage) + { + DPRINT("Segment %x FileObject %x Offset %x\n", Segment, Segment->FileObject, FileOffset->LowPart); + Status = MiWriteBackPage(Segment->FileObject, FileOffset, PAGE_SIZE, Page); + } + if (NT_SUCCESS(Status)) { - DPRINT1("Removing page %x for real\n", Page); + DPRINT("Removing page %x for real\n", Page); MmSetSavedSwapEntryPage(Page, 0); MmDereferencePage(Page); } - MmUnlockSectionSegment(Segment); + /* Note: Writing may evict the segment... Nothing is guaranteed from here down */ KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); Modified: branches/arty-newcc/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/kill.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/ps/kill.c [iso-8859-1] Thu Jan 7 00:35:55 2010 @@ -605,6 +605,7 @@ if (TerminationPort) { /* Setup the message header */ + TerminationMsg.h.u2.ZeroInit = 0; TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED; TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg); TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) - @@ -1020,6 +1021,13 @@ return Status; } +BOOLEAN +NTAPI +PsIsProcessExiting(IN PEPROCESS Process) +{ + return Process->Flags & PSF_PROCESS_EXITING_BIT; +} + VOID NTAPI PspExitProcess(IN BOOLEAN LastThread,

14 years, 11 months

[tkreuzer] 44983: [HAL] - comment out an ASSERT for now - add Mdl flag MDL_PAGES_LOCKED - remove obsolete DriverEntry

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 7 00:03:19 2010 New Revision: 44983 URL: http://svn.reactos.org/svn/reactos?rev=44983&view=rev Log: [HAL] - comment out an ASSERT for now - add Mdl flag MDL_PAGES_LOCKED - remove obsolete DriverEntry Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/halinit.c [iso-8859-1] Thu Jan 7 00:03:19 2010 @@ -39,17 +39,6 @@ } /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -DriverEntry( - PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - UNIMPLEMENTED; - - return STATUS_SUCCESS; -} /* * @implemented Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/misc.c [iso-8859-1] Thu Jan 7 00:03:19 2010 @@ -156,7 +156,7 @@ { LARGE_INTEGER Result; - ASSERT(HalpPerformanceFrequency.QuadPart != 0); +// ASSERT(HalpPerformanceFrequency.QuadPart != 0); /* Does the caller want the frequency? */ if (PerformanceFrequency) Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/amd64/x86bios.c [iso-8859-1] Thu Jan 7 00:03:19 2010 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS HAL - * LICENSE: See COPYING in the top level directory - * FILE: hal/halamd64/generic/x86bios.c + * LICENSE: GPL, See COPYING in the top level directory + * FILE: hal/halx86/generic/amd64/x86bios.c * PURPOSE: * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -75,6 +75,8 @@ } } + Mdl->MdlFlags = MDL_PAGES_LOCKED; + /* Map the MDL to system space */ x86BiosMemoryMapping = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); ASSERT(x86BiosMemoryMapping);

14 years, 11 months

[tkreuzer] 44982: Some work on Mm initialization, added a call to HalInitializeBios, so we have a mapped bios now.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 6 23:53:31 2010 New Revision: 44982 URL: http://svn.reactos.org/svn/reactos?rev=44982&view=rev Log: Some work on Mm initialization, added a call to HalInitializeBios, so we have a mapped bios now. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Jan 6 23:53:31 2010 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: GPL, See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/amd64/init.c * PURPOSE: Memory Manager Initialization for amd64 @@ -19,6 +19,10 @@ #ifndef KDBG extern PMMPTE MmDebugPte; #endif + +VOID +NTAPI +HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock); /* GLOBALS *****************************************************************/ @@ -76,15 +80,16 @@ PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; ULONG MiNumberDescriptors = 0; +PFN_NUMBER MiSystemPages = 0; BOOLEAN MiIncludeType[LoaderMaximum]; PFN_NUMBER MxFreePageBase; ULONG64 MxFreePageCount = 0; -ULONG MxPhase = 0; PFN_NUMBER MmSystemPageDirectory; PFN_NUMBER MmSizeOfPagedPoolInPages = MI_MIN_INIT_PAGED_POOLSIZE / PAGE_SIZE; +BOOLEAN MiPfnsInitialized = FALSE; /* FUNCTIONS *****************************************************************/ @@ -98,7 +103,7 @@ NTAPI MiEvaluateMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; PLIST_ENTRY ListEntry; PFN_NUMBER LastPage; ULONG i; @@ -120,31 +125,31 @@ ListEntry = ListEntry->Flink) { /* Get the memory descriptor */ - MdBlock = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); /* Count it */ MiNumberDescriptors++; /* Skip pages that are not part of the PFN database */ - if (!MiIncludeType[MdBlock->MemoryType]) + if (!MiIncludeType[Descriptor->MemoryType]) { continue; } /* Add this to the total of pages */ - MmNumberOfPhysicalPages += MdBlock->PageCount; + MmNumberOfPhysicalPages += Descriptor->PageCount; /* Check if this is the new lowest page */ - if (MdBlock->BasePage < MmLowestPhysicalPage) + if (Descriptor->BasePage < MmLowestPhysicalPage) { /* Update the lowest page */ - MmLowestPhysicalPage = MdBlock->BasePage; + MmLowestPhysicalPage = Descriptor->BasePage; } /* Check if this is the new highest page */ - LastPage = MdBlock->BasePage + MdBlock->PageCount - 1; + LastPage = Descriptor->BasePage + Descriptor->PageCount - 1; if (LastPage > MmHighestPhysicalPage) { /* Update the highest page */ @@ -152,28 +157,38 @@ } /* Check if this is currently free memory */ - if ((MdBlock->MemoryType == LoaderFree) || - (MdBlock->MemoryType == LoaderLoadedProgram) || - (MdBlock->MemoryType == LoaderFirmwareTemporary) || - (MdBlock->MemoryType == LoaderOsloaderStack)) + if ((Descriptor->MemoryType == LoaderFree) || + (Descriptor->MemoryType == LoaderLoadedProgram) || + (Descriptor->MemoryType == LoaderFirmwareTemporary) || + (Descriptor->MemoryType == LoaderOsloaderStack)) { /* Check if this is the largest memory descriptor */ - if (MdBlock->PageCount > MxFreePageCount) + if (Descriptor->PageCount > MxFreePageCount) { /* For now, it is */ - MxFreeDescriptor = MdBlock; - MxFreePageBase = MdBlock->BasePage; - MxFreePageCount = MdBlock->PageCount; + MxFreeDescriptor = Descriptor; + MxFreePageBase = Descriptor->BasePage; + MxFreePageCount = Descriptor->PageCount; } } + else + { + /* Add it to the amount of system used pages */ + MiSystemPages += Descriptor->PageCount; + } } } PFN_NUMBER NTAPI -MxAllocEarlyPage() +MiEarlyAllocPage() { PFN_NUMBER Pfn; + + if (MiPfnsInitialized) + { + return MmAllocPage(MC_SYSTEM, 0); + } /* Make sure we have enough pages */ if (!MxFreePageCount) @@ -193,13 +208,6 @@ return Pfn; } -PFN_NUMBER -NTAPI -MxAllocPage() -{ - return (MxPhase == 0) ? MxAllocEarlyPage() : MmAllocPage(MC_SYSTEM, 0); -} - PMMPTE NTAPI MxGetPte(PVOID Address) @@ -217,8 +225,11 @@ if (!Pte->u.Hard.Valid) { /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MxAllocPage(); + TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); *Pte = TmplPte; + + /* Zero the page */ + RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); } /* Get a pointer to the PPE */ @@ -226,8 +237,11 @@ if (!Pte->u.Hard.Valid) { /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MxAllocPage(); + TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); *Pte = TmplPte; + + /* Zero the page */ + RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); } /* Get a pointer to the PDE */ @@ -235,8 +249,11 @@ if (!Pte->u.Hard.Valid) { /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MxAllocPage(); + TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); *Pte = TmplPte; + + /* Zero the page */ + RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); } /* Get a pointer to the PTE */ @@ -254,7 +271,7 @@ TmplPte.u.Long = 0; TmplPte.u.Flush.Valid = 1; TmplPte.u.Flush.Write = 1; - TmplPte.u.Hard.PageFrameNumber = MxAllocPage(); + TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); /* Get the PTE for that page */ Pte = MxGetPte(Address); @@ -281,7 +298,7 @@ NTAPI MiPreparePfnDatabse(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; PLIST_ENTRY ListEntry; PUCHAR Page, FirstPage; SIZE_T Size; @@ -299,16 +316,16 @@ ListEntry = ListEntry->Flink) { /* Get the memory descriptor */ - MdBlock = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); /* Skip pages that are not part of the PFN database */ - if (MiIncludeType[MdBlock->MemoryType]) + if (MiIncludeType[Descriptor->MemoryType]) { /* Get the base and size of this pfn database entry */ - FirstPage = PAGE_ALIGN(&MmPfnDatabase[MdBlock->BasePage]); - Size = ROUND_TO_PAGES(MdBlock->PageCount * sizeof(MMPFN)); + FirstPage = PAGE_ALIGN(&MmPfnDatabase[Descriptor->BasePage]); + Size = ROUND_TO_PAGES(Descriptor->PageCount * sizeof(MMPFN)); /* Loop the pages of this Pfn database entry */ for (Page = FirstPage; Page < FirstPage + Size; Page += PAGE_SIZE) @@ -318,6 +335,7 @@ { /* It's not, map it now */ MxMapPage(Page); + RtlZeroMemory(Page, PAGE_SIZE); } } @@ -384,6 +402,9 @@ __writecr4(__readcr4() | CR4_PGE); ASSERT(__readcr4() & CR4_PGE); + /* Enable no execute */ + __writemsr(X86_MSR_EFER, __readmsr(X86_MSR_EFER) | EFER_NXE); + /* Loop the user mode PXEs */ for (Pte = MiAddressToPxe(0); Pte <= MiAddressToPxe(MmHighestUserAddress); @@ -414,7 +435,7 @@ if (!Pte->u.Hard.Valid) { /* It's not Initialize it */ - TmplPte.u.Flush.PageFrameNumber = MxAllocPage(); + TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(0); *Pte = TmplPte; /* Zero the page. The PXE is the PTE for the PDPT. */ @@ -593,7 +614,7 @@ MiBuildPhysicalMemoryBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { PPHYSICAL_MEMORY_DESCRIPTOR Buffer; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; PLIST_ENTRY ListEntry; PFN_NUMBER NextPage = -1; PULONG Bitmap; @@ -632,35 +653,35 @@ ListEntry = ListEntry->Flink) { /* Get the memory descriptor */ - MdBlock = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); /* Skip pages that are not part of the PFN database */ - if (!MiIncludeType[MdBlock->MemoryType]) + if (!MiIncludeType[Descriptor->MemoryType]) { continue; } /* Does the memory block begin where the last ended? */ - if (MdBlock->BasePage == NextPage) + if (Descriptor->BasePage == NextPage) { /* Add it to the current run */ - Buffer->Run[Runs - 1].PageCount += MdBlock->PageCount; + Buffer->Run[Runs - 1].PageCount += Descriptor->PageCount; } else { /* Create a new run */ Runs++; - Buffer->Run[Runs - 1].BasePage = MdBlock->BasePage; - Buffer->Run[Runs - 1].PageCount = MdBlock->PageCount; + Buffer->Run[Runs - 1].BasePage = Descriptor->BasePage; + Buffer->Run[Runs - 1].PageCount = Descriptor->PageCount; } /* Set the bits in the PFN bitmap */ - RtlSetBits(&MiPfnBitMap, MdBlock->BasePage, MdBlock->PageCount); + RtlSetBits(&MiPfnBitMap, Descriptor->BasePage, Descriptor->PageCount); /* Set the next page */ - NextPage = MdBlock->BasePage + MdBlock->PageCount; + NextPage = Descriptor->BasePage + Descriptor->PageCount; } // FIXME: allocate a buffer of better size @@ -728,14 +749,14 @@ if (!Pte->u.Flush.Valid) { /* Map it! */ - TmplPte.u.Flush.PageFrameNumber = MxAllocPage(); + TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(); *Pte = TmplPte; } } /* Create and map the first PTE for paged pool */ Pte = MxGetPte(MmPagedPoolStart); - TmplPte.u.Flush.PageFrameNumber = MxAllocPage(); + TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(); *Pte = TmplPte; /* Save the first and last paged pool PTE */ @@ -801,8 +822,14 @@ { if (Phase == 0) { - /* Parse memory descriptors */ + MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned * PAGE_SIZE; + MmBootImageSize = ROUND_UP(MmBootImageSize, PAGE_SIZE); + + /* Parse memory descriptors, find free pages */ MiEvaluateMemoryDescriptors(LoaderBlock); + + /* Start PFN database at hardcoded address */ + MmPfnDatabase = MI_PFN_DATABASE; /* Prepare PFN database mappings */ MiPreparePfnDatabse(LoaderBlock); @@ -824,8 +851,8 @@ /* The PFN database was created, restore the free descriptor */ *MxFreeDescriptor = MxOldFreeDescriptor; - /* Switch to phase 1 */ - MxPhase = 1; + /* The pfn database is ready now */ + MiPfnsInitialized = TRUE; /* Initialize the nonpaged pool */ MiBuildNonPagedPool(); @@ -838,6 +865,14 @@ /* Size up paged pool and build the shadow system page directory */ MiBuildPagedPool(); + + // This is the old stuff: + MmPagedPoolBase = (PVOID)((PCHAR)MmPagedPoolEnd + 1); + MmPagedPoolSize = MM_PAGED_POOL_SIZE; + ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize < (PCHAR)MmNonPagedSystemStart); + + + HalInitializeBios(0, LoaderBlock); } return STATUS_SUCCESS;

14 years, 11 months

[ekohl] 44981: [umpnpmgr] Silence device arrival debug messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jan 6 22:14:13 2010 New Revision: 44981 URL: http://svn.reactos.org/svn/reactos?rev=44981&view=rev Log: [umpnpmgr] Silence device arrival debug messages. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Wed Jan 6 22:14:13 2010 @@ -2322,7 +2322,7 @@ DWORD len; DWORD DeviceIdLength; - DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); if (DeviceIdLength) @@ -2342,6 +2342,11 @@ } } } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + { + DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); + /* FIXME: ? */ + } else { DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n",

14 years, 11 months

[ekohl] 44980: Fix PNP_DeviceInstanceAction prototype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jan 6 19:58:10 2010 New Revision: 44980 URL: http://svn.reactos.org/svn/reactos?rev=44980&view=rev Log: Fix PNP_DeviceInstanceAction prototype. Modified: trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Wed Jan 6 19:58:10 2010 @@ -489,8 +489,8 @@ cpp_quote("#define PNP_DEVINST_REENUMERATE 0x7") DWORD PNP_DeviceInstanceAction( [in] handle_t hBinding, - [in] DWORD ulMajorAction, - [in] DWORD ulMinorAction, + [in] DWORD ulAction, + [in] DWORD ulFlags, [in, string, unique] LPWSTR pszDeviceInstance1, [in, string, unique] LPWSTR pszDeviceInstance2);

14 years, 11 months

[khornicek] 44979: - missed this one, sorry

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Jan 6 16:05:25 2010 New Revision: 44979 URL: http://svn.reactos.org/svn/reactos?rev=44979&view=rev Log: - missed this one, sorry Modified: trunk/reactos/include/reactos/wine/wined3d.idl Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wined3d.idl [iso-8859-1] Wed Jan 6 16:05:25 2010 @@ -41,6 +41,12 @@ RGNDATAHEADER rdh; char Buffer[1]; } RGNDATA; + +typedef struct _LUID +{ + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; cpp_quote("#endif") cpp_quote("#define WINED3D_OK S_OK") @@ -151,7 +157,6 @@ WINED3DFMT_D16_LOCKABLE, WINED3DFMT_D32_UNORM, WINED3DFMT_S1_UINT_D15_UNORM, - WINED3DFMT_S8_UINT_D24_UNORM, WINED3DFMT_X8D24_UNORM, WINED3DFMT_S4X4_UINT_D24_UNORM, WINED3DFMT_L16_UNORM, @@ -247,27 +252,25 @@ WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + /* FOURCC formats. */ + WINED3DFMT_UYVY = 0x59565955, /* UYVY */ + WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */ + WINED3DFMT_YV12 = 0x32315659, /* YV12 */ + WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */ + WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */ + WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */ + WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */ + WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */ + WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */ + WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ + WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ + WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ + WINED3DFMT_INST = 0x54534e49, /* INST */ + WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ + WINED3DFMT_NVHS = 0x5348564e, /* NVHS */ WINED3DFMT_FORCE_DWORD = 0xffffffff } WINED3DFORMAT; -cpp_quote("#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \\") -cpp_quote(" ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\") -cpp_quote(" ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))") -cpp_quote("#define WINED3DFMT_UYVY WINEMAKEFOURCC('U', 'Y', 'V', 'Y')") -cpp_quote("#define WINED3DFMT_YUY2 WINEMAKEFOURCC('Y', 'U', 'Y', '2')") -cpp_quote("#define WINED3DFMT_YV12 WINEMAKEFOURCC('Y', 'V', '1', '2')") -cpp_quote("#define WINED3DFMT_DXT1 WINEMAKEFOURCC('D', 'X', 'T', '1')") -cpp_quote("#define WINED3DFMT_DXT2 WINEMAKEFOURCC('D', 'X', 'T', '2')") -cpp_quote("#define WINED3DFMT_DXT3 WINEMAKEFOURCC('D', 'X', 'T', '3')") -cpp_quote("#define WINED3DFMT_DXT4 WINEMAKEFOURCC('D', 'X', 'T', '4')") -cpp_quote("#define WINED3DFMT_DXT5 WINEMAKEFOURCC('D', 'X', 'T', '5')") -cpp_quote("#define WINED3DFMT_MULTI2_ARGB8 WINEMAKEFOURCC('M', 'E', 'T', '1')") -cpp_quote("#define WINED3DFMT_G8R8_G8B8 WINEMAKEFOURCC('G', 'R', 'G', 'B')") -cpp_quote("#define WINED3DFMT_R8G8_B8G8 WINEMAKEFOURCC('R', 'G', 'B', 'G')") -/* Vendor specific formats */ -cpp_quote("#define WINED3DFMT_ATI2N WINEMAKEFOURCC('A', 'T', 'I', '2')") -cpp_quote("#define WINED3DFMT_NVHU WINEMAKEFOURCC('N', 'V', 'H', 'U')") -cpp_quote("#define WINED3DFMT_NVHS WINEMAKEFOURCC('N', 'V', 'H', 'S')") typedef enum _WINED3DRENDERSTATETYPE { @@ -712,12 +715,12 @@ WINED3DTS_TEXTURE5 = 21, WINED3DTS_TEXTURE6 = 22, WINED3DTS_TEXTURE7 = 23, + WINED3DTS_WORLD = 256, /*WINED3DTS_WORLDMATRIX(0)*/ + WINED3DTS_WORLD1 = 257, + WINED3DTS_WORLD2 = 258, + WINED3DTS_WORLD3 = 259, WINED3DTS_FORCE_DWORD = 0x7fffffff } WINED3DTRANSFORMSTATETYPE; -cpp_quote("#define WINED3DTS_WORLD WINED3DTS_WORLDMATRIX(0)") -cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)") -cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)") -cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)") cpp_quote("#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)") typedef enum _WINED3DBASISTYPE @@ -901,6 +904,7 @@ const UINT WINED3DUSAGE_AUTOGENMIPMAP = 0x00000400; const UINT WINED3DUSAGE_DMAP = 0x00004000; const UINT WINED3DUSAGE_MASK = 0x00004fff; +const UINT WINED3DUSAGE_STATICDECL = 0x40000000; const UINT WINED3DUSAGE_OVERLAY = 0x80000000; const UINT WINED3DUSAGE_QUERY_LEGACYBUMPMAP = 0x00008000; @@ -1697,6 +1701,8 @@ DWORD revision; GUID device_identifier; DWORD whql_level; + LUID adapter_luid; + SIZE_T video_memory; } WINED3DADAPTER_IDENTIFIER; typedef struct _WINED3DPRESENT_PARAMETERS @@ -2317,9 +2323,6 @@ ] interface IWineD3DResource : IWineD3DBase { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); HRESULT SetPrivateData( [in] REFGUID guid, [in] const void *data, @@ -2705,9 +2708,6 @@ ] interface IWineD3DVertexDeclaration : IWineD3DBase { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); } [ @@ -2715,11 +2715,8 @@ local, uuid(83b073ce-6f30-11d9-c687-00046142c14f) ] -interface IWineD3DStateBlock : IWineD3DBase -{ - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); +interface IWineD3DStateBlock : IUnknown +{ HRESULT Capture( ); HRESULT Apply( @@ -2735,9 +2732,6 @@ ] interface IWineD3DQuery : IWineD3DBase { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); HRESULT GetData( [out] void *data, [in] DWORD data_size, @@ -2827,9 +2821,6 @@ ] interface IWineD3DBaseShader : IWineD3DBase { - HRESULT GetDevice( - [out] IWineD3DDevice **device - ); HRESULT GetFunction( [out] void *data, [in, out] UINT *data_size @@ -2853,6 +2844,15 @@ [ object, local, + uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd) +] +interface IWineD3DGeometryShader : IWineD3DBaseShader +{ +} + +[ + object, + local, uuid(818503da-6f30-11d9-c687-00046142c14f) ] interface IWineD3DPixelShader : IWineD3DBaseShader @@ -2876,7 +2876,6 @@ HRESULT CreateVertexBuffer( [in] UINT length, [in] DWORD usage, - [in] DWORD fvf, [in] WINED3DPOOL pool, [out] IWineD3DBuffer **vertex_buffer, [in] IUnknown *parent, @@ -2991,6 +2990,13 @@ [in] IUnknown *parent, [in] const struct wined3d_parent_ops *parent_ops ); + HRESULT CreateGeometryShader( + [in] const DWORD *byte_code, + [in] const struct wined3d_shader_signature *output_signature, + [out] IWineD3DGeometryShader **shader, + [in] IUnknown *parent, + [in] const struct wined3d_parent_ops *parent_ops + ); HRESULT CreatePixelShader( [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature, @@ -3074,8 +3080,6 @@ BOOL ShowCursor( [in] BOOL show ); - HRESULT TestCooperativeLevel( - ); HRESULT SetClipPlane( [in] DWORD plane_idx, [in] const float *plane @@ -3205,7 +3209,8 @@ ); HRESULT SetRenderTarget( [in] DWORD render_target_idx, - [in] IWineD3DSurface *render_target + [in] IWineD3DSurface *render_target, + [in] BOOL set_viewport ); HRESULT GetRenderTarget( [in] DWORD render_target_idx,

14 years, 11 months

[khornicek] 44978: - sync wined3d, ddraw, d3d8 and d3d9 with Wine 1.1.35

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Jan 6 15:59:04 2010 New Revision: 44978 URL: http://svn.reactos.org/svn/reactos?rev=44978&view=rev Log: - sync wined3d, ddraw, d3d8 and d3d9 with Wine 1.1.35 Added: trunk/reactos/dll/directx/wine/wined3d/shader.c (with props) Removed: trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.spec trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/roshacks.txt trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Removed: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Removed: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/roshacks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Added: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Removed: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…

14 years, 11 months

[khornicek] 44977: - fix definition of ComposeRects

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Jan 6 15:19:58 2010 New Revision: 44977 URL: http://svn.reactos.org/svn/reactos?rev=44977&view=rev Log: - fix definition of ComposeRects Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=44… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d9.h [iso-8859-1] Wed Jan 6 15:19:58 2010 @@ -1710,7 +1710,7 @@ STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) PURE; /* IDirect3DDevice9Ex methods */ STDMETHOD(SetConvolutionMonoKernel)(THIS_ UINT width, UINT height, float *rows, float *columns) PURE; - STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *pSrc, IDirect3DDevice9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) PURE; + STDMETHOD(ComposeRects)(THIS_ IDirect3DSurface9 *pSrc, IDirect3DSurface9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) PURE; STDMETHOD(PresentEx)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; STDMETHOD(GetGPUThreadPriority)(THIS_ INT *pPriority) PURE; STDMETHOD(SetGPUThreadPriority)(THIS_ INT Priority) PURE;

14 years, 11 months

← Newer
1
...
36
37
38
39
40
41
42
...
53
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 January 2010