Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[akhaldi] 55435: * Merge r55432 from trunk.
by akhaldi＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: akhaldi Date: Sun Feb 5 17:27:26 2012 New Revision: 55435 URL: http://svn.reactos.org/svn/reactos?rev=55435&view=rev Log: * Merge r55432 from trunk. Modified: branches/ros-branch-0_3_14/ (props changed) branches/ros-branch-0_3_14/drivers/wdm/audio/backpln/portcls/undoc.cpp Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 5 17:27:26 2012 @@ -11,4 +11,4 @@ /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/wlan-bringup:54809-54998 -/trunk/reactos:55012,55173 +/trunk/reactos:55012,55173,55432 Modified: branches/ros-branch-0_3_14/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/drivers/wdm/a… ============================================================================== --- branches/ros-branch-0_3_14/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Feb 5 17:27:26 2012 @@ -6,7 +6,6 @@ * PROGRAMMER: Johannes Anderwald */ -#define YDEBUG #include "private.hpp" NTSTATUS @@ -762,7 +761,7 @@ RtlCopyMemory(Descriptor->Interfaces, InterfaceGuids, sizeof(GUID) * InterfaceCount); Descriptor->InterfaceCount = InterfaceCount; - DumpFilterDescriptor(FilterDescription); + //DumpFilterDescriptor(FilterDescription); // are any property sets supported by the portcls if (FilterPropertiesCount)

1 0

[akhaldi] 55434: * Properly set the default wallpaper for both bootcd and livecd. Missed this file in the previous commit.
by akhaldi＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: akhaldi Date: Sun Feb 5 17:26:22 2012 New Revision: 55434 URL: http://svn.reactos.org/svn/reactos?rev=55434&view=rev Log: * Properly set the default wallpaper for both bootcd and livecd. Missed this file in the previous commit. Modified: branches/ros-branch-0_3_14/boot/bootdata/hivedef_i386.inf Modified: branches/ros-branch-0_3_14/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/boot/bootdata… ============================================================================== Binary files - no diff available.

1 0

[tkreuzer] 55433: [NTOSKRNL] Handle _MI_PAGING_LEVELS >= 3 in MiBuildPagedPool and MmArmAccessFault
by tkreuzer＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: tkreuzer Date: Sun Feb 5 17:19:58 2012 New Revision: 55433 URL: http://svn.reactos.org/svn/reactos?rev=55433&view=rev Log: [NTOSKRNL] Handle _MI_PAGING_LEVELS >= 3 in MiBuildPagedPool and MmArmAccessFault Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Feb 5 17:19:58 2012 @@ -1605,7 +1605,10 @@ KIRQL OldIrql; SIZE_T Size; ULONG BitMapSize; -#if (_MI_PAGING_LEVELS == 2) +#if (_MI_PAGING_LEVELS >= 3) + MMPPE TempPpe = ValidKernelPpe; + PMMPPE PointerPpe; +#elif (_MI_PAGING_LEVELS == 2) MMPTE TempPte = ValidKernelPte; // @@ -1682,17 +1685,32 @@ MmSizeOfPagedPoolInBytes) - 1); // - // So now get the PDE for paged pool and zero it out - // - PointerPde = MiAddressToPde(MmPagedPoolStart); + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); #if (_MI_PAGING_LEVELS >= 3) - /* On these systems, there's no double-mapping, so instead, the PPE and PXEs + /* On these systems, there's no double-mapping, so instead, the PPEs * are setup to span the entire paged pool area, so there's no need for the * system PD */ - ASSERT(FALSE); + for (PointerPpe = MiAddressToPpe(MmPagedPoolStart); + PointerPpe <= MiAddressToPpe(MmPagedPoolEnd); + PointerPpe++) + { + /* Check if the PPE is already valid */ + if (!PointerPpe->u.Hard.Valid) + { + /* It is not, so map a fresh zeroed page */ + TempPpe.u.Hard.PageFrameNumber = MiRemoveZeroPage(0); + MI_WRITE_VALID_PPE(PointerPpe, TempPpe); + } + } #endif + // + // So now get the PDE for paged pool and zero it out + // + PointerPde = MiAddressToPde(MmPagedPoolStart); RtlZeroMemory(PointerPde, (1 + MiAddressToPde(MmPagedPoolEnd) - PointerPde) * sizeof(MMPDE)); @@ -1702,11 +1720,6 @@ PointerPte = MiAddressToPte(MmPagedPoolStart); MmPagedPoolInfo.FirstPteForPagedPool = PointerPte; MmPagedPoolInfo.LastPteForPagedPool = MiAddressToPte(MmPagedPoolEnd); - - // - // Lock the PFN database - // - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Allocate a page and map the first paged pool PDE */ MI_SET_USAGE(MI_USAGE_PAGED_POOL); @@ -1717,7 +1730,11 @@ #if (_MI_PAGING_LEVELS >= 3) /* Use the PPE of MmPagedPoolStart that was setup above */ // Bla = PFN_FROM_PTE(PpeAddress(MmPagedPool...)); - ASSERT(FALSE); + + /* Initialize the PFN entry for it */ + MiInitializePfnForOtherProcess(PageFrameIndex, + (PMMPTE)PointerPde, + PFN_FROM_PTE(MiAddressToPpe(MmPagedPoolStart))); #else /* Do it this way */ // Bla = MmSystemPageDirectory[(PointerPde - (PMMPTE)PDE_BASE) / PDE_COUNT] Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Feb 5 17:19:58 2012 @@ -637,8 +637,15 @@ IN PVOID TrapInformation) { KIRQL OldIrql = KeGetCurrentIrql(), LockIrql; - PMMPTE PointerPte, ProtoPte = NULL; - PMMPDE PointerPde; + PMMPTE ProtoPte = NULL; + PMMPTE PointerPte = MiAddressToPte(Address); + PMMPDE PointerPde = MiAddressToPde(Address); +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe = MiAddressToPpe(Address); +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe = MiAddressToPxe(Address); +#endif +#endif MMPTE TempPte; PETHREAD CurrentThread; PEPROCESS CurrentProcess; @@ -648,17 +655,8 @@ PMMVAD Vad; PFN_NUMBER PageFrameIndex; ULONG Color; + DPRINT("ARM3 FAULT AT: %p\n", Address); - - // - // Get the PTE and PDE - // - PointerPte = MiAddressToPte(Address); - PointerPde = MiAddressToPde(Address); -#if (_MI_PAGING_LEVELS >= 3) - /* We need the PPE and PXE addresses */ - ASSERT(FALSE); -#endif // // Check for dispatch-level snafu @@ -675,7 +673,7 @@ } // - // Check for kernel fault + // Check for kernel fault address // while (Address >= MmSystemRangeStart) { @@ -685,8 +683,18 @@ if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; #if (_MI_PAGING_LEVELS >= 3) - /* Need to check PXE and PDE validity */ - ASSERT(FALSE); + if ( +#if (_MI_PAGING_LEVELS == 4) + (PointerPxe->u.Hard.Valid == 0) || +#endif + (PointerPpe->u.Hard.Valid == 0)) + { + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 2); + } #endif // @@ -871,17 +879,20 @@ return Status; } - /* This is a user fault */ +#if (_MI_PAGING_LEVELS == 4) + /* On these systems we have PXEs and PPEs ready for everything we need */ + if (PointerPxe->u.Hard.Valid == 0) return STATUS_ACCESS_VIOLATION; +#endif +#if (_MI_PAGING_LEVELS >= 3) + if (PointerPpe->u.Hard.Valid == 0) return STATUS_ACCESS_VIOLATION; +#endif + + /* This is a user fault (<- And this is a lie!) */ CurrentThread = PsGetCurrentThread(); CurrentProcess = PsGetCurrentProcess(); /* Lock the working set */ MiLockProcessWorkingSet(CurrentProcess, CurrentThread); - -#if (_MI_PAGING_LEVELS >= 3) - /* Need to check/handle PPE and PXE validity too */ - ASSERT(FALSE); -#endif /* First things first, is the PDE valid? */ ASSERT(PointerPde->u.Hard.LargePage == 0); @@ -916,10 +927,6 @@ #endif /* We should come back with APCs enabled, and with a valid PDE */ ASSERT(KeAreAllApcsDisabled() == TRUE); -#if (_MI_PAGING_LEVELS >= 3) - /* Need to check/handle PPE and PXE validity too */ - ASSERT(FALSE); -#endif ASSERT(PointerPde->u.Hard.Valid == 1); }

1 0

[akhaldi] 55432: [PORTCLS] * Silence some debug info.
by akhaldi＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: akhaldi Date: Sun Feb 5 17:19:07 2012 New Revision: 55432 URL: http://svn.reactos.org/svn/reactos?rev=55432&view=rev Log: [PORTCLS] * Silence some debug info. Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Feb 5 17:19:07 2012 @@ -6,7 +6,6 @@ * PROGRAMMER: Johannes Anderwald */ -#define YDEBUG #include "private.hpp" NTSTATUS @@ -762,7 +761,7 @@ RtlCopyMemory(Descriptor->Interfaces, InterfaceGuids, sizeof(GUID) * InterfaceCount); Descriptor->InterfaceCount = InterfaceCount; - DumpFilterDescriptor(FilterDescription); + //DumpFilterDescriptor(FilterDescription); // are any property sets supported by the portcls if (FilterPropertiesCount)

1 0

[tkreuzer] 55431: [NTOSKRNL/NEWCC] Fix MSVC build and warnings
by tkreuzer＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: tkreuzer Date: Sun Feb 5 16:42:22 2012 New Revision: 55431 URL: http://svn.reactos.org/svn/reactos?rev=55431&view=rev Log: [NTOSKRNL/NEWCC] Fix MSVC build and warnings Modified: trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -143,7 +143,7 @@ PNOCC_BCB Bcb = NULL; LARGE_INTEGER LowerBound, UpperBound; PLIST_ENTRY ListEntry; - IO_STATUS_BLOCK IOSB = { }; + IO_STATUS_BLOCK IOSB = {0}; DPRINT1("CcFlushCache (while file) (%s:%d)\n", File, Line); @@ -164,7 +164,7 @@ while (ListEntry != &Map->AssociatedBcb) { Bcb = CONTAINING_RECORD(ListEntry, NOCC_BCB, ThisFileList); - CcpReferenceCache(Bcb - CcCacheSections); + CcpReferenceCache((ULONG)(Bcb - CcCacheSections)); if (Bcb->FileOffset.QuadPart + Bcb->Length >= LowerBound.QuadPart && Bcb->FileOffset.QuadPart < UpperBound.QuadPart) @@ -186,7 +186,7 @@ if (Delete && Bcb->RefCount < 2) { Bcb->RefCount = 1; - CcpDereferenceCache(Bcb - CcCacheSections, FALSE); + CcpDereferenceCache((ULONG)(Bcb - CcCacheSections), FALSE); } else CcpUnpinData(Bcb, TRUE); @@ -276,9 +276,10 @@ NTAPI CcRemapBcb(IN PVOID Bcb) { + ULONG Number = (ULONG)(((PNOCC_BCB)Bcb) - CcCacheSections); CcpLock(); - ASSERT(RtlTestBit(CcCacheBitmap, ((PNOCC_BCB)Bcb) - CcCacheSections)); - CcpReferenceCache(((PNOCC_BCB)Bcb) - CcCacheSections); + ASSERT(RtlTestBit(CcCacheBitmap, Number)); + CcpReferenceCache(Number); CcpUnlock(); return Bcb; } @@ -315,10 +316,11 @@ NTAPI CcRepinBcb(IN PVOID Bcb) { + ULONG Number = (ULONG)(((PNOCC_BCB)Bcb) - CcCacheSections); CcpLock(); - ASSERT(RtlTestBit(CcCacheBitmap, ((PNOCC_BCB)Bcb) - CcCacheSections)); - DPRINT("CcRepinBcb(#%x)\n", ((PNOCC_BCB)Bcb) - CcCacheSections); - CcpReferenceCache(((PNOCC_BCB)Bcb) - CcCacheSections); + ASSERT(RtlTestBit(CcCacheBitmap, Number)); + DPRINT("CcRepinBcb(#%x)\n", Number); + CcpReferenceCache(Number); CcpUnlock(); } Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -297,9 +297,11 @@ IN PCC_FILE_SIZES FileSizes) { PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + PNOCC_BCB Bcb; + if (!Map) return; Map->FileSizes = *FileSizes; - PNOCC_BCB Bcb = Map->AssociatedBcb.Flink == &Map->AssociatedBcb ? + Bcb = Map->AssociatedBcb.Flink == &Map->AssociatedBcb ? NULL : CONTAINING_RECORD(Map->AssociatedBcb.Flink, NOCC_BCB, ThisFileList); if (!Bcb) return; MmExtendCacheSection(Bcb->SectionObject, &FileSizes->FileSize, FALSE); Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -318,6 +318,8 @@ PMM_CACHE_SECTION_SEGMENT SectionObject = NULL; NTSTATUS Status; PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + ULONG SectionSize; + ULONG ViewSize = CACHE_STRIPE; if (!Map) { @@ -358,8 +360,6 @@ goto cleanup; } - ULONG SectionSize; - DPRINT("File size %08x%08x\n", Map->FileSizes.ValidDataLength.HighPart, Map->FileSizes.ValidDataLength.LowPart); if (Map->FileSizes.ValidDataLength.QuadPart) @@ -424,7 +424,6 @@ } DPRINT("Selected BCB #%x\n", BcbHead); - ULONG ViewSize = CACHE_STRIPE; Bcb = &CcCacheSections[BcbHead]; Status = MmMapCacheViewInSystemSpaceAtOffset Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -266,12 +266,13 @@ Region->Protect == PAGE_EXECUTE_READWRITE) #endif { + ULONG Entry; DPRINTC("setting non-cow page %x %x:%x offset %x (%x) to writable\n", Segment, Process, PAddress, Offset.u.LowPart, MmGetPfnForProcess(Process, Address)); if (Segment->FileObject) { DPRINTC("file %wZ\n", &Segment->FileObject->FileName); } - ULONG Entry = MiGetPageEntryCacheSectionSegment(Segment, &Offset); + Entry = MiGetPageEntryCacheSectionSegment(Segment, &Offset); DPRINT("Entry %x\n", Entry); if (Entry && !IS_SWAP_FROM_SSE(Entry) && @@ -478,7 +479,7 @@ { if (Thread->ActiveFaultCount > 0) { - WORK_QUEUE_WITH_CONTEXT Context = { }; + WORK_QUEUE_WITH_CONTEXT Context = {0}; DPRINT("Already fault handling ... going to work item (%x)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; @@ -659,7 +660,7 @@ { if (Thread->ActiveFaultCount > 1) { - WORK_QUEUE_WITH_CONTEXT Context = { }; + WORK_QUEUE_WITH_CONTEXT Context = {0}; DPRINTC("Already fault handling ... going to work item (%x)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/newmm.h [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -19,7 +19,7 @@ #define MEMORY_AREA_CACHE (2) #define MM_SEGMENT_FINALIZE (0x40000000) -#define RMAP_SEGMENT_MASK ~0xff +#define RMAP_SEGMENT_MASK ~((ULONG_PTR)0xff) #define RMAP_IS_SEGMENT(x) (((ULONG_PTR)(x) & RMAP_SEGMENT_MASK) == RMAP_SEGMENT_MASK) #define MIN(x,y) (((x)<(y))?(x):(y)) Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/sptab.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -107,7 +107,7 @@ MiSectionPageTableGet(Table, FileOffset); if (!PageTableSlice) { - CACHE_SECTION_PAGE_TABLE SectionZeroPageTable = { }; + CACHE_SECTION_PAGE_TABLE SectionZeroPageTable = {0}; SearchFileOffset.QuadPart = ROUND_DOWN(FileOffset->QuadPart, ENTRIES_PER_ELEMENT * PAGE_SIZE); SectionZeroPageTable.FileOffset = SearchFileOffset; SectionZeroPageTable.Refcount = 1; Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -422,6 +422,8 @@ if (Segment) { + ULONG RefCount; + DPRINTC("About to finalize section page %x (%x:%x) Status %x %s\n", Page, Segment, FileOffset.LowPart, Status, Dirty ? "dirty" : "clean"); if (!NT_SUCCESS(Status) || @@ -438,7 +440,6 @@ } // Alas, we had the last reference - ULONG RefCount; if ((RefCount = InterlockedDecrementUL(&Segment->ReferenceCount)) == 0) MmFinalizeSegment(Segment); } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Feb 5 16:42:22 2012 @@ -1290,7 +1290,8 @@ * Page - Variable that receives a page contains the read data. */ { - MM_REQUIRED_RESOURCES Resources = { }; + MM_REQUIRED_RESOURCES Resources = {0}; + NTSTATUS Status; Resources.Context = MemoryArea->Data.SectionData.Section->FileObject; Resources.FileOffset.QuadPart = SegOffset + @@ -1300,7 +1301,7 @@ DPRINT1("%S, offset %x, len %d, page %x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]); - NTSTATUS Status = MiReadFilePage(NULL, NULL, &Resources); + Status = MiReadFilePage(NULL, NULL, &Resources); *Page = Resources.Page[0]; return Status; }

1 0

[tfaber] 55430: [CRT] - Fix multiple free in msvcrt_free_io. Fixes VLC Player crash on exit. Wine already has it right.
by tfaber＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: tfaber Date: Sun Feb 5 15:47:41 2012 New Revision: 55430 URL: http://svn.reactos.org/svn/reactos?rev=55430&view=rev Log: [CRT] - Fix multiple free in msvcrt_free_io. Fixes VLC Player crash on exit. Wine already has it right. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun Feb 5 15:47:41 2012 @@ -966,7 +966,7 @@ free(__pioinfo[i]); for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) - free(fstream[i/FD_BLOCK_SIZE]); + free(fstream[i]); file_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&file_cs);

1 0

[janderwald] 55429: [HIDCLASS] - Check if attaching to device stack failed. In that case fail the request [HIDUSB] - Always set SupriseRemovalOk [USBCCGP] [HIDCLASS] [USBHUB] [USBSTOR] - Check if t...
by janderwald＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: janderwald Date: Sun Feb 5 15:36:00 2012 New Revision: 55429 URL: http://svn.reactos.org/svn/reactos?rev=55429&view=rev Log: [HIDCLASS] - Check if attaching to device stack failed. In that case fail the request [HIDUSB] - Always set SupriseRemovalOk [USBCCGP] [HIDCLASS] [USBHUB] [USBSTOR] - Check if the pdo is still in the pdo list. Only call IoDeleteDevice in that case Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -79,11 +79,18 @@ RtlZeroMemory(FDODeviceExtension, sizeof(HIDCLASS_FDO_EXTENSION)); /* initialize device extension */ + FDODeviceExtension->Common.IsFDO = TRUE; + FDODeviceExtension->Common.DriverExtension = DriverExtension; FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = PhysicalDeviceObject; FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = (PVOID)((ULONG_PTR)FDODeviceExtension + sizeof(HIDCLASS_FDO_EXTENSION)); FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = IoAttachDeviceToDeviceStack(NewDeviceObject, PhysicalDeviceObject); - FDODeviceExtension->Common.IsFDO = TRUE; - FDODeviceExtension->Common.DriverExtension = DriverExtension; + if (FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject == NULL) + { + /* no PDO */ + IoDeleteDevice(NewDeviceObject); + DPRINT1("[HIDCLASS] failed to attach to device stack\n"); + return STATUS_DEVICE_REMOVED; + } /* sanity check */ ASSERT(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -354,7 +354,7 @@ NTSTATUS Status; PPNP_BUS_INFORMATION BusInformation; PDEVICE_RELATIONS DeviceRelation; - ULONG Index; + ULONG Index, bFound; // // get device extension @@ -535,6 +535,7 @@ // // remove us from the fdo's pdo list // + bFound = FALSE; for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->DeviceRelations->Count; Index++) { if (PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] == DeviceObject) @@ -542,6 +543,7 @@ // // remove us // + bFound = TRUE; PDODeviceExtension->FDODeviceExtension->DeviceRelations->Objects[Index] = NULL; break; } @@ -551,8 +553,11 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Delete our device object*/ - IoDeleteDevice(DeviceObject); + if (bFound) + { + /* Delete our device object*/ + IoDeleteDevice(DeviceObject); + } return STATUS_SUCCESS; } Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -1662,19 +1662,10 @@ Status = Irp->IoStatus.Status; } - if (NT_SUCCESS(Status)) - { - // - // driver supports D1 & D2 - // - IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD1 = TRUE; - IoStack->Parameters.DeviceCapabilities.Capabilities->DeviceD2 = TRUE; - - // - // don't need to safely remove - // - IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; - } + // + // don't need to safely remove + // + IoStack->Parameters.DeviceCapabilities.Capabilities->SurpriseRemovalOK = TRUE; // // done Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -307,7 +307,7 @@ PIO_STACK_LOCATION IoStack; PPDO_DEVICE_EXTENSION PDODeviceExtension; NTSTATUS Status; - ULONG Index; + ULONG Index, bFound; // // get current stack location @@ -355,6 +355,7 @@ // // remove us from the fdo's pdo list // + bFound = FALSE; for(Index = 0; Index < PDODeviceExtension->FDODeviceExtension->FunctionDescriptorCount; Index++) { if (PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] == DeviceObject) @@ -363,6 +364,7 @@ // remove us // PDODeviceExtension->FDODeviceExtension->ChildPDO[Index] = NULL; + bFound = TRUE; break; } } @@ -373,10 +375,13 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - // - // Delete the device object - // - IoDeleteDevice(DeviceObject); + if (bFound) + { + // + // Delete the device object + // + IoDeleteDevice(DeviceObject); + } return STATUS_SUCCESS; } case IRP_MN_QUERY_CAPABILITIES: Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -743,7 +743,7 @@ // // no buffer, setup in descriptor // - m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; + m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = 0; // Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -486,6 +486,7 @@ ULONG_PTR Information = 0; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; ULONG Index; + ULONG bFound; PDEVICE_RELATIONS DeviceRelation; UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -577,19 +578,21 @@ DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); - /* Remove the device */ - Status = HubInterface->RemoveUsbDevice(HubDeviceExtension->UsbDInterface.BusContext, UsbChildExtension->UsbDeviceHandle, 0); - - /* FIXME handle error */ - ASSERT(Status == STATUS_SUCCESS); - /* remove us from pdo list */ + bFound = FALSE; for(Index = 0; Index < USB_MAXCHILDREN; Index++) { if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) { + /* Remove the device */ + Status = HubInterface->RemoveUsbDevice(HubDeviceExtension->UsbDInterface.BusContext, UsbChildExtension->UsbDeviceHandle, 0); + + /* FIXME handle error */ + ASSERT(Status == STATUS_SUCCESS); + /* remove us */ HubDeviceExtension->ChildDeviceObject[Index] = NULL; + bFound = TRUE; break; } } @@ -598,8 +601,12 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Delete the device object */ - IoDeleteDevice(DeviceObject); + if (bFound) + { + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + } + return STATUS_SUCCESS; } case IRP_MN_QUERY_DEVICE_RELATIONS: Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -622,75 +622,84 @@ DPRINT("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); - // - // find transfer descriptor in control list - // - Status = FindTransferDescriptorInEndpoint(m_ControlHeadEndpointDescriptor, TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); - if (NT_SUCCESS(Status)) - { - // - // cleanup endpoint - // - CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); - - // - // done + do + { + // + // find transfer descriptor in control list + // + Status = FindTransferDescriptorInEndpoint(m_ControlHeadEndpointDescriptor, TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + continue; + } + + // + // find transfer descriptor in bulk list + // + Status = FindTransferDescriptorInEndpoint(m_BulkHeadEndpointDescriptor, TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + continue; + } + + // + // find transfer descriptor in interrupt list + // + Status = FindTransferDescriptorInInterruptHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + continue; + } + + // + // last try: find the descriptor in isochronous list + // + Status = FindTransferDescriptorInIsochronousHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + DPRINT1("ISO endpoint complete\n"); + ASSERT(FALSE); + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + continue; + } + + // + // no more completed descriptors found // return; - } - - // - // find transfer descriptor in bulk list - // - Status = FindTransferDescriptorInEndpoint(m_BulkHeadEndpointDescriptor, TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); - if (NT_SUCCESS(Status)) - { - // - // cleanup endpoint - // - CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); - - // - // done - // - return; - } - - // - // find transfer descriptor in interrupt list - // - Status = FindTransferDescriptorInInterruptHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); - if (NT_SUCCESS(Status)) - { - // - // cleanup endpoint - // - CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); - - // - // done - // - return; - } - - // - // last try: find the descriptor in isochronous list - // - Status = FindTransferDescriptorInIsochronousHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); - if (NT_SUCCESS(Status)) - { - // - // cleanup endpoint - // - DPRINT1("ISO endpoint complete\n"); -ASSERT(FALSE); - CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); - - // - // done - // - return; - } + + }while(TRUE); // // hardware reported dead endpoint completed Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -773,6 +773,7 @@ PPDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; PDEVICE_CAPABILITIES Caps; + ULONG bDelete; // // get current stack location @@ -845,13 +846,31 @@ { DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + if(*DeviceExtension->PDODeviceObject != NULL) + { + // + // clear entry in FDO pdo list + // + *DeviceExtension->PDODeviceObject = NULL; + bDelete = TRUE; + } + else + { + // + // device object already marked for deletion + // + bDelete = FALSE; + } + /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* Delete the device object */ - IoDeleteDevice(DeviceObject); - + if (bDelete) + { + /* Delete the device object */ + IoDeleteDevice(DeviceObject); + } return STATUS_SUCCESS; } case IRP_MN_QUERY_CAPABILITIES: @@ -880,7 +899,10 @@ // if we're not claimed it's ok // if (DeviceExtension->Claimed) + { Status = STATUS_UNSUCCESSFUL; + DPRINT1("[USBSTOR] Request %x fails because device is still claimed\n", IoStack->MinorFunction); + } else Status = STATUS_SUCCESS; break; @@ -961,6 +983,7 @@ RtlZeroMemory(PDODeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->LowerDeviceObject = DeviceObject; + PDODeviceExtension->PDODeviceObject = ChildDeviceObject; // // set device flags Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Feb 5 15:36:00 2012 @@ -79,6 +79,7 @@ UCHAR Claimed; // indicating if it has been claimed by upper driver ULONG BlockLength; // length of block ULONG LastLogicBlockAddress; // last block address + PDEVICE_OBJECT *PDODeviceObject; // entry in pdo list }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; //

1 0

[rharabien] 55428: - Update Start Menu bitmaps to contain a proper version number instead of "0.4 - SVN"
by rharabien＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: rharabien Date: Sun Feb 5 14:27:44 2012 New Revision: 55428 URL: http://svn.reactos.org/svn/reactos?rev=55428&view=rev Log: - Update Start Menu bitmaps to contain a proper version number instead of "0.4 - SVN" Modified: branches/ros-branch-0_3_14/base/shell/explorer-new/res/logov.bmp branches/ros-branch-0_3_14/base/shell/explorer/res/logov.bmp Modified: branches/ros-branch-0_3_14/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/base/shell/ex… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_14/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/base/shell/ex… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 55427: * Adjust wallpapers names and convert them to bmp. * Properly set the default wallpaper for both bootcd and livecd.
by akhaldi＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: akhaldi Date: Sun Feb 5 14:12:32 2012 New Revision: 55427 URL: http://svn.reactos.org/svn/reactos?rev=55427&view=rev Log: * Adjust wallpapers names and convert them to bmp. * Properly set the default wallpaper for both bootcd and livecd. Added: branches/ros-branch-0_3_14/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp (with props) branches/ros-branch-0_3_14/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp (with props) branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen_4x3.bmp (with props) Removed: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.ReactOS7.Dark_4-3.jpg branches/ros-branch-0_3_14/modules/wallpaper/Angelus.Sea04.FarBeyondTheSea_4x3.jpg branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen.4x3.jpg Modified: branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild Removed: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.ReactOS7.Dark_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Removed: branches/ros-branch-0_3_14/modules/wallpaper/Angelus.Sea04.FarBeyondTheSea_4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Added: branches/ros-branch-0_3_14/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ros-branch-0_3_14/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen.4x3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Added: branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== Binary file - no diff available. Propchange: branches/ros-branch-0_3_14/modules/wallpaper/RainInTheScreen_4x3.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/modules/wallp… ============================================================================== --- branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/modules/wallpaper/directory.rbuild [iso-8859-1] Sun Feb 5 14:12:32 2012 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile>Angelus.ReactOS7.Dark_4-3.jpg</installfile> - <installfile>Angelus.Sea04.FarBeyondTheSea_4x3.jpg</installfile> - <installfile>RainInTheScreen.4x3.jpg</installfile> + <installfile>Angelus_ReactOS7_Dark_4-3.bmp</installfile> + <installfile>Angelus_Sea04_FarBeyondTheSea_4x3.bmp</installfile> + <installfile>RainInTheScreen_4x3.bmp</installfile> </group>

1 0

[rharabien] 55426: [CMAKE] - Add wallpaper optional module to CMake build
by rharabien＠svn.reactos.org 05 Feb '12

05 Feb '12

Author: rharabien Date: Sun Feb 5 13:44:16 2012 New Revision: 55426 URL: http://svn.reactos.org/svn/reactos?rev=55426&view=rev Log: [CMAKE] - Add wallpaper optional module to CMake build Modified: trunk/reactos/modules/CMakeLists.txt Modified: trunk/reactos/modules/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Sun Feb 5 13:44:16 2012 @@ -6,3 +6,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rosapps/) add_subdirectory(rosapps) endif() + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/) +add_subdirectory(wallpaper) +endif()

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
58
Older →

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 February 2012