Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 53829: [undocuser.h] - Add a definition for TrackMouseEvent timer
by gadamopoulos＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: gadamopoulos Date: Sat Sep 24 11:51:45 2011 New Revision: 53829 URL: http://svn.reactos.org/svn/reactos?rev=53829&view=rev Log: [undocuser.h] - Add a definition for TrackMouseEvent timer Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Sep 24 11:51:45 2011 @@ -57,6 +57,7 @@ /* Caret timer ID */ #define IDCARETTIMER (0xffff) +#define ID_TME_TIMER (0xFFFA) /* SetWindowPos undocumented flags */ #define SWP_NOCLIENTSIZE 0x0800

1 0

[khornicek] 53828: fix the cmake build?
by khornicek＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: khornicek Date: Sat Sep 24 11:47:17 2011 New Revision: 53828 URL: http://svn.reactos.org/svn/reactos?rev=53828&view=rev Log: fix the cmake build? Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sat Sep 24 11:47:17 2011 @@ -39,9 +39,9 @@ setid.c shrink.c uniqueid.c - resource.rc) + diskpart.rc) -set_module_type(calc win32cui) +set_module_type(diskpart win32cui) add_importlibs(diskpart user32 msvcrt kernel32) if(MSVC) add_importlibs(diskpart ntdll)

1 0

[tkreuzer] 53827: [NTOSKRNL/AMD64] Cleanup amd64 specific code
by tkreuzer＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: tkreuzer Date: Sat Sep 24 11:46:20 2011 New Revision: 53827 URL: http://svn.reactos.org/svn/reactos?rev=53827&view=rev Log: [NTOSKRNL/AMD64] Cleanup amd64 specific code Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Sep 24 11:46:20 2011 @@ -20,10 +20,6 @@ extern PMMPTE MmDebugPte; #endif -VOID -NTAPI -HalInitializeBios(ULONG Unknown, PLOADER_PARAMETER_BLOCK LoaderBlock); - /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ @@ -39,50 +35,16 @@ PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* Sizes */ -///SIZE_T MmSessionSize = MI_SESSION_SIZE; -extern SIZE_T MmSessionViewSize; -extern SIZE_T MmSessionPoolSize; -extern SIZE_T MmSessionImageSize; -extern SIZE_T MmSystemViewSize; SIZE_T MiNonPagedSystemSize; /* Address ranges */ -//ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; -//PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; -//PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; -PVOID MmSessionBase; // FFFFF90000000000 = MiSessionPoolStart -PVOID MiSessionPoolStart; // FFFFF90000000000 = MiSessionPoolEnd - MmSessionPoolSize -PVOID MiSessionPoolEnd; // = MiSessionViewStart -PVOID MiSessionViewStart; // = MiSessionViewEnd - MmSessionViewSize -PVOID MiSessionViewEnd; // FFFFF97FFF000000 -PVOID MiSessionImageStart; // ?FFFFF97FFF000000 = MiSessionImageEnd - MmSessionImageSize -PVOID MiSessionImageEnd; // FFFFF98000000000 = MiSessionSpaceEnd -PVOID MiSessionSpaceEnd = MI_SESSION_SPACE_END; // FFFFF98000000000 -PVOID MmSystemCacheStart; // FFFFF98000000000 -PVOID MmSystemCacheEnd; // FFFFFA8000000000 -/// PVOID MmPagedPoolStart = MI_PAGED_POOL_START; // FFFFFA8000000000 -PVOID MmPagedPoolEnd; // FFFFFAA000000000 -PVOID MiSystemViewStart; -PVOID MmNonPagedSystemStart; // FFFFFAA000000000 -PVOID MmNonPagedPoolStart; -PVOID MmNonPagedPoolExpansionStart; -///PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; // 0xFFFFFAE000000000 -PVOID MmHyperSpaceEnd = (PVOID)HYPER_SPACE_END; - -MMSUPPORT MmSystemCacheWs; +PVOID MiSessionViewEnd; ULONG64 MxPfnSizeInBytes; - -PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; -MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -PFN_NUMBER MiSystemPages = 0; BOOLEAN MiIncludeType[LoaderMaximum]; - PFN_NUMBER MxFreePageBase; ULONG64 MxFreePageCount = 0; -extern PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; - BOOLEAN MiPfnsInitialized = FALSE; /* FUNCTIONS *****************************************************************/ @@ -92,6 +54,7 @@ INIT_FUNCTION MiInitializeSessionSpaceLayout() { + MmSessionSize = MI_SESSION_SIZE; MmSessionViewSize = MI_SESSION_VIEW_SIZE; MmSessionPoolSize = MI_SESSION_POOL_SIZE; MmSessionImageSize = MI_SESSION_IMAGE_SIZE; @@ -128,188 +91,92 @@ ASSERT(MmSessionBase <= MiSessionPoolStart); } -ULONG -NoDbgPrint(const char *Format, ...) -{ - return 0; -} - -PFN_NUMBER -NTAPI -MiEarlyAllocPage() -{ - PFN_NUMBER Pfn; - - if (MiPfnsInitialized) - { - return MmAllocPage(MC_SYSTEM); - } - - /* Make sure we have enough pages */ - if (!MxFreePageCount) - { - /* Crash the system */ - KeBugCheckEx(INSTALL_MORE_MEMORY, - MmNumberOfPhysicalPages, - MxFreeDescriptor->PageCount, - MxOldFreeDescriptor.PageCount, - 1); - } - - /* Use our lowest usable free pages */ - Pfn = MxFreePageBase; - MxFreePageBase++; - MxFreePageCount--; - return Pfn; -} - -PMMPTE -NTAPI -MxGetPte(PVOID Address) -{ - PMMPTE Pte; - MMPTE TmplPte; - - /* Setup template pte */ - TmplPte.u.Long = 0; - TmplPte.u.Flush.Valid = 1; - TmplPte.u.Flush.Write = 1; - - /* Get a pointer to the PXE */ - Pte = MiAddressToPxe(Address); - if (!Pte->u.Hard.Valid) - { - /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); - *Pte = TmplPte; - - /* Zero the page */ - RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); - } - - /* Get a pointer to the PPE */ - Pte = MiAddressToPpe(Address); - if (!Pte->u.Hard.Valid) - { - /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); - *Pte = TmplPte; - - /* Zero the page */ - RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); - } - - /* Get a pointer to the PDE */ - Pte = MiAddressToPde(Address); - if (!Pte->u.Hard.Valid) - { - /* It's not valid, map it! */ - TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); - *Pte = TmplPte; - - /* Zero the page */ - RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); - } - - /* Get a pointer to the PTE */ - Pte = MiAddressToPte(Address); - return Pte; -} - -VOID -NTAPI -MxMapPage(PVOID Address) -{ - MMPTE TmplPte, *Pte; - - /* Setup template pte */ - TmplPte.u.Long = 0; - TmplPte.u.Flush.Valid = 1; - TmplPte.u.Flush.Write = 1; - TmplPte.u.Hard.PageFrameNumber = MiEarlyAllocPage(); - - /* Get the PTE for that page */ - Pte = MxGetPte(Address); - ASSERT(Pte->u.Hard.Valid == 0); - - /* Map a physical page */ - *Pte = TmplPte; -} - -VOID -MxMapPageRange(PVOID Address, ULONG64 PageCount) -{ - while (PageCount--) - { - /* Map the page */ - MxMapPage(Address); - - /* Goto next page */ - Address = (PVOID)((ULONG64)Address + PAGE_SIZE); - } -} - -VOID -NTAPI -MiPreparePfnDatabse(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - PLIST_ENTRY ListEntry; - PUCHAR Page, FirstPage; - SIZE_T Size; - - /* Calculate the size of the PFN database and convert to pages */ - MxPfnSizeInBytes = ROUND_TO_PAGES((MmHighestPhysicalPage + 1) * sizeof(MMPFN)); - MxPfnAllocation = MxPfnSizeInBytes >> PAGE_SHIFT; - - /* Simply start at hardcoded address */ - MmPfnDatabase = MI_PFN_DATABASE; - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the memory descriptor */ - Descriptor = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Skip pages that are not part of the PFN database */ - if (MiIncludeType[Descriptor->MemoryType]) +VOID +NTAPI +MiMapPPEs( + PVOID StartAddress, + PVOID EndAddress) +{ + PMMPDE PointerPpe; + MMPDE TmplPde = ValidKernelPde; + + /* Loop the PPEs */ + for (PointerPpe = MiAddressToPpe(StartAddress); + PointerPpe <= MiAddressToPpe(EndAddress); + PointerPpe++) + { + /* Check if its already mapped */ + if (!PointerPpe->u.Hard.Valid) { - /* Get the base and size of this pfn database entry */ - 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) - { - /* Is the page already mapped? */ - if (!MmIsAddressValid(Page)) - { - /* It's not, map it now */ - MxMapPage(Page); - RtlZeroMemory(Page, PAGE_SIZE); - } - } - - /* Zero out the pages */ - RtlZeroMemory(FirstPage, Size); + /* No, map it! */ + TmplPde.u.Hard.PageFrameNumber = MxGetNextPage(1); + *PointerPpe = TmplPde; + + /* Zero out the page table */ + RtlZeroMemory(MiPteToAddress(PointerPpe), PAGE_SIZE); } } } - -VOID +VOID +NTAPI +MiMapPDEs( + PVOID StartAddress, + PVOID EndAddress) +{ + PMMPDE PointerPde; + MMPDE TmplPde = ValidKernelPde; + + /* Loop the PDEs */ + for (PointerPde = MiAddressToPde(StartAddress); + PointerPde <= MiAddressToPde(EndAddress); + PointerPde++) + { + /* Check if its already mapped */ + if (!PointerPde->u.Hard.Valid) + { + /* No, map it! */ + TmplPde.u.Hard.PageFrameNumber = MxGetNextPage(1); + *PointerPde = TmplPde; + + /* Zero out the page table */ + RtlZeroMemory(MiPteToAddress(PointerPde), PAGE_SIZE); + } + } +} + +VOID +NTAPI +MiMapPTEs( + PVOID StartAddress, + PVOID EndAddress) +{ + PMMPTE PointerPte; + MMPTE TmplPte = ValidKernelPte; + + /* Loop the PTEs */ + for (PointerPte = MiAddressToPte(StartAddress); + PointerPte <= MiAddressToPte(EndAddress); + PointerPte++) + { + /* Check if its already mapped */ + if (!PointerPte->u.Hard.Valid) + { + /* No, map it! */ + TmplPte.u.Hard.PageFrameNumber = MxGetNextPage(1); + *PointerPte = TmplPte; + } + } +} + +VOID +NTAPI +INIT_FUNCTION MiInitializePageTable() { ULONG64 PxePhysicalAddress; - MMPTE TmplPte, *Pte; + MMPTE TmplPte, *PointerPxe; PFN_NUMBER PxePfn; - - /* HACK: don't use freeldr debug print anymore */ - //FrLdrDbgPrint = NoDbgPrint; /* Get current directory base */ PxePfn = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber; @@ -327,12 +194,12 @@ __writemsr(X86_MSR_EFER, __readmsr(X86_MSR_EFER) | EFER_NXE); /* Loop the user mode PXEs */ - for (Pte = MiAddressToPxe(0); - Pte <= MiAddressToPxe(MmHighestUserAddress); - Pte++) + for (PointerPxe = MiAddressToPxe(0); + PointerPxe <= MiAddressToPxe(MmHighestUserAddress); + PointerPxe++) { /* Zero the PXE, clear all mappings */ - Pte->u.Long = 0; + PointerPxe->u.Long = 0; } /* Flush the TLB */ @@ -348,40 +215,44 @@ * skip page tables and hyperspace */ /* Loop the PXEs */ - for (Pte = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); - Pte <= MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); - Pte++) + for (PointerPxe = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); + PointerPxe <= MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); + PointerPxe++) { /* Is the PXE already valid? */ - if (!Pte->u.Hard.Valid) + if (!PointerPxe->u.Hard.Valid) { /* It's not Initialize it */ - TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(0); - *Pte = TmplPte; + TmplPte.u.Flush.PageFrameNumber = MxGetNextPage(1); + *PointerPxe = TmplPte; /* Zero the page. The PXE is the PTE for the PDPT. */ - RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); + RtlZeroMemory(MiPteToAddress(PointerPxe), PAGE_SIZE); } } + /* Setup the mapping PPEs and PDEs */ + MiMapPPEs((PVOID)MI_MAPPING_RANGE_START, (PVOID)MI_MAPPING_RANGE_END); + MiMapPDEs((PVOID)MI_MAPPING_RANGE_START, (PVOID)MI_MAPPING_RANGE_END); + /* Setup the mapping PTEs */ - MmFirstReservedMappingPte = MxGetPte((PVOID)MI_MAPPING_RANGE_START); + MmFirstReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_START); + MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; - MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); #ifdef _WINKD_ /* Setup debug mapping PTE */ - MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); + MiMapPPEs((PVOID)MI_DEBUG_MAPPING, (PVOID)MI_DEBUG_MAPPING); + MiMapPDEs((PVOID)MI_DEBUG_MAPPING, (PVOID)MI_DEBUG_MAPPING); + MmDebugPte = MiAddressToPte((PVOID)MI_DEBUG_MAPPING); #endif } VOID NTAPI +INIT_FUNCTION MiBuildNonPagedPool(VOID) { - PMMPTE Pte; - PFN_COUNT PageCount; - /* Check if this is a machine with less than 256MB of RAM, and no overide */ if ((MmNumberOfPhysicalPages <= MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING) && !(MmSizeOfNonPagedPoolInBytes)) @@ -459,18 +330,12 @@ MmSizeOfNonPagedPoolInBytes; ASSERT(IS_PAGE_ALIGNED(MmNonPagedPoolExpansionStart)); - /* Map the nonpaged pool */ - PageCount = (PFN_COUNT)((MmSizeOfNonPagedPoolInBytes + PAGE_SIZE - 1) / PAGE_SIZE); - MxMapPageRange(MmNonPagedPoolStart, PageCount); - - /* Loop the non paged pool extension PTEs */ - for (Pte = MiAddressToPte(MmNonPagedPoolExpansionStart); - Pte <= MiAddressToPte(MmNonPagedPoolEnd); - Pte++) - { - /* Create PXE, PPE, PDE and zero the PTE */ - MxGetPte(MiPteToAddress(Pte))->u.Long = 0; - } + /* Map PPEs and PDEs for non paged pool (including expansion) */ + MiMapPPEs(MmNonPagedPoolStart, MmNonPagedPoolEnd); + MiMapPDEs(MmNonPagedPoolStart, MmNonPagedPoolEnd); + + /* Map the nonpaged pool PTEs (without expansion) */ + MiMapPTEs(MmNonPagedPoolStart, (PUCHAR)MmNonPagedPoolExpansionStart - 1); /* Initialize the ARM3 nonpaged pool */ MiInitializeNonPagedPool(); @@ -481,9 +346,10 @@ VOID NTAPI +INIT_FUNCTION MiBuildSystemPteSpace() { - PMMPTE Pte, StartPte, EndPte; + PMMPTE PointerPte; /* Use the default numer of system PTEs */ MmNumberOfSystemPtes = MI_NUMBER_SYSTEM_PTES; @@ -507,20 +373,13 @@ ASSERT(MmNumberOfSystemPtes > 1000); } - /* Set the range of system PTEs */ - StartPte = MiAddressToPte(MI_SYSTEM_PTE_START); - EndPte = StartPte + MmNumberOfSystemPtes - 1; - - /* Loop the system PTEs */ - for (Pte = StartPte; Pte <= EndPte; Pte++) - { - /* Create PXE, PPE, PDE and zero the PTE */ - MxGetPte(MiPteToAddress(Pte))->u.Long = 0; - } + /* Map the PDEs and PPEs for the system PTEs */ + MiMapPPEs(MI_SYSTEM_PTE_START, MI_SYSTEM_PTE_END); + MiMapPDEs(MI_SYSTEM_PTE_START, MI_SYSTEM_PTE_END); /* Create the system PTE space */ - Pte = MiAddressToPte(MI_SYSTEM_PTE_START); - MiInitializeSystemPtes(Pte, MmNumberOfSystemPtes, SystemPteSpace); + PointerPte = MiAddressToPte(MI_SYSTEM_PTE_START); + MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); /* Reserve system PTEs for zeroing PTEs and clear them */ MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, SystemPteSpace); @@ -530,200 +389,19 @@ MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; } -VOID -NTAPI -MiBuildPagedPool_x(VOID) -{ - PMMPTE Pte; - MMPTE TmplPte; - ULONG Size, BitMapSize; - - /* Default size for paged pool is 4 times non paged pool */ - MmSizeOfPagedPoolInBytes = 4 * MmMaximumNonPagedPoolInBytes; - - /* Make sure it doesn't overflow */ - if (MmSizeOfPagedPoolInBytes > ((ULONG64)MmNonPagedSystemStart - - (ULONG64)MmPagedPoolStart)) - { - MmSizeOfPagedPoolInBytes = (ULONG64)MmNonPagedSystemStart - - (ULONG64)MmPagedPoolStart; - } - - /* Make sure paged pool is big enough */ - if (MmSizeOfPagedPoolInBytes < MI_MIN_INIT_PAGED_POOLSIZE) - { - MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; - } - - /* Align down to a PDE boundary */ - MmSizeOfPagedPoolInBytes = ROUND_DOWN(MmSizeOfPagedPoolInBytes, - 512 * PAGE_SIZE); - MmSizeOfPagedPoolInPages = MmSizeOfPagedPoolInBytes >> PAGE_SHIFT; - - /* This is where paged pool ends */ - MmPagedPoolEnd = (PCHAR)MmPagedPoolStart + MmSizeOfPagedPoolInBytes - 1; - - /* Sanity check */ - ASSERT(MmPagedPoolEnd < MmNonPagedSystemStart); - - /* setup a template PTE */ - TmplPte.u.Long = 0; - TmplPte.u.Flush.Valid = 1; - TmplPte.u.Flush.Write = 1; - - /* Make sure the PXE is valid */ - Pte = MiAddressToPxe(MmPagedPoolStart); - if (!Pte->u.Flush.Valid) - { - /* Map it! */ - TmplPte.u.Flush.PageFrameNumber = MmAllocPage(MC_SYSTEM); - *Pte = TmplPte; - } - - /* Map all page directories (max 128) */ - for (Pte = MiAddressToPpe(MmPagedPoolStart); - Pte <= MiAddressToPpe(MmPagedPoolEnd); - Pte++) - { - if (!Pte->u.Flush.Valid) - { - /* Map it! */ - TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(); - *Pte = TmplPte; - } - } - - /* Create and map the first PTE for paged pool */ - Pte = MxGetPte(MmPagedPoolStart); - TmplPte.u.Flush.PageFrameNumber = MiEarlyAllocPage(); - *Pte = TmplPte; - - /* Save the first and last paged pool PTE */ - MmPagedPoolInfo.FirstPteForPagedPool = MiAddressToPte(MmPagedPoolStart); - MmPagedPoolInfo.LastPteForPagedPool = MiAddressToPte(MmPagedPoolEnd); - MmPagedPoolInfo.NextPdeForPagedPoolExpansion = MiAddressToPde(MmPagedPoolStart) + 1; - - // We keep track of each page via a bit, so check how big the bitmap will - // have to be (make sure to align our page count such that it fits nicely - // into a 4-byte aligned bitmap. - - /* The size of the bitmap in bits is the size in pages */ - BitMapSize = (ULONG)MmSizeOfPagedPoolInPages; - - /* Calculate buffer size in bytes, aligned to 32 bits */ - Size = sizeof(RTL_BITMAP) + ROUND_UP(BitMapSize, 32) / 8; - - // Allocate the allocation bitmap, which tells us which regions have not yet - // been mapped into memory - - MmPagedPoolInfo.PagedPoolAllocationMap = - ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); - ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); - - // Initialize it such that at first, only the first page's worth of PTEs is - // marked as allocated (incidentially, the first PDE we allocated earlier). - RtlInitializeBitMap(MmPagedPoolInfo.PagedPoolAllocationMap, - (PULONG)(MmPagedPoolInfo.PagedPoolAllocationMap + 1), - BitMapSize); - RtlSetAllBits(MmPagedPoolInfo.PagedPoolAllocationMap); - RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, 0, 512); - - // We have a second bitmap, which keeps track of where allocations end. - // Given the allocation bitmap and a base address, we can therefore figure - // out which page is the last page of that allocation, and thus how big the - // entire allocation is. - MmPagedPoolInfo.EndOfPagedPoolBitmap = - ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); - ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); - - /* Initialize the bitmap */ - RtlInitializeBitMap(MmPagedPoolInfo.EndOfPagedPoolBitmap, - (PULONG)(MmPagedPoolInfo.EndOfPagedPoolBitmap + 1), - BitMapSize); - - /* No allocations, no allocation ends; clear all bits. */ - RtlClearAllBits(MmPagedPoolInfo.EndOfPagedPoolBitmap); - - /* Initialize the paged pool mutex */ - KeInitializeGuardedMutex(&MmPagedPoolMutex); - - /* Initialize the paged pool */ - InitializePool(PagedPool, 0); -} - - NTSTATUS NTAPI -MmArmInitSystem_x(IN ULONG Phase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - if (Phase == 0) - { - 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); - - /* Initialize some mappings */ - MiInitializePageTable(); - - /* Update the memory descriptor, to make sure the pages we used - won't get inserted into the PFN database */ - MxOldFreeDescriptor = *MxFreeDescriptor; - MxFreeDescriptor->BasePage = MxFreePageBase; - MxFreeDescriptor->PageCount = MxFreePageCount; - } - else if (Phase == 1) - { - /* The PFN database was created, restore the free descriptor */ - *MxFreeDescriptor = MxOldFreeDescriptor; - - /* The pfn database is ready now */ - MiPfnsInitialized = TRUE; - - /* Initialize the nonpaged pool */ - MiBuildNonPagedPool(); - - /* Initialize system PTE handling */ - MiBuildSystemPteSpace(); - - /* Build the physical memory block */ - //MiBuildPhysicalMemoryBlock(LoaderBlock); - - /* 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); - } +INIT_FUNCTION +MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + + MmHyperSpaceEnd = (PVOID)HYPER_SPACE_END; + + MiInitializePageTable(); + + MiBuildNonPagedPool(); + + MiBuildSystemPteSpace(); return STATUS_SUCCESS; } - -VOID -FASTCALL -MiSyncARM3WithROS(IN PVOID AddressStart, - IN PVOID AddressEnd) -{ - -} - -NTSTATUS -NTAPI -MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -}

1 0

[ekohl] 53826: Add the Diskpart utility by Lee Schroeder (milawynsrealm). The following modifications were made: - Removed the help texts because they were copied from Windows Diskpart. - Used a si...
by ekohl＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: ekohl Date: Sat Sep 24 10:33:33 2011 New Revision: 53826 URL: http://svn.reactos.org/svn/reactos?rev=53826&view=rev Log: Add the Diskpart utility by Lee Schroeder (milawynsrealm). The following modifications were made: - Removed the help texts because they were copied from Windows Diskpart. - Used a single string resource per help text. - Used only Unicode strings and Unicode string functions. - Replaced the giant if-statement in the command dispatcher in interpreter.c by a command-table and a little loop. - Improved the command-line parser. Argument count and argument vector are passed to the command and help functions for easy evaluation. - Moved the help function for commands into the command specific file. TODO: - Implement all commands as the utility is only an empty frame. - Add help texts. - Translate help texts. See issue #6402 for more details. Added: trunk/reactos/base/system/diskpart/ (with props) trunk/reactos/base/system/diskpart/CMakeLists.txt (with props) trunk/reactos/base/system/diskpart/active.c (with props) trunk/reactos/base/system/diskpart/add.c (with props) trunk/reactos/base/system/diskpart/assign.c (with props) trunk/reactos/base/system/diskpart/attach.c (with props) trunk/reactos/base/system/diskpart/attributes.c (with props) trunk/reactos/base/system/diskpart/automount.c (with props) trunk/reactos/base/system/diskpart/break.c (with props) trunk/reactos/base/system/diskpart/clean.c (with props) trunk/reactos/base/system/diskpart/compact.c (with props) trunk/reactos/base/system/diskpart/convert.c (with props) trunk/reactos/base/system/diskpart/create.c (with props) trunk/reactos/base/system/diskpart/delete.c (with props) trunk/reactos/base/system/diskpart/detach.c (with props) trunk/reactos/base/system/diskpart/detail.c (with props) trunk/reactos/base/system/diskpart/diskpart.c (with props) trunk/reactos/base/system/diskpart/diskpart.h (with props) trunk/reactos/base/system/diskpart/diskpart.rbuild (with props) trunk/reactos/base/system/diskpart/diskpart.rc (with props) trunk/reactos/base/system/diskpart/expand.c (with props) trunk/reactos/base/system/diskpart/extend.c (with props) trunk/reactos/base/system/diskpart/filesystems.c (with props) trunk/reactos/base/system/diskpart/format.c (with props) trunk/reactos/base/system/diskpart/gpt.c (with props) trunk/reactos/base/system/diskpart/help.c (with props) trunk/reactos/base/system/diskpart/import.c (with props) trunk/reactos/base/system/diskpart/inactive.c (with props) trunk/reactos/base/system/diskpart/interpreter.c (with props) trunk/reactos/base/system/diskpart/lang/ (with props) trunk/reactos/base/system/diskpart/lang/en-US.rc (with props) trunk/reactos/base/system/diskpart/list.c (with props) trunk/reactos/base/system/diskpart/merge.c (with props) trunk/reactos/base/system/diskpart/offline.c (with props) trunk/reactos/base/system/diskpart/online.c (with props) trunk/reactos/base/system/diskpart/recover.c (with props) trunk/reactos/base/system/diskpart/remove.c (with props) trunk/reactos/base/system/diskpart/remove.h (with props) trunk/reactos/base/system/diskpart/repair.c (with props) trunk/reactos/base/system/diskpart/rescan.c (with props) trunk/reactos/base/system/diskpart/resource.h (with props) trunk/reactos/base/system/diskpart/retain.c (with props) trunk/reactos/base/system/diskpart/san.c (with props) trunk/reactos/base/system/diskpart/select.c (with props) trunk/reactos/base/system/diskpart/setid.c (with props) trunk/reactos/base/system/diskpart/shrink.c (with props) trunk/reactos/base/system/diskpart/uniqueid.c (with props) Modified: trunk/reactos/base/system/CMakeLists.txt trunk/reactos/base/system/system.rbuild Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,6 +1,7 @@ add_subdirectory(autochk) add_subdirectory(bootok) +add_subdirectory(diskpart) add_subdirectory(expand) add_subdirectory(format) add_subdirectory(lsass) Propchange: trunk/reactos/base/system/diskpart/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 24 10:33:33 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/diskpart/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/diskpart/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/diskpart/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt (added) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,49 @@ +set_rc_compiler() + +add_executable(diskpart + active.c + add.c + assign.c + attach.c + attributes.c + automount.c + break.c + clean.c + compact.c + convert.c + create.c + delete.c + detach.c + detail.c + diskpart.c + expand.c + extend.c + filesystems.c + format.c + gpt.c + help.c + import.c + inactive.c + interpreter.c + list.c + merge.c + offline.c + online.c + recover.c + remove.c + repair.c + rescan.c + retain.c + san.c + select.c + setid.c + shrink.c + uniqueid.c + resource.rc) + +set_module_type(calc win32cui) +add_importlibs(diskpart user32 msvcrt kernel32) +if(MSVC) +add_importlibs(diskpart ntdll) +endif() +add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/system/diskpart/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/CMakeLists.txt ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/active.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/activ… ============================================================================== --- trunk/reactos/base/system/diskpart/active.c (added) +++ trunk/reactos/base/system/diskpart/active.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/active.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ + +#include "diskpart.h" + +BOOL active_main(INT argc, WCHAR **argv) +{ + printf("\nActive\n"); + + return TRUE; +} + +/* + * help_active(): + * Shows the description and explains each argument type of the active command + */ +VOID help_active(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ACTIVE); +} Propchange: trunk/reactos/base/system/diskpart/active.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/active.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/add.c… ============================================================================== --- trunk/reactos/base/system/diskpart/add.c (added) +++ trunk/reactos/base/system/diskpart/add.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/add.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ + +#include "diskpart.h" + +BOOL add_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +/* + * help_add(): + * Shows the description and explains each argument type of the add command + */ +VOID help_add(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ADD); +} Propchange: trunk/reactos/base/system/diskpart/add.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/add.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/assign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/assig… ============================================================================== --- trunk/reactos/base/system/diskpart/assign.c (added) +++ trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/assign.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL assign_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +/* + * help_assign(): + * Shows the description and explains each argument type of the assign command + */ +VOID help_assign(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ASSIGN); +} Propchange: trunk/reactos/base/system/diskpart/assign.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/assign.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/attach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attac… ============================================================================== --- trunk/reactos/base/system/diskpart/attach.c (added) +++ trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/attach.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL attach_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +/* + * help_attach(): + * Shows the description and explains each argument type of the attach command + */ +VOID help_attach(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ATTACH); +} Propchange: trunk/reactos/base/system/diskpart/attach.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/attach.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attri… ============================================================================== --- trunk/reactos/base/system/diskpart/attributes.c (added) +++ trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/attributes.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL attributes_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +/* + * help_attributes(): + * Shows the description and explains each argument type of the attributes command + */ +VOID help_attributes(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ATTRIBUTES); +} Propchange: trunk/reactos/base/system/diskpart/attributes.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/attributes.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/automount.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/autom… ============================================================================== --- trunk/reactos/base/system/diskpart/automount.c (added) +++ trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/automount.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL automount_main(INT argc, WCHAR **argv) +{ + printf("Automount\n"); + return TRUE; +} + +/* + * help_automount(): + * Shows the description and explains each argument type of the automount command + */ +VOID help_automount(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_AUTOMOUNT); +} Propchange: trunk/reactos/base/system/diskpart/automount.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/automount.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/break.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/break… ============================================================================== --- trunk/reactos/base/system/diskpart/break.c (added) +++ trunk/reactos/base/system/diskpart/break.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/break.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL break_main(INT argc, WCHAR **argv) +{ + printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); + + return TRUE; +} + +/* + * help_break(): + * Shows the description and explains each argument type of the break command + */ +VOID help_break(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_BREAK); +} Propchange: trunk/reactos/base/system/diskpart/break.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/break.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/clean.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/clean… ============================================================================== --- trunk/reactos/base/system/diskpart/clean.c (added) +++ trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/clean.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL clean_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +/* + * help_clean(): + * Shows the description and explains each argument type of the clean command + */ +VOID help_clean(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_CLEAN); +} Propchange: trunk/reactos/base/system/diskpart/clean.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/clean.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/compact.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/compa… ============================================================================== --- trunk/reactos/base/system/diskpart/compact.c (added) +++ trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/compact.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL compact_main(INT argc, WCHAR **argv) +{ + return 0; +} + + +/* + * help_compact(): + * Shows the description and explains each argument type of the compact command + */ +VOID help_compact(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_COMPACT); +} Propchange: trunk/reactos/base/system/diskpart/compact.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/compact.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/conve… ============================================================================== --- trunk/reactos/base/system/diskpart/convert.c (added) +++ trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/convert.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL convert_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +/* + * help_convert(): + * Shows the description and explains each argument type of the convert command + */ +VOID help_convert(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_CONVERT); +} Propchange: trunk/reactos/base/system/diskpart/convert.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/convert.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/creat… ============================================================================== --- trunk/reactos/base/system/diskpart/create.c (added) +++ trunk/reactos/base/system/diskpart/create.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,24 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/create.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL create_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +/* + * help_create(): + * Shows the description and explains each argument type of the create command + */ +VOID help_create(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_CREATE); +} Propchange: trunk/reactos/base/system/diskpart/create.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/create.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/delet… ============================================================================== --- trunk/reactos/base/system/diskpart/delete.c (added) +++ trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,23 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/delete.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL delete_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +/* + * help_delete(): + * Shows the description and explains each argument type of the delete command + */ +VOID help_delete(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_DELETE); +} Propchange: trunk/reactos/base/system/diskpart/delete.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/delete.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/detach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detac… ============================================================================== --- trunk/reactos/base/system/diskpart/detach.c (added) +++ trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/detach.h + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL detach_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_detach(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_DETACH); +} Propchange: trunk/reactos/base/system/diskpart/detach.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/detach.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/detail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detai… ============================================================================== --- trunk/reactos/base/system/diskpart/detail.c (added) +++ trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/detail.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL detail_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_detail(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_DETAIL); +} Propchange: trunk/reactos/base/system/diskpart/detail.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/detail.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c (added) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,110 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/diskpart.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ + +/* INCLUDES ******************************************************************/ +#include "diskpart.h" + +/* FUNCTIONS ******************************************************************/ + +VOID +PrintResourceString(INT resID, ...) +{ + WCHAR szMsg[3072]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadStringW(GetModuleHandle(NULL), resID, szMsg, 3072); + vwprintf(szMsg, arg_ptr); + va_end(arg_ptr); +} + + +/* + * run_script(const char *filename): + * opens the file, reads the contents, convert the text into readable + * code for the computer, and then execute commands in order. + */ +BOOL run_script(LPCWSTR filename) +{ + FILE *script_file; + WCHAR tmp_string[MAX_STRING_SIZE]; + + /* Open the file for processing */ + script_file = _wfopen(filename, L"r"); + if (script_file == NULL) + { + /* if there was problems opening the file */ + PrintResourceString(IDS_ERROR_MSG_NO_SCRIPT, filename); + return FALSE; /* if there is no script, exit the program */ + } + + /* Read and process the script */ + while (fgetws(tmp_string, MAX_STRING_SIZE, script_file) != NULL) + { + if (interpret_script(tmp_string) == FALSE) + return FALSE; + } + + /* Close the file */ + fclose(script_file); + + return TRUE; +} + +/* + * main(): + * Main entry point of the application. + */ +int wmain(int argc, const WCHAR *argv[]) +{ + /* Gets the current name of the computer */ + WCHAR comp_name[MAX_STRING_SIZE]; //used to store the name of the computer */ + DWORD comp_size = MAX_STRING_SIZE; // used for the char size of comp_name */ + BOOL interpreter_running = TRUE; //used for the main program loop */ + + /* Get the name of the computer for us and change the value of comp_name */ + GetComputerName(comp_name, &comp_size); + + /* TODO: Remove this section of code when program becomes stable enough for production use. */ + wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); + + /* Print the header information */ + PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); + PrintResourceString(IDS_APP_LICENSE); + PrintResourceString(IDS_APP_CURR_COMPUTER, comp_name); + + /* Find out if the user is loading a script */ + if (argc >= 2) + { + /* if there are arguments when starting the program + determine if the script flag is enabled */ + if ((wcsicmp(argv[1], L"/s") == 0) || + (wcsicmp(argv[1], L"-s") == 0)) + { + /* see if the user has put anything after the script flag; if not, + then it doesn't run the run_script() command. */ + /* Alternative comment: Fail if the script name is missing */ + if (argc == 3) + return EXIT_FAILURE; + + interpreter_running = run_script(argv[2]); + } + } + + /* the main program loop */ + while (interpreter_running) + { + interpreter_running = interpret_main(); + } + + /* Let the user know the program is exiting */ + PrintResourceString(IDS_APP_LEAVING); + + return EXIT_SUCCESS; +} Propchange: trunk/reactos/base/system/diskpart/diskpart.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/diskpart.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h (added) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,201 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/diskpart.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#ifndef DISKPART_H +#define DISKPART_H + +/* INCLUDES ******************************************************************/ + +#include <windows.h> +#include <stdio.h> +#include <string.h> +#include <ctype.h> + +#include "resource.h" + +/* DEFINES *******************************************************************/ + +typedef struct _COMMAND +{ + WCHAR *name; + BOOL (*func)(INT, WCHAR**); + VOID (*help)(INT, WCHAR**); +} COMMAND, *PCOMMAND; + +extern COMMAND cmds[]; + +/* NOERR codes for the program */ +#define ERROR_NONE 0 +#define ERROR_FATAL 1 +#define ERROR_CMD_ARG 2 +#define ERROR_FILE 3 +#define ERROR_SERVICE 4 +#define ERROR_SYNTAX 5 + +#define DISKPART_VERSION L"0.0.019" + +#define MAX_STRING_SIZE 1024 +#define MAX_ARGS_COUNT 256 + +/* PROTOTYPES *****************************************************************/ + +/* active.c */ +BOOL active_main(INT argc, WCHAR **argv); +VOID help_active(INT argc, WCHAR **argv); + +/* add.c */ +BOOL add_main(INT argc, WCHAR **argv); +VOID help_add(INT argc, WCHAR **argv); + +/* assign.c */ +BOOL assign_main(INT argc, WCHAR **argv); +VOID help_assign(INT argc, WCHAR **argv); + +/* attach.c */ +BOOL attach_main(INT argc, WCHAR **argv); +VOID help_attach(INT argc, WCHAR **argv); + +/* attributes.h */ +VOID help_attributes(INT argc, WCHAR **argv); +BOOL attributes_main(INT argc, WCHAR **argv); + +/* automount.c */ +BOOL automount_main(INT argc, WCHAR **argv); +VOID help_automount(INT argc, WCHAR **argv); + +/* break.c */ +BOOL break_main(INT argc, WCHAR **argv); +VOID help_break(INT argc, WCHAR **argv); + +/* clean.c */ +BOOL clean_main(INT argc, WCHAR **argv); +VOID help_clean(INT argc, WCHAR **argv); + +/* compact.c */ +BOOL compact_main(INT argc, WCHAR **argv); +VOID help_compact(INT argc, WCHAR **argv); + +/* convert.c */ +BOOL convert_main(INT argc, WCHAR **argv); +VOID help_convert(INT argc, WCHAR **argv); + +/* create.c */ +BOOL create_main(INT argc, WCHAR **argv); +VOID help_create(INT argc, WCHAR **argv); + +/* delete.c */ +BOOL delete_main(INT argc, WCHAR **argv); +VOID help_delete(INT argc, WCHAR **argv); + +/* detach.c */ +BOOL detach_main(INT argc, WCHAR **argv); +VOID help_detach(INT argc, WCHAR **argv); + +/* detail.c */ +BOOL detail_main(INT argc, WCHAR **argv); +VOID help_detail(INT argc, WCHAR **argv); + +/* diskpart.c */ +VOID PrintResourceString(INT resID, ...); + +/* expand.c */ +BOOL expand_main(INT argc, WCHAR **argv); +VOID help_expand(INT argc, WCHAR **argv); + +/* extend.c */ +BOOL extend_main(INT argc, WCHAR **argv); +VOID help_extend(INT argc, WCHAR **argv); + +/* filesystem.c */ +BOOL filesystems_main(INT argc, WCHAR **argv); +VOID help_filesystems(INT argc, WCHAR **argv); + +/* format.c */ +BOOL format_main(INT argc, WCHAR **argv); +VOID help_format(INT argc, WCHAR **argv); + +/* gpt.c */ +BOOL gpt_main(INT argc, WCHAR **argv); +VOID help_gpt(INT argc, WCHAR **argv); + +/* help.c */ +BOOL help_main(INT argc, WCHAR **argv); +VOID help_help(INT argc, WCHAR **argv); +VOID help_cmdlist(VOID); +VOID help_print_noerr(VOID); + +/* import. c */ +BOOL import_main(INT argc, WCHAR **argv); +VOID help_import(INT argc, WCHAR **argv); + +/* inactive.c */ +BOOL inactive_main(INT argc, WCHAR **argv); +VOID help_inactive(INT argc, WCHAR **argv); + +/* interpreter.c */ +BOOL interpret_script(WCHAR *line); +BOOL interpret_main(VOID); +BOOL interpret_cmd(INT argc, WCHAR **argv); + +/* list.c */ +BOOL list_main(INT argc, WCHAR **argv); +VOID help_list(INT argc, WCHAR **argv); + +/* merge.c */ +BOOL merge_main(INT argc, WCHAR **argv); +VOID help_merge(INT argc, WCHAR **argv); + +/* offline.c */ +BOOL offline_main(INT argc, WCHAR **argv); +VOID help_offline(INT argc, WCHAR **argv); + +/* online.c */ +BOOL online_main(INT argc, WCHAR **argv); +VOID help_online(INT argc, WCHAR **argv); + +/* recover.c */ +BOOL recover_main(INT argc, WCHAR **argv); +VOID help_recover(INT argc, WCHAR **argv); + +/* remove.c */ +BOOL remove_main(INT argc, WCHAR **argv); +VOID help_remove(INT argc, WCHAR **argv); + +/* repair.c */ +BOOL repair_main(INT argc, WCHAR **argv); +VOID help_repair(INT argc, WCHAR **argv); + +/* rescan.c */ +BOOL rescan_main(INT argc, WCHAR **argv); +VOID help_rescan(INT argc, WCHAR **argv); + +/* retain.c */ +BOOL retain_main(INT argc, WCHAR **argv); +VOID help_retain(INT argc, WCHAR **argv); + +/* san.c */ +BOOL san_main(INT argc, WCHAR **argv); +VOID help_san(INT argc, WCHAR **argv); + +/* select.c */ +BOOL select_main(INT argc, WCHAR **argv); +VOID help_select(INT argc, WCHAR **argv); + +/* setid.c */ +BOOL setid_main(INT argc, WCHAR **argv); +VOID help_setid(INT argc, WCHAR **argv); + +/* shrink.c */ +BOOL shrink_main(INT argc, WCHAR **argv); +VOID help_shrink(INT argc, WCHAR **argv); + +/* uniqueid.c */ +BOOL uniqueid_main(INT argc, WCHAR **argv); +VOID help_uniqueid(INT argc, WCHAR **argv); + +#endif /* DISKPART_H */ Propchange: trunk/reactos/base/system/diskpart/diskpart.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/diskpart.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/diskpart.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.rbuild (added) +++ trunk/reactos/base/system/diskpart/diskpart.rbuild [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,46 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="diskpart" type="win32cui" installbase="system32" installname="diskpart.exe" unicode="true" > + <include base="diskpart">.</include> +  + <library>user32</library> + <file>active.c</file> + <file>add.c</file> + <file>assign.c</file> + <file>attach.c</file> + <file>attributes.c</file> + <file>automount.c</file> + <file>break.c</file> + <file>clean.c</file> + <file>compact.c</file> + <file>convert.c</file> + <file>create.c</file> + <file>delete.c</file> + <file>detach.c</file> + <file>detail.c</file> + <file>diskpart.c</file> + <file>expand.c</file> + <file>extend.c</file> + <file>filesystems.c</file> + <file>format.c</file> + <file>gpt.c</file> + <file>help.c</file> + <file>import.c</file> + <file>inactive.c</file> + <file>interpreter.c</file> + <file>list.c</file> + <file>merge.c</file> + <file>offline.c</file> + <file>online.c</file> + <file>recover.c</file> + <file>remove.c</file> + <file>repair.c</file> + <file>rescan.c</file> + <file>retain.c</file> + <file>san.c</file> + <file>select.c</file> + <file>setid.c</file> + <file>shrink.c</file> + <file>uniqueid.c</file> + <file>diskpart.rc</file> +</module> Propchange: trunk/reactos/base/system/diskpart/diskpart.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/diskpart.rbuild ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.rc (added) +++ trunk/reactos/base/system/diskpart/diskpart.rc [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,7 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Disk Partitioning Tool\0" +#define REACTOS_STR_INTERNAL_NAME "diskpart\0" +#define REACTOS_STR_ORIGINAL_FILENAME "diskpart.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "(C) 2011 Lee Schroeder\0" +#include <reactos/version.rc> + +#include "lang/en-US.rc" Propchange: trunk/reactos/base/system/diskpart/diskpart.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/diskpart.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/expand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/expan… ============================================================================== --- trunk/reactos/base/system/diskpart/expand.c (added) +++ trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/expand.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL expand_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_expand(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_EXPAND); +} Propchange: trunk/reactos/base/system/diskpart/expand.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/expand.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/extend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/exten… ============================================================================== --- trunk/reactos/base/system/diskpart/extend.c (added) +++ trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/extend.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL extend_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_extend(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_EXTEND); +} Propchange: trunk/reactos/base/system/diskpart/extend.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/extend.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/filesystems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/files… ============================================================================== --- trunk/reactos/base/system/diskpart/filesystems.c (added) +++ trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/filesystems.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL filesystems_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_filesystems(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_FILESYSTEMS); +} Propchange: trunk/reactos/base/system/diskpart/filesystems.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/filesystems.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/forma… ============================================================================== --- trunk/reactos/base/system/diskpart/format.c (added) +++ trunk/reactos/base/system/diskpart/format.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/format.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL format_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_format(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_FORMAT); +} Propchange: trunk/reactos/base/system/diskpart/format.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/format.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/gpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/gpt.c… ============================================================================== --- trunk/reactos/base/system/diskpart/gpt.c (added) +++ trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/gpt.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL gpt_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +VOID help_gpt(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_GPT); +} Propchange: trunk/reactos/base/system/diskpart/gpt.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/gpt.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/help.… ============================================================================== --- trunk/reactos/base/system/diskpart/help.c (added) +++ trunk/reactos/base/system/diskpart/help.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,97 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/help.c + * PURPOSE: Manages all the partitions of the OS in an interactive way + * PROGRAMMERS: Lee Schroeder + */ + +#include "diskpart.h" + + +/* + * help_cmdlist(): + * shows all the available commands and basic descriptions for diskpart + */ +VOID help_cmdlist(VOID) +{ + /* Print the header information */ + PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); + + /* lists all the commands and the basic descriptions */ + PrintResourceString(IDS_HELP_CMD_DESC_ACTIVE); + PrintResourceString(IDS_HELP_CMD_DESC_ADD); + PrintResourceString(IDS_HELP_CMD_DESC_ASSIGN); + PrintResourceString(IDS_HELP_CMD_DESC_ATTACH); + PrintResourceString(IDS_HELP_CMD_DESC_ATTRIBUTES); + PrintResourceString(IDS_HELP_CMD_DESC_AUTOMOUNT); + PrintResourceString(IDS_HELP_CMD_DESC_BREAK); + PrintResourceString(IDS_HELP_CMD_DESC_CLEAN); + PrintResourceString(IDS_HELP_CMD_DESC_COMPACT); + PrintResourceString(IDS_HELP_CMD_DESC_CONVERT); + PrintResourceString(IDS_HELP_CMD_DESC_CREATE); + PrintResourceString(IDS_HELP_CMD_DESC_DELETE); + PrintResourceString(IDS_HELP_CMD_DESC_DETACH); + PrintResourceString(IDS_HELP_CMD_DESC_DETAIL); + PrintResourceString(IDS_HELP_CMD_DESC_EXIT); + PrintResourceString(IDS_HELP_CMD_DESC_EXPAND); + PrintResourceString(IDS_HELP_CMD_DESC_EXTEND); + PrintResourceString(IDS_HELP_CMD_DESC_FS); + PrintResourceString(IDS_HELP_CMD_DESC_FORMAT); + PrintResourceString(IDS_HELP_CMD_DESC_GPT); + PrintResourceString(IDS_HELP_CMD_DESC_HELP); + PrintResourceString(IDS_HELP_CMD_DESC_IMPORT); + PrintResourceString(IDS_HELP_CMD_DESC_INACTIVE); + PrintResourceString(IDS_HELP_CMD_DESC_LIST); + PrintResourceString(IDS_HELP_CMD_DESC_MERGE); + PrintResourceString(IDS_HELP_CMD_DESC_OFFLINE); + PrintResourceString(IDS_HELP_CMD_DESC_ONLINE); + PrintResourceString(IDS_HELP_CMD_DESC_RECOVER); + PrintResourceString(IDS_HELP_CMD_DESC_REM); + PrintResourceString(IDS_HELP_CMD_DESC_REMOVE); + PrintResourceString(IDS_HELP_CMD_DESC_REPAIR); + PrintResourceString(IDS_HELP_CMD_DESC_RESCAN); + PrintResourceString(IDS_HELP_CMD_DESC_RETAIN); + PrintResourceString(IDS_HELP_CMD_DESC_SAN); + PrintResourceString(IDS_HELP_CMD_DESC_SELECT); + PrintResourceString(IDS_HELP_CMD_DESC_SETID); + PrintResourceString(IDS_HELP_CMD_DESC_SHRINK); + PrintResourceString(IDS_HELP_CMD_DESC_UNIQUEID); + printf("\n"); +} + + +VOID help_help(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_HELP); +} + + + +/* help_main(char *arg): + * main entry point for the help command. Gives help to users who needs it. + */ +BOOL help_main(INT argc, WCHAR **argv) +{ + PCOMMAND cmdptr; + + if (argc == 1) + { + help_cmdlist(); + return TRUE; + } + + /* Scan internal command table */ + for (cmdptr = cmds; cmdptr->name; cmdptr++) + { + if (_wcsicmp(argv[0], cmdptr->name) == 0 && cmdptr->help != NULL) + { + cmdptr->help(argc, argv); + return TRUE; + } + } + + help_cmdlist(); + + return TRUE; +} Propchange: trunk/reactos/base/system/diskpart/help.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/help.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/impor… ============================================================================== --- trunk/reactos/base/system/diskpart/import.c (added) +++ trunk/reactos/base/system/diskpart/import.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,19 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/import.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL import_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + +VOID help_import(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_IMPORT); +} Propchange: trunk/reactos/base/system/diskpart/import.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/import.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/inactive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inact… ============================================================================== --- trunk/reactos/base/system/diskpart/inactive.c (added) +++ trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/inactive.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL inactive_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_inactive(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_INACTIVE); +} Propchange: trunk/reactos/base/system/diskpart/inactive.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/inactive.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c (added) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,188 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/interpreter.c + * PURPOSE: Reads the user input and then envokes the selected + * command by the user. + * PROGRAMMERS: Lee Schroeder + */ + +#include "diskpart.h" + +BOOL exit_main(INT argc, WCHAR **argv); +BOOL rem_main(INT argc, WCHAR **argv); + + +COMMAND cmds[] = +{ + {L"active", active_main, help_active}, + {L"add", add_main, help_add}, + {L"assign", assign_main, help_assign}, + {L"attributes", attributes_main, help_attributes}, + {L"automount", automount_main, help_automount}, + {L"break", break_main, help_break}, + {L"clean", clean_main, help_clean}, + {L"compact", compact_main, help_compact}, + {L"convert", convert_main, help_convert}, + {L"create", create_main, help_create}, + {L"delete", delete_main, help_delete}, + {L"detail", detail_main, help_detail}, + {L"detach", detach_main, help_detach}, + {L"exit", exit_main, NULL}, + {L"expand", expand_main, help_expand}, + {L"extend", extend_main, help_extend}, + {L"filesystems", filesystems_main, help_filesystems}, + {L"format", format_main, help_format}, + {L"gpt", gpt_main, help_gpt}, + {L"help", help_main, help_help}, + {L"list", list_main, help_list}, + {L"import", import_main, help_import}, + {L"inactive", inactive_main, help_inactive}, + {L"merge", merge_main, help_merge}, + {L"offline", offline_main, help_offline}, + {L"online", online_main, help_online}, + {L"recover", recover_main, help_recover}, + {L"rem", rem_main, NULL}, + {L"remove", remove_main, help_remove}, + {L"repair", repair_main, help_repair}, + {L"rescan", rescan_main, help_rescan}, + {L"retain", retain_main, help_retain}, + {L"san", san_main, help_san}, + {L"select", select_main, help_select}, + {L"setid", setid_main, help_setid}, + {L"shrink", shrink_main, help_shrink}, + {L"uniqueid", uniqueid_main, help_uniqueid}, + {NULL, NULL, NULL} +}; + + +/* FUNCTIONS *****************************************************************/ + +BOOL +exit_main(INT argc, WCHAR **argv) +{ + return FALSE; +} + + +BOOL +rem_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +/* + * interpret_cmd(char *cmd_line, char *arg_line): + * compares the command name to a list of available commands, and + * determines which function to envoke. + */ +BOOL +interpret_cmd(int argc, WCHAR **argv) +{ + PCOMMAND cmdptr; + + /* Scan internal command table */ + for (cmdptr = cmds; cmdptr->name; cmdptr++) + { + if (wcsicmp(argv[0], cmdptr->name) == 0) + { + return cmdptr->func(argc, argv); + } + } + + help_cmdlist(); + + return TRUE; +} + + +/* + * interpret_script(char *line): + * The main function used for when reading commands from scripts. + */ +BOOL +interpret_script(WCHAR *input_line) +{ + WCHAR *args_vector[MAX_ARGS_COUNT]; + INT args_count = 0; + BOOL bWhiteSpace = TRUE; + WCHAR *ptr; + + memset(args_vector, 0, sizeof(args_vector)); + + ptr = input_line; + while (*ptr != 0) + { + if (iswspace(*ptr) || *ptr == L'\n') + { + *ptr = 0; + bWhiteSpace = TRUE; + } + else + { + if ((bWhiteSpace == TRUE) && (args_count < MAX_ARGS_COUNT)) + { + args_vector[args_count] = ptr; + args_count++; + } + + bWhiteSpace = FALSE; + } + + ptr++; + } + + /* sends the string to find the command */ + return interpret_cmd(args_count, args_vector); +} + + +/* + * interpret_main(): + * Contents for the main program loop as it reads each line, and then + * it sends the string to interpret_line, where it determines what + * command to use. + */ +BOOL +interpret_main(VOID) +{ + WCHAR input_line[MAX_STRING_SIZE]; + WCHAR *args_vector[MAX_ARGS_COUNT]; + INT args_count = 0; + BOOL bWhiteSpace = TRUE; + WCHAR *ptr; + + memset(args_vector, 0, sizeof(args_vector)); + + /* shown just before the input where the user places commands */ + PrintResourceString(IDS_APP_PROMPT); + + /* gets input from the user. */ + fgetws(input_line, MAX_STRING_SIZE, stdin); + + ptr = input_line; + while (*ptr != 0) + { + if (iswspace(*ptr) || *ptr == L'\n') + { + *ptr = 0; + bWhiteSpace = TRUE; + } + else + { + if ((bWhiteSpace == TRUE) && (args_count < MAX_ARGS_COUNT)) + { + args_vector[args_count] = ptr; + args_count++; + } + + bWhiteSpace = FALSE; + } + + ptr++; + } + + /* sends the string to find the command */ + return interpret_cmd(args_count, args_vector); +} Propchange: trunk/reactos/base/system/diskpart/interpreter.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/interpreter.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/base/system/diskpart/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Sep 24 10:33:33 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/diskpart/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/diskpart/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/diskpart/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc (added) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,359 @@ +/* + * ReactOS DiskPart Resource File + * Langauge: US English (en-US) + * Author: Lee Schroeder + */ + +#include <windows.h> + +#include "../resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +/* Basic application information */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_HEADER, "\nReactOS DiskPart version %s\n" + IDS_APP_LICENSE, "Licensed under the GNU GPLv2\n" + IDS_APP_CURR_COMPUTER, "On computer: %s\n\n" + IDS_APP_LEAVING, "\nLeaving DiskPart...\n" + IDS_APP_PROMPT, "DISKPART> " +END + +/* Disk Information Labels */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_DETAIL_INFO_DISK_ID, "Disk" + IDS_DETAIL_INFO_TYPE, "Type" + IDS_DETAIL_INFO_STATUS, "Status" + IDS_DETAIL_INFO_PATH, "Path" + IDS_DETAIL_INFO_TARGET, "Target" + IDS_DETAIL_INFO_LUN_ID, "LUN ID" + IDS_DETAIL_INFO_LOC_PATH, "Location Path" + IDS_DETAIL_INFO_CURR_RO_STATE, "Current Read-only State" + IDS_DETAIL_INFO_RO, "Read-only" + IDS_DETAIL_INFO_BOOT_DSK, "Boot Disk" + IDS_DETAIL_INFO_PAGE_FILE_DSK, "Pagefile Disk" + IDS_DETAIL_INFO_HIBER_FILE_DSK, "Hibernation File Disk" + IDS_DETAIL_INFO_CRASH_DSK, "Crashdump Disk" + IDS_DETAIL_INFO_CLST_DSK, "Clustered Disk" +END + +/* Detail header titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_DISK_HEAD "Disk ### Status\tSize\tFree\tDyn\tGpt\n" + IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" + IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" +END + +/* Disk Status */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_STATUS_YES "Yes" + IDS_STATUS_NO "No" + IDS_STATUS_DISK_HEALTHY "Healthy" + IDS_STATUS_DISK_SICK "Sick" + IDS_STATUS_UNAVAILABLE "UNAVAILABLE" + IDS_STATUS_ONLINE "Online" + IDS_STATUS_OFFLINE "Offline" + IDS_STATUS_NO_MEDIA "No Media" +END + +/* CMD Messages for commands */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSG_CURRENT_DSK_STATUS "is now the selected disk." + IDS_MSG_NO_DISK "There is no disk currently selected.\nPlease select a disk and try again." + IDS_MSG_ARG_SYNTAX_ERROR "The argument(s) specified for this command are not valid.\nFor more information on the command type:" +END + + +/* Help Command Descripions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DESC_ACTIVE "ACTIVE\t\t- Mark the selected partition as active.\n" + IDS_HELP_CMD_DESC_ADD "ADD\t\t- Add a mirror to a simple volume.\n" + IDS_HELP_CMD_DESC_ASSIGN "ASSIGN\t\t- Assign a drive letter or mount point to the selected volume.\n" + IDS_HELP_CMD_DESC_ATTACH "ATTACH\t\t- Attaches a virtual disk file.\n" + IDS_HELP_CMD_DESC_ATTRIBUTES "ATTRIBUTES\t- Manipulate volume or disk attributes.\n" + IDS_HELP_CMD_DESC_AUTOMOUNT "AUTOMOUNT\t- Enable and Disable automatic mounting of basic volumes.\n" + IDS_HELP_CMD_DESC_BREAK "BREAK\t\t- Break a mirror set.\n" + IDS_HELP_CMD_DESC_CLEAN "CLEAN\t\t- Clear the configuration information, or all information, off\n\t\t the disk.\n" + IDS_HELP_CMD_DESC_COMPACT "COMPACT\t\t- Attempts to reduce the physical size of the file.\n" + IDS_HELP_CMD_DESC_CONVERT "CONVERT\t\t- Convert between different disk formats.\n" + IDS_HELP_CMD_DESC_CREATE "CREATE\t\t- Create a volume, partition, or virtual disk.\n" + IDS_HELP_CMD_DESC_DELETE "DELETE\t\t- Delete an object.\n" + IDS_HELP_CMD_DESC_DETACH "DETACH\t\t- Detaches a virtual disk file.\n" + IDS_HELP_CMD_DESC_DETAIL "DETAIL\t\t- Provide details about an object.\n" + IDS_HELP_CMD_DESC_EXIT "EXIT\t\t- Exit DiskPart.\n" + IDS_HELP_CMD_DESC_EXPAND "EXPAND\t\t- Expands the maximum size available on a virtual disk.\n" + IDS_HELP_CMD_DESC_EXTEND "EXTEND\t\t- Extend a volume.\n" + IDS_HELP_CMD_DESC_FS "FILESYSTEMS\t- Display current and supported file systems on the volume.\n" + IDS_HELP_CMD_DESC_FORMAT "FORMAT\t\t- Format the volume or partition.\n" + IDS_HELP_CMD_DESC_GPT "GPT\t\t- Assign attributes to the selected GPT partition.\n" + IDS_HELP_CMD_DESC_HELP "HELP\t\t- Display a list of commands.\n" + IDS_HELP_CMD_DESC_IMPORT "IMPORT\t\t- Import a disk group.\n" + IDS_HELP_CMD_DESC_INACTIVE "INACTIVE\t- Mark the selected partition as inactive.\n" + IDS_HELP_CMD_DESC_LIST "LIST\t\t- Display a list of objects.\n" + IDS_HELP_CMD_DESC_MERGE "MERGE\t\t- Merges a child disk with its parents.\n" + IDS_HELP_CMD_DESC_OFFLINE "OFFLINE\t\t- Offline an object that is currently marked as online.\n" + IDS_HELP_CMD_DESC_ONLINE "ONLINE\t\t- Online an object that is currently marked as offline.\n" + IDS_HELP_CMD_DESC_RECOVER "RECOVER\t\t- Refreshes the state of all disks in the invalid pack,\n\t\t and resynchronizes mirrored volumes and RAID5 volumes\n\t\t that have stale plex or parity data.\n" + IDS_HELP_CMD_DESC_REM "REM\t\t- Does nothing. This is used to comment scripts.\n" + IDS_HELP_CMD_DESC_REMOVE "REMOVE\t\t- Remove a drive letter or mount point assignment.\n" + IDS_HELP_CMD_DESC_REPAIR "REPAIR\t\t- Repair a RAID-5 volume with a failed member.\n" + IDS_HELP_CMD_DESC_RESCAN "RESCAN\t\t- Rescan the computer looking for disks and volumes.\n" + IDS_HELP_CMD_DESC_RETAIN "RETAIN\t\t- Place a retained partition under a simple volume.\n" + IDS_HELP_CMD_DESC_SAN "SAN\t\t- Display or set the SAN policy for the currently booted OS.\n" + IDS_HELP_CMD_DESC_SELECT "SELECT\t\t- Shift the focus to an object.\n" + IDS_HELP_CMD_DESC_SETID "SETID\t\t- Change the partition type.\n" + IDS_HELP_CMD_DESC_SHRINK "SHRINK\t\t- Reduce the size of the selected volume.\n" + IDS_HELP_CMD_DESC_UNIQUEID "UNIQUEID\t- Displays or sets the GUID partition table (GPT) identifier\n\t\t or master boot record (MBR) signature of a disk." +END + +/* Common Error Messages */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR_MSG_NO_SCRIPT "Error opening script file: %s\n" +END + + + +/* Active help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ACTIVE "\n\ +<Add active command help text here>\n\n" +END + +/* Add help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ADD "\n\ +<Add add command help text here>\n\n" +END + +/* Assign help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ASSIGN "\n\ +<Add assign command help text here>\n\n" +END + +/* Attach help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ATTACH "\n\ +<Add attach command help text here>\n\n" +END + +/* Attributes Command Messages */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ATTRIBUTES "\n\ +<Add attributes command help text here>\n\n" +END + +/* Automount help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_AUTOMOUNT "\n\ +<Add automount command help text here>\n\n" +END + +/* Break help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_BREAK "\n\ +<Add break command help text here>\n\n" +END + +/* Clean help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CLEAN "\n\ +<Add clean command help text here>\n\n" +END + +/* Compact help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_COMPACT "\n\ +<Add compact command help text here>\n\n" +END + +/* Convert help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CONVERT "\n\ +<Add convert command help text here>\n\n" +END + +/* Delete help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DELETE "\n\ +<Add delete command help text here>\n\n" +END + +/* Detach help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DETACH "\n\ +<Add detach command help text here>\n\n" +END + +/* Expand help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_EXPAND "\n\ +<Add expand command help text here>\n\n" +END + +/* Extend help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_EXTEND "\n\ +<Add extend command help text here>\n\n" +END + +/* Filesystems help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_FILESYSTEMS "\n\ +<Add filesystems command help text here>\n\n" +END + +/* Format help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_FORMAT "\n\ +<Add format command help text here>\n\n" +END + +/* GPT help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_GPT "\n\ +<Add gpt command help text here>\n\n" +END + +/* Help help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_HELP "\n\ +<Add help command help text here>\n\n" +END + +/* Import help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_IMPORT "\n\ +<Add import command help text here>\n\n" +END + +/* Inactive help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_INACTIVE "\n\ +<Add inactive command help text here>\n\n" +END + +/* List help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_LIST "\n\ +<Add list command help text here>\n\n" +END + +/* Merge help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_MERGE "\n\ +<Add merge command help text here>\n\n" +END + +/* Offline help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_OFFLINE "\n\ +<Add OFFLINE command help text here>\n\n" +END + +/* Online help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_ONLINE "\n\ +<Add ONLINE command help text here>\n\n" +END + +/* Recover help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_RECOVER "\n\ +<Add RECOVER command help text here>\n\n" +END + +/* Remove help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_REMOVE "\n\ +<Add REMOVE command help text here>\n\n" +END + +/* Repair help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_REPAIR "\n\ +<Add REPAIR command help text here>\n\n" +END + +/* Rescan help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_RESCAN "\n\ +<Add RESCAN command help text here>\n\n" +END + +/* Retain help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_RETAIN "\n\ +<Add RETAIN command help text here>\n\n" +END + +/* San help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_SAN "\n\ +<Add SAN command help text here>\n\n" +END + +/* Select help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_SELECT "\n\ +<Add SELECT command help text here>\n\n" +END + +/* Setid help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_SETID "\n\ +<Add SETID command help text here>\n\n" +END + +/* Setid help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_SHRINK "\n\ +<Add SHRINK command help text here>\n\n" +END + +/* Uniqueid help descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_UNIQUEID "\n\ +<Add UNIQUEID command help text here>\n\n" +END Propchange: trunk/reactos/base/system/diskpart/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/lang/en-US.rc ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.… ============================================================================== --- trunk/reactos/base/system/diskpart/list.c (added) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,73 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/list.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +static VOID list_disk(VOID) +{ + /* Header labels */ + PrintResourceString(IDS_LIST_DISK_HEAD); + PrintResourceString(IDS_LIST_DISK_LINE); + + printf("\n\n"); +} + +static VOID list_partition(VOID) +{ + printf("List Partition!!\n"); +} + +static VOID list_volume(VOID) +{ + PrintResourceString(IDS_LIST_VOLUME_HEAD); +} + +static VOID list_vdisk(VOID) +{ + printf("List VDisk!!\n"); +} + +BOOL list_main(INT argc, WCHAR **argv) +{ + /* gets the first word from the string */ + if (argc == 1) + { + help_list(0, NULL); + return TRUE; + } + + /* determines which to list (disk, partition, etc.) */ + if(!wcsicmp(argv[1], L"disk")) + { + list_disk(); + } + else if(!wcsicmp(argv[1], L"partition")) + { + list_partition(); + } + else if(!wcsicmp(argv[1], L"volume")) + { + list_volume(); + } + else if(!wcsicmp(argv[1], L"vdisk")) + { + list_vdisk(); + } + else + { + help_list(0, NULL); + } + + return TRUE; +} + + +VOID help_list(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_LIST); +} Propchange: trunk/reactos/base/system/diskpart/list.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/list.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/merge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/merge… ============================================================================== --- trunk/reactos/base/system/diskpart/merge.c (added) +++ trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/merge.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL merge_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_merge(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_MERGE); +} Propchange: trunk/reactos/base/system/diskpart/merge.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/merge.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/offline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/offli… ============================================================================== --- trunk/reactos/base/system/diskpart/offline.c (added) +++ trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/offline.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL offline_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_offline(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_OFFLINE); +} Propchange: trunk/reactos/base/system/diskpart/offline.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/offline.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/online.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/onlin… ============================================================================== --- trunk/reactos/base/system/diskpart/online.c (added) +++ trunk/reactos/base/system/diskpart/online.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/online.h + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL online_main(INT argc, WCHAR **argv) +{ + help_online(0, NULL); + + return TRUE; +} + + +VOID help_online(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_ONLINE); +} Propchange: trunk/reactos/base/system/diskpart/online.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/online.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/recov… ============================================================================== --- trunk/reactos/base/system/diskpart/recover.c (added) +++ trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/recover.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL recover_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_recover(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_RECOVER); +} Propchange: trunk/reactos/base/system/diskpart/recover.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/recover.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.c (added) +++ trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/remove.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL remove_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_remove(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_REMOVE); +} Propchange: trunk/reactos/base/system/diskpart/remove.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/remove.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/remove.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.h (added) +++ trunk/reactos/base/system/diskpart/remove.h [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,16 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/remove.h + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#ifndef REMOVE_H_INCLUDED +#define REMOVE_H_INCLUDED + +/* FUNCTIONS *****************************************************************/ +BOOL remove_main(INT argc, WCHAR **argv); +VOID help_remove(INT argc, WCHAR **argv); + +#endif // REMOVE_H_INCLUDED Propchange: trunk/reactos/base/system/diskpart/remove.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/remove.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/repair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/repai… ============================================================================== --- trunk/reactos/base/system/diskpart/repair.c (added) +++ trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,22 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/repair.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL repair_main(INT argc, WCHAR **argv) +{ + printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); + + return TRUE; +} + + +VOID help_repair(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_REPAIR); +} Propchange: trunk/reactos/base/system/diskpart/repair.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/repair.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/rescan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resca… ============================================================================== --- trunk/reactos/base/system/diskpart/rescan.c (added) +++ trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/rescan.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL rescan_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_rescan(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_RESCAN); +} Propchange: trunk/reactos/base/system/diskpart/rescan.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/rescan.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h (added) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,128 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/lang/resource.h + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#ifndef RESOURCE_H +#define RESOURCE_H + +#define IDS_APP_HEADER 0 +#define IDS_APP_LICENSE 2 +#define IDS_APP_CURR_COMPUTER 3 +#define IDS_APP_LEAVING 4 +#define IDS_APP_PROMPT 5 + +#define IDS_DETAIL_INFO_DISK_ID 6 +#define IDS_DETAIL_INFO_TYPE 7 +#define IDS_DETAIL_INFO_STATUS 8 +#define IDS_DETAIL_INFO_PATH 9 +#define IDS_DETAIL_INFO_TARGET 10 +#define IDS_DETAIL_INFO_LUN_ID 11 +#define IDS_DETAIL_INFO_LOC_PATH 12 +#define IDS_DETAIL_INFO_CURR_RO_STATE 13 +#define IDS_DETAIL_INFO_RO 14 +#define IDS_DETAIL_INFO_BOOT_DSK 15 +#define IDS_DETAIL_INFO_PAGE_FILE_DSK 16 +#define IDS_DETAIL_INFO_HIBER_FILE_DSK 17 +#define IDS_DETAIL_INFO_CRASH_DSK 18 +#define IDS_DETAIL_INFO_CLST_DSK 19 + +#define IDS_LIST_DISK_HEAD 20 +#define IDS_LIST_DISK_LINE 21 +#define IDS_LIST_VOLUME_HEAD 22 + +#define IDS_STATUS_YES 31 +#define IDS_STATUS_NO 32 +#define IDS_STATUS_DISK_HEALTHY 33 +#define IDS_STATUS_DISK_SICK 34 +#define IDS_STATUS_UNAVAILABLE 35 +#define IDS_STATUS_ONLINE 36 +#define IDS_STATUS_OFFLINE 37 +#define IDS_STATUS_NO_MEDIA 38 + +#define IDS_MSG_CURRENT_DSK_STATUS 39 +#define IDS_MSG_NO_DISK 40 +#define IDS_MSG_ARG_SYNTAX_ERROR 41 + +#define IDS_HELP_CMD_DESC_ACTIVE 58 +#define IDS_HELP_CMD_DESC_ADD 59 +#define IDS_HELP_CMD_DESC_ASSIGN 60 +#define IDS_HELP_CMD_DESC_ATTRIBUTES 61 +#define IDS_HELP_CMD_DESC_ATTACH 62 +#define IDS_HELP_CMD_DESC_AUTOMOUNT 63 +#define IDS_HELP_CMD_DESC_BREAK 64 +#define IDS_HELP_CMD_DESC_CLEAN 65 +#define IDS_HELP_CMD_DESC_COMPACT 66 +#define IDS_HELP_CMD_DESC_CONVERT 67 +#define IDS_HELP_CMD_DESC_CREATE 68 +#define IDS_HELP_CMD_DESC_DELETE 69 +#define IDS_HELP_CMD_DESC_DETAIL 70 +#define IDS_HELP_CMD_DESC_DETACH 71 +#define IDS_HELP_CMD_DESC_EXIT 72 +#define IDS_HELP_CMD_DESC_EXTEND 73 +#define IDS_HELP_CMD_DESC_EXPAND 74 +#define IDS_HELP_CMD_DESC_FS 75 +#define IDS_HELP_CMD_DESC_FORMAT 76 +#define IDS_HELP_CMD_DESC_GPT 77 +#define IDS_HELP_CMD_DESC_HELP 78 +#define IDS_HELP_CMD_DESC_IMPORT 79 +#define IDS_HELP_CMD_DESC_INACTIVE 80 +#define IDS_HELP_CMD_DESC_LIST 81 +#define IDS_HELP_CMD_DESC_MERGE 82 +#define IDS_HELP_CMD_DESC_ONLINE 83 +#define IDS_HELP_CMD_DESC_OFFLINE 84 +#define IDS_HELP_CMD_DESC_RECOVER 85 +#define IDS_HELP_CMD_DESC_REM 88 +#define IDS_HELP_CMD_DESC_REMOVE 89 +#define IDS_HELP_CMD_DESC_REPAIR 90 +#define IDS_HELP_CMD_DESC_RESCAN 91 +#define IDS_HELP_CMD_DESC_RETAIN 92 +#define IDS_HELP_CMD_DESC_SAN 93 +#define IDS_HELP_CMD_DESC_SELECT 94 +#define IDS_HELP_CMD_DESC_SETID 95 +#define IDS_HELP_CMD_DESC_SHRINK 96 +#define IDS_HELP_CMD_DESC_UNIQUEID 97 + +#define IDS_ERROR_MSG_NO_SCRIPT 104 + +#define IDS_HELP_CMD_ACTIVE 105 +#define IDS_HELP_CMD_ADD 106 +#define IDS_HELP_CMD_ASSIGN 107 +#define IDS_HELP_CMD_ATTACH 108 +#define IDS_HELP_CMD_ATTRIBUTES 109 +#define IDS_HELP_CMD_AUTOMOUNT 110 +#define IDS_HELP_CMD_BREAK 111 +#define IDS_HELP_CMD_CLEAN 112 +#define IDS_HELP_CMD_COMPACT 113 +#define IDS_HELP_CMD_CONVERT 114 +#define IDS_HELP_CMD_CREATE 115 +#define IDS_HELP_CMD_DELETE 116 +#define IDS_HELP_CMD_DETACH 117 +#define IDS_HELP_CMD_DETAIL 118 +#define IDS_HELP_CMD_EXPAND 119 +#define IDS_HELP_CMD_EXTEND 120 +#define IDS_HELP_CMD_FILESYSTEMS 121 +#define IDS_HELP_CMD_FORMAT 122 +#define IDS_HELP_CMD_GPT 123 +#define IDS_HELP_CMD_HELP 124 +#define IDS_HELP_CMD_IMPORT 125 +#define IDS_HELP_CMD_INACTIVE 126 +#define IDS_HELP_CMD_LIST 127 +#define IDS_HELP_CMD_MERGE 128 +#define IDS_HELP_CMD_OFFLINE 129 +#define IDS_HELP_CMD_ONLINE 130 +#define IDS_HELP_CMD_RECOVER 131 +#define IDS_HELP_CMD_REMOVE 132 +#define IDS_HELP_CMD_REPAIR 133 +#define IDS_HELP_CMD_RESCAN 134 +#define IDS_HELP_CMD_RETAIN 135 +#define IDS_HELP_CMD_SAN 136 +#define IDS_HELP_CMD_SELECT 137 +#define IDS_HELP_CMD_SETID 138 +#define IDS_HELP_CMD_SHRINK 139 +#define IDS_HELP_CMD_UNIQUEID 140 + +#endif // RESOURCE_H Propchange: trunk/reactos/base/system/diskpart/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/resource.h ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/retain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/retai… ============================================================================== --- trunk/reactos/base/system/diskpart/retain.c (added) +++ trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/retain.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL retain_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_retain(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_RETAIN); +} Propchange: trunk/reactos/base/system/diskpart/retain.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/retain.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/san.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/san.c… ============================================================================== --- trunk/reactos/base/system/diskpart/san.c (added) +++ trunk/reactos/base/system/diskpart/san.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/san.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL san_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_san(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_SAN); +} Propchange: trunk/reactos/base/system/diskpart/san.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/san.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/selec… ============================================================================== --- trunk/reactos/base/system/diskpart/select.c (added) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/select.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL select_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_select(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_SELECT); +} Propchange: trunk/reactos/base/system/diskpart/select.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/select.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/setid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/setid… ============================================================================== --- trunk/reactos/base/system/diskpart/setid.c (added) +++ trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/setid.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL setid_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_setid(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_SETID); +} Propchange: trunk/reactos/base/system/diskpart/setid.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/setid.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/shrink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/shrin… ============================================================================== --- trunk/reactos/base/system/diskpart/shrink.c (added) +++ trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/shrink.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL shrink_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_shrink(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_SHRINK); +} Propchange: trunk/reactos/base/system/diskpart/shrink.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/shrink.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Added: trunk/reactos/base/system/diskpart/uniqueid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/uniqu… ============================================================================== --- trunk/reactos/base/system/diskpart/uniqueid.c (added) +++ trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS DiskPart + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/diskpart/uniqueid.c + * PURPOSE: Manages all the partitions of the OS in + * an interactive way + * PROGRAMMERS: Lee Schroeder + */ +#include "diskpart.h" + +BOOL uniqueid_main(INT argc, WCHAR **argv) +{ + return TRUE; +} + + +VOID help_uniqueid(INT argc, WCHAR **argv) +{ + PrintResourceString(IDS_HELP_CMD_UNIQUEID); +} Propchange: trunk/reactos/base/system/diskpart/uniqueid.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/system/diskpart/uniqueid.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/base/system/system.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/system.rbuild?… ============================================================================== --- trunk/reactos/base/system/system.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/system.rbuild [iso-8859-1] Sat Sep 24 10:33:33 2011 @@ -6,6 +6,9 @@ </directory> <directory name="bootok"> <xi:include href="bootok/bootok.rbuild" /> + </directory> + <directory name="diskpart"> + <xi:include href="diskpart/diskpart.rbuild" /> </directory> <directory name="expand"> <xi:include href="expand/expand.rbuild" />

1 0

[tkreuzer] 53825: [NTOSKRNL] - Session space address layout is architecture specific, move its initialization into MiInitializeSesseionSpaceLayout() in architecture specific file - Use dedicated co...
by tkreuzer＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: tkreuzer Date: Sat Sep 24 08:52:26 2011 New Revision: 53825 URL: http://svn.reactos.org/svn/reactos?rev=53825&view=rev Log: [NTOSKRNL] - Session space address layout is architecture specific, move its initialization into MiInitializeSesseionSpaceLayout() in architecture specific file - Use dedicated constants for setting MmSystemRangeStart, MmUserProbeAddress and MmHighestUserAddress isnetad of making assumptions. Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Sep 24 08:52:26 2011 @@ -11,6 +11,9 @@ #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) /* Memory layout base addresses */ +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL +#define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL #define HYPER_SPACE 0xFFFFF70000000000ULL #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL #define MI_SESSION_SPACE_MINIMUM (PVOID)0xFFFFF90000000000ULL Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Sep 24 08:52:26 2011 @@ -29,9 +29,82 @@ MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; -extern PFN_NUMBER MiNumberOfFreePages; /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +INIT_FUNCTION +MiInitializeSessionSpaceLayout() +{ + // + // Set the size of session view, pool, and image + // + MmSessionSize = MI_SESSION_SIZE; + MmSessionViewSize = MI_SESSION_VIEW_SIZE; + MmSessionPoolSize = MI_SESSION_POOL_SIZE; + MmSessionImageSize = MI_SESSION_IMAGE_SIZE; + + // + // Set the size of system view + // + MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; + + // + // This is where it all ends + // + MiSessionImageEnd = (PVOID)PTE_BASE; + + // + // This is where we will load Win32k.sys and the video driver + // + MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - + MmSessionImageSize); + + // + // So the view starts right below the session working set (itself below + // the image area) + // + MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - + MmSessionImageSize - + MI_SESSION_WORKING_SET_SIZE - + MmSessionViewSize); + + // + // Session pool follows + // + MiSessionPoolEnd = MiSessionViewStart; + MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - + MmSessionPoolSize); + + // + // And it all begins here + // + MmSessionBase = MiSessionPoolStart; + + // + // Sanity check that our math is correct + // + ASSERT((ULONG_PTR)MmSessionBase + MmSessionSize == PTE_BASE); + + // + // Session space ends wherever image session space ends + // + MiSessionSpaceEnd = MiSessionImageEnd; + + // + // System view space ends at session space, so now that we know where + // this is, we can compute the base address of system view space itself. + // + MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - + MmSystemViewSize); + + /* Compute the PTE addresses for all the addresses we carved out */ + MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart); + MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd); + MiSessionBasePte = MiAddressToPte(MmSessionBase); + MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd); +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Sep 24 08:52:26 2011 @@ -28,6 +28,9 @@ #define MI_SYSTEM_VIEW_SIZE (16 * _1MB) +#define MI_HIGHEST_USER_ADDRESS (PVOID)0x7FFEFFFF +#define MI_USER_PROBE_ADDRESS (PVOID)0x7FFF0000 +#define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0x80000000 #define MI_SYSTEM_CACHE_WS_START (PVOID)0xC0C00000 #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 @@ -526,6 +529,14 @@ extern ULONG MmSystemPageColor; extern ULONG MmProcessColorSeed; extern PMMWSL MmWorkingSetList; +extern PFN_NUMBER MiNumberOfFreePages; +extern SIZE_T MmSessionViewSize; +extern SIZE_T MmSessionPoolSize; +extern SIZE_T MmSessionImageSize; +extern PVOID MiSystemViewStart; +extern PVOID MiSessionPoolEnd; // 0xBE000000 +extern PVOID MiSessionPoolStart; // 0xBD000000 +extern PVOID MiSessionViewStart; // 0xBE000000 // // Figures out the hardware bits for a PTE @@ -910,6 +921,10 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +VOID +NTAPI +MiInitializeSessionSpaceLayout(); + NTSTATUS NTAPI MiInitMachineDependent( 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] Sat Sep 24 08:52:26 2011 @@ -410,7 +410,7 @@ if (Descriptor->MemoryType != LoaderBad) { /* Count this in the total of pages */ - MmNumberOfPhysicalPages += Descriptor->PageCount; + MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount; } /* Check if this is the new lowest page */ @@ -1898,9 +1898,9 @@ // // Define the basic user vs. kernel address space separation // - MmSystemRangeStart = (PVOID)KSEG0_BASE; - MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; - MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); + MmSystemRangeStart = (PVOID)MI_DEFAULT_SYSTEM_RANGE_START; + MmUserProbeAddress = (ULONG_PTR)MI_HIGHEST_USER_ADDRESS; + MmHighestUserAddress = (PVOID)MI_HIGHEST_USER_ADDRESS; /* Highest PTE and PDE based on the addresses above */ MiHighestUserPte = MiAddressToPte(MmHighestUserAddress); @@ -1922,73 +1922,8 @@ MmBootImageSize = (MmBootImageSize + PDE_MAPPED_VA - 1) & ~(PDE_MAPPED_VA - 1); ASSERT((MmBootImageSize % PDE_MAPPED_VA) == 0); - // - // Set the size of session view, pool, and image - // - MmSessionSize = MI_SESSION_SIZE; - MmSessionViewSize = MI_SESSION_VIEW_SIZE; - MmSessionPoolSize = MI_SESSION_POOL_SIZE; - MmSessionImageSize = MI_SESSION_IMAGE_SIZE; - - // - // Set the size of system view - // - MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; - - // - // This is where it all ends - // - MiSessionImageEnd = (PVOID)PTE_BASE; - - // - // This is where we will load Win32k.sys and the video driver - // - MiSessionImageStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - - MmSessionImageSize); - - // - // So the view starts right below the session working set (itself below - // the image area) - // - MiSessionViewStart = (PVOID)((ULONG_PTR)MiSessionImageEnd - - MmSessionImageSize - - MI_SESSION_WORKING_SET_SIZE - - MmSessionViewSize); - - // - // Session pool follows - // - MiSessionPoolEnd = MiSessionViewStart; - MiSessionPoolStart = (PVOID)((ULONG_PTR)MiSessionPoolEnd - - MmSessionPoolSize); - - // - // And it all begins here - // - MmSessionBase = MiSessionPoolStart; - - // - // Sanity check that our math is correct - // - ASSERT((ULONG_PTR)MmSessionBase + MmSessionSize == PTE_BASE); - - // - // Session space ends wherever image session space ends - // - MiSessionSpaceEnd = MiSessionImageEnd; - - // - // System view space ends at session space, so now that we know where - // this is, we can compute the base address of system view space itself. - // - MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - - MmSystemViewSize); - - /* Compute the PTE addresses for all the addresses we carved out */ - MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart); - MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd); - MiSessionBasePte = MiAddressToPte(MmSessionBase); - MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd); + /* Initialize session space address layout */ + MiInitializeSessionSpaceLayout(); /* Initialize the user mode image list */ InitializeListHead(&MmLoadedUserImageList); Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Sep 24 08:52:26 2011 @@ -40,16 +40,16 @@ /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE; -SIZE_T MmSessionViewSize = MI_SESSION_VIEW_SIZE; -SIZE_T MmSessionPoolSize = MI_SESSION_POOL_SIZE; -SIZE_T MmSessionImageSize = MI_SESSION_IMAGE_SIZE; -SIZE_T MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; +extern SIZE_T MmSessionViewSize; +extern SIZE_T MmSessionPoolSize; +extern SIZE_T MmSessionImageSize; +extern SIZE_T MmSystemViewSize; SIZE_T MiNonPagedSystemSize; /* Address ranges */ -ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; -PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; -PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; +//ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; +//PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; +//PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; PVOID MmSessionBase; // FFFFF90000000000 = MiSessionPoolStart PVOID MiSessionPoolStart; // FFFFF90000000000 = MiSessionPoolEnd - MmSessionPoolSize PVOID MiSessionPoolEnd; // = MiSessionViewStart @@ -75,7 +75,6 @@ PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; -ULONG MiNumberDescriptors = 0; PFN_NUMBER MiSystemPages = 0; BOOLEAN MiIncludeType[LoaderMaximum]; @@ -88,90 +87,51 @@ /* FUNCTIONS *****************************************************************/ +VOID +NTAPI +INIT_FUNCTION +MiInitializeSessionSpaceLayout() +{ + MmSessionViewSize = MI_SESSION_VIEW_SIZE; + MmSessionPoolSize = MI_SESSION_POOL_SIZE; + MmSessionImageSize = MI_SESSION_IMAGE_SIZE; + MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; + + /* Set up session space */ + MiSessionSpaceEnd = (PVOID)MI_SESSION_SPACE_END; + + /* This is where we will load Win32k.sys and the video driver */ + MiSessionImageEnd = MiSessionSpaceEnd; + MiSessionImageStart = (PCHAR)MiSessionImageEnd - MmSessionImageSize; + + /* The view starts right below the session working set (itself below + * the image area) */ + MiSessionViewEnd = MI_SESSION_VIEW_END; + MiSessionViewStart = (PCHAR)MiSessionViewEnd - MmSessionViewSize; + ASSERT(IS_PAGE_ALIGNED(MiSessionViewStart)); + + /* Session pool follows */ + MiSessionPoolEnd = MiSessionViewStart; + MiSessionPoolStart = (PCHAR)MiSessionPoolEnd - MmSessionPoolSize; + ASSERT(IS_PAGE_ALIGNED(MiSessionPoolStart)); + + /* And it all begins here */ + MmSessionBase = MiSessionPoolStart; + + /* System view space ends at session space, so now that we know where + * this is, we can compute the base address of system view space itself. */ + MiSystemViewStart = (PCHAR)MmSessionBase - MmSystemViewSize; + ASSERT(IS_PAGE_ALIGNED(MiSystemViewStart)); + + /* Sanity checks */ + ASSERT(MiSessionViewEnd <= MiSessionImageStart); + ASSERT(MmSessionBase <= MiSessionPoolStart); +} + ULONG NoDbgPrint(const char *Format, ...) { return 0; -} - -VOID -NTAPI -MiEvaluateMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - PLIST_ENTRY ListEntry; - PFN_NUMBER LastPage; - ULONG i; - - /* Get the size of the boot loader's image allocations */ - MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned * PAGE_SIZE; - MmBootImageSize = ROUND_UP(MmBootImageSize, 4 * 1024 * 1024); - - /* Instantiate memory that we don't consider RAM/usable */ - for (i = 0; i < LoaderMaximum; i++) MiIncludeType[i] = TRUE; - MiIncludeType[LoaderBad] = FALSE; - MiIncludeType[LoaderFirmwarePermanent] = FALSE; - MiIncludeType[LoaderSpecialMemory] = FALSE; - MiIncludeType[LoaderBBTMemory] = FALSE; - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the memory descriptor */ - Descriptor = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Count it */ - MiNumberDescriptors++; - - /* Skip pages that are not part of the PFN database */ - if (!MiIncludeType[Descriptor->MemoryType]) - { - continue; - } - - /* Add this to the total of pages */ - MmNumberOfPhysicalPages += (PFN_COUNT)Descriptor->PageCount; - - /* Check if this is the new lowest page */ - if (Descriptor->BasePage < MmLowestPhysicalPage) - { - /* Update the lowest page */ - MmLowestPhysicalPage = Descriptor->BasePage; - } - - /* Check if this is the new highest page */ - LastPage = Descriptor->BasePage + Descriptor->PageCount - 1; - if (LastPage > MmHighestPhysicalPage) - { - /* Update the highest page */ - MmHighestPhysicalPage = LastPage; - } - - /* Check if this is currently free memory */ - if ((Descriptor->MemoryType == LoaderFree) || - (Descriptor->MemoryType == LoaderLoadedProgram) || - (Descriptor->MemoryType == LoaderFirmwareTemporary) || - (Descriptor->MemoryType == LoaderOsloaderStack)) - { - /* Check if this is the largest memory descriptor */ - if (Descriptor->PageCount > MxFreePageCount) - { - /* For now, it is */ - MxFreeDescriptor = Descriptor; - MxFreePageBase = Descriptor->BasePage; - MxFreePageCount = Descriptor->PageCount; - } - } - else - { - /* Add it to the amount of system used pages */ - MiSystemPages += Descriptor->PageCount; - } - } } PFN_NUMBER @@ -342,41 +302,6 @@ VOID -NTAPI -MiInitializeSessionSpace(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - /* Set up session space */ - MiSessionSpaceEnd = (PVOID)MI_SESSION_SPACE_END; - - /* This is where we will load Win32k.sys and the video driver */ - MiSessionImageEnd = MiSessionSpaceEnd; - MiSessionImageStart = (PCHAR)MiSessionImageEnd - MmSessionImageSize; - - /* The view starts right below the session working set (itself below - * the image area) */ - MiSessionViewEnd = MI_SESSION_VIEW_END; - MiSessionViewStart = (PCHAR)MiSessionViewEnd - MmSessionViewSize; - ASSERT(IS_PAGE_ALIGNED(MiSessionViewStart)); - - /* Session pool follows */ - MiSessionPoolEnd = MiSessionViewStart; - MiSessionPoolStart = (PCHAR)MiSessionPoolEnd - MmSessionPoolSize; - ASSERT(IS_PAGE_ALIGNED(MiSessionPoolStart)); - - /* And it all begins here */ - MmSessionBase = MiSessionPoolStart; - - /* System view space ends at session space, so now that we know where - * this is, we can compute the base address of system view space itself. */ - MiSystemViewStart = (PCHAR)MmSessionBase - MmSystemViewSize; - ASSERT(IS_PAGE_ALIGNED(MiSystemViewStart)); - - /* Sanity checks */ - ASSERT(MiSessionViewEnd <= MiSessionImageStart); - ASSERT(MmSessionBase <= MiSessionPoolStart); -} - -VOID MiInitializePageTable() { ULONG64 PxePhysicalAddress; @@ -603,92 +528,6 @@ /* Set the counter to maximum */ MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; -} - -VOID -NTAPI -MiBuildPhysicalMemoryBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PPHYSICAL_MEMORY_DESCRIPTOR Buffer; - PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; - PLIST_ENTRY ListEntry; - PFN_NUMBER NextPage = -1; - PULONG Bitmap; - ULONG Runs = 0; - ULONG_PTR Size; - - /* Calculate size for the PFN bitmap */ - Size = ROUND_UP(MmHighestPhysicalPage + 1, sizeof(ULONG)); - - /* Allocate the PFN bitmap */ - Bitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); - - /* Allocate enough memory for the physical memory block */ - Buffer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PHYSICAL_MEMORY_DESCRIPTOR) + - sizeof(PHYSICAL_MEMORY_RUN) * - (MiNumberDescriptors - 1), - 'lMmM'); - if (!Bitmap || !Buffer) - { - /* This is critical */ - KeBugCheckEx(INSTALL_MORE_MEMORY, - MmNumberOfPhysicalPages, - MmLowestPhysicalPage, - MmHighestPhysicalPage, - 0x101); - } - - /* Initialize the bitmap and clear all bits */ - RtlInitializeBitMap(&MiPfnBitMap, - Bitmap, - (ULONG)MmHighestPhysicalPage + 1); - RtlClearAllBits(&MiPfnBitMap); - - /* Loop the memory descriptors */ - for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - ListEntry != &LoaderBlock->MemoryDescriptorListHead; - ListEntry = ListEntry->Flink) - { - /* Get the memory descriptor */ - Descriptor = CONTAINING_RECORD(ListEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - /* Skip pages that are not part of the PFN database */ - if (!MiIncludeType[Descriptor->MemoryType]) - { - continue; - } - - /* Does the memory block begin where the last ended? */ - if (Descriptor->BasePage == NextPage) - { - /* Add it to the current run */ - Buffer->Run[Runs - 1].PageCount += Descriptor->PageCount; - } - else - { - /* Create a new run */ - Runs++; - Buffer->Run[Runs - 1].BasePage = Descriptor->BasePage; - Buffer->Run[Runs - 1].PageCount = Descriptor->PageCount; - } - - /* Set the bits in the PFN bitmap */ - RtlSetBits(&MiPfnBitMap, - (ULONG)Descriptor->BasePage, - (ULONG)Descriptor->PageCount); - - /* Set the next page */ - NextPage = Descriptor->BasePage + Descriptor->PageCount; - } - - // FIXME: allocate a buffer of better size - - Buffer->NumberOfRuns = Runs; - Buffer->NumberOfPages = MmNumberOfPhysicalPages; - MmPhysicalMemoryBlock = Buffer; } VOID @@ -824,16 +663,13 @@ MmBootImageSize = ROUND_UP(MmBootImageSize, PAGE_SIZE); /* Parse memory descriptors, find free pages */ - MiEvaluateMemoryDescriptors(LoaderBlock); + //MiEvaluateMemoryDescriptors(LoaderBlock); /* Start PFN database at hardcoded address */ MmPfnDatabase = MI_PFN_DATABASE; /* Prepare PFN database mappings */ MiPreparePfnDatabse(LoaderBlock); - - /* Initialize the session space */ - MiInitializeSessionSpace(LoaderBlock); /* Initialize some mappings */ MiInitializePageTable(); @@ -859,7 +695,7 @@ MiBuildSystemPteSpace(); /* Build the physical memory block */ - MiBuildPhysicalMemoryBlock(LoaderBlock); + //MiBuildPhysicalMemoryBlock(LoaderBlock); /* Size up paged pool and build the shadow system page directory */ //MiBuildPagedPool();

1 0

[rharabien] 53824: [WPP] - Sync to Wine 1.3.29 to fix a warning
by rharabien＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: rharabien Date: Sat Sep 24 07:58:49 2011 New Revision: 53824 URL: http://svn.reactos.org/svn/reactos?rev=53824&view=rev Log: [WPP] - Sync to Wine 1.3.29 to fix a warning Modified: trunk/reactos/tools/wpp/ppl.l trunk/reactos/tools/wpp/preproc.c trunk/reactos/tools/wpp/wpp_private.h Modified: trunk/reactos/tools/wpp/ppl.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/ppl.l?rev=53824&… ============================================================================== --- trunk/reactos/tools/wpp/ppl.l [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/ppl.l [iso-8859-1] Sat Sep 24 07:58:49 2011 @@ -680,7 +680,7 @@ <pp_iqs,pp_dqs,pp_sqs>\n { newline(1); add_string(ppy_text, ppy_leng); - ppy_warning("Newline in string constant encounterd (started line %d)", string_start()); + ppy_warning("Newline in string constant encountered (started line %d)", string_start()); } /* Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=53… ============================================================================== --- trunk/reactos/tools/wpp/preproc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/preproc.c [iso-8859-1] Sat Sep 24 07:58:49 2011 @@ -729,7 +729,7 @@ wpp_default_warning, }; -struct wpp_callbacks *wpp_callbacks = &default_callbacks; +const struct wpp_callbacks *wpp_callbacks = &default_callbacks; int ppy_error(const char *s, ...) { Modified: trunk/reactos/tools/wpp/wpp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_private.h?re… ============================================================================== --- trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/wpp_private.h [iso-8859-1] Sat Sep 24 07:58:49 2011 @@ -218,7 +218,7 @@ #define __attribute__(x) /*nothing*/ #endif -extern struct wpp_callbacks *wpp_callbacks; +extern const struct wpp_callbacks *wpp_callbacks; int ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

[pschweitzer] 53823: [KERNEL32] Simplify overcomplicated function CreateHardlinkW(), and SEHify it.
by pschweitzer＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: pschweitzer Date: Sat Sep 24 07:51:21 2011 New Revision: 53823 URL: http://svn.reactos.org/svn/reactos?rev=53823&view=rev Log: [KERNEL32] Simplify overcomplicated function CreateHardlinkW(), and SEHify it. Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c Modified: trunk/reactos/dll/win32/kernel32/client/file/hardlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/hardlink.c [iso-8859-1] Sat Sep 24 07:51:21 2011 @@ -2,11 +2,10 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/file/hardlink.c + * FILE: dll/win32/kernel32/client/file/hardlink.c * PURPOSE: Hardlink functions * PROGRAMMER: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) - * UPDATE HISTORY: - * Created 13/03/2004 + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -27,169 +26,110 @@ LPCWSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - UNICODE_STRING LinkTarget, LinkName; - LPVOID lpSecurityDescriptor; - PFILE_LINK_INFORMATION LinkInformation; - IO_STATUS_BLOCK IoStatus; - NTSTATUS Status; - BOOL Ret = FALSE; + NTSTATUS Status; + BOOL Ret = FALSE; + ULONG NeededSize; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hTarget = INVALID_HANDLE_VALUE; + PFILE_LINK_INFORMATION LinkInformation = NULL; + UNICODE_STRING LinkTarget = {0, 0, NULL}, LinkName = {0, 0, NULL}; - if(!lpFileName || !lpExistingFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + TRACE("CreateHardLinkW: %S, %S, %p\n", lpFileName, lpExistingFileName, lpSecurityAttributes); - lpSecurityDescriptor = (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL); + /* Validate parameters */ + if(!lpFileName || !lpExistingFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - if(RtlDetermineDosPathNameType_U((LPWSTR)lpFileName) == 1 || - RtlDetermineDosPathNameType_U((LPWSTR)lpExistingFileName) == 1) - { - WARN("CreateHardLinkW() cannot handle UNC Paths!\n"); - SetLastError(ERROR_INVALID_NAME); - return FALSE; - } + _SEH2_TRY + { + /* Get target UNC path */ + if (!RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + _SEH2_LEAVE; + } - if(RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, NULL)) - { - ULONG NeededSize = RtlGetFullPathName_U((LPWSTR)lpExistingFileName, 0, NULL, NULL); - if(NeededSize > 0) + /* Open target */ + InitializeObjectAttributes(&ObjectAttributes, + &LinkTarget, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + Status = NtOpenFile(&hTarget, + SYNCHRONIZE | FILE_WRITE_ATTRIBUTES, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_REPARSE_POINT); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + _SEH2_LEAVE; + } + + /* Get UNC path name for link */ + if (!RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + _SEH2_LEAVE; + } + + /* Prepare data for link */ + NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length; + LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, NeededSize); + if (!LinkInformation) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + _SEH2_LEAVE; + } + + RtlMoveMemory(LinkInformation->FileName, LinkName.Buffer, LinkName.Length); + LinkInformation->ReplaceIfExists = FALSE; + LinkInformation->RootDirectory = 0; + LinkInformation->FileNameLength = LinkName.Length; + + /* Create hard link */ + Status = NtSetInformationFile(hTarget, + &IoStatusBlock, + LinkInformation, + NeededSize, + FileLinkInformation); + if (NT_SUCCESS(Status)) + { + Ret = TRUE; + } + } + _SEH2_FINALLY { - LPWSTR lpNtLinkTarget = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize * sizeof(WCHAR)); - if(lpNtLinkTarget != NULL) - { - LPWSTR lpFilePart; + if (LinkTarget.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); + } - if(RtlGetFullPathName_U((LPWSTR)lpExistingFileName, NeededSize, lpNtLinkTarget, &lpFilePart) && - (*lpNtLinkTarget) != L'\0') + if (hTarget != INVALID_HANDLE_VALUE) { - UNICODE_STRING CheckDrive, LinkDrive; - WCHAR wCheckDrive[10]; + NtClose(hTarget); + } - swprintf(wCheckDrive, L"\\??\\%c:", (WCHAR)(*lpNtLinkTarget)); - RtlInitUnicodeString(&CheckDrive, wCheckDrive); + if (LinkName.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkName.Buffer); + } - RtlZeroMemory(&LinkDrive, sizeof(UNICODE_STRING)); + if (LinkInformation) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); + } + } + _SEH2_END; - LinkDrive.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH + 1) * sizeof(WCHAR)); - if(LinkDrive.Buffer != NULL) - { - HANDLE hFile, hTarget; - OBJECT_ATTRIBUTES ObjectAttributes; - - InitializeObjectAttributes(&ObjectAttributes, - &CheckDrive, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - Status = NtOpenSymbolicLinkObject(&hFile, 1, &ObjectAttributes); - if(NT_SUCCESS(Status)) - { - UNICODE_STRING LanManager; - - RtlInitUnicodeString(&LanManager, L"\\Device\\LanmanRedirector\\"); - - NtQuerySymbolicLinkObject(hFile, &LinkDrive, NULL); - - if(!RtlPrefixUnicodeString(&LanManager, &LinkDrive, TRUE)) - { - InitializeObjectAttributes(&ObjectAttributes, - &LinkTarget, - OBJ_CASE_INSENSITIVE, - NULL, - lpSecurityDescriptor); - Status = NtOpenFile(&hTarget, - SYNCHRONIZE | DELETE, - &ObjectAttributes, - &IoStatus, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); - if(NT_SUCCESS(Status)) - { - if(RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, NULL)) - { - NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length + sizeof(WCHAR); - LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize); - if(LinkInformation != NULL) - { - LinkInformation->ReplaceIfExists = FALSE; - LinkInformation->RootDirectory = 0; - LinkInformation->FileNameLength = LinkName.Length; - RtlCopyMemory(LinkInformation->FileName, LinkName.Buffer, LinkName.Length); - - Status = NtSetInformationFile(hTarget, &IoStatus, LinkInformation, NeededSize, FileLinkInformation); - if(NT_SUCCESS(Status)) - { - Ret = TRUE; - } - else - { - BaseSetLastNTError(Status); - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkInformation); - } - else - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - } - else - { - SetLastError(ERROR_PATH_NOT_FOUND); - } - NtClose(hTarget); - } - else - { - WARN("Unable to open link destination \"%wZ\"!\n", &LinkTarget); - BaseSetLastNTError(Status); - } - } - else - { - WARN("Path \"%wZ\" must not be a mapped drive!\n", &LinkDrive); - SetLastError(ERROR_INVALID_NAME); - } - - NtClose(hFile); - } - else - { - BaseSetLastNTError(Status); - } - } - else - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - } - else - { - SetLastError(ERROR_INVALID_NAME); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, lpNtLinkTarget); - } - else - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - } - } - else - { - SetLastError(ERROR_INVALID_NAME); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); - } - else - { - SetLastError(ERROR_PATH_NOT_FOUND); - } - - return Ret; + return Ret; } - /* * @implemented @@ -199,26 +139,32 @@ LPCSTR lpExistingFileName, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PWCHAR FileNameW, ExistingFileNameW; - BOOL Ret; + BOOL Ret; + PUNICODE_STRING lpFileNameW; + UNICODE_STRING ExistingFileNameW; - if(!lpFileName || !lpExistingFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); + if (!lpFileNameW) + { + return FALSE; + } - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return FALSE; + if (!lpExistingFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, TRUE))) - return FALSE; + if (!Basep8BitStringToDynamicUnicodeString(&ExistingFileNameW, lpExistingFileName)) + { + return FALSE; + } - Ret = CreateHardLinkW(FileNameW , ExistingFileNameW , lpSecurityAttributes); + Ret = CreateHardLinkW(lpFileNameW->Buffer, ExistingFileNameW.Buffer, lpSecurityAttributes); - RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW); + RtlFreeHeap(RtlGetProcessHeap(), 0, ExistingFileNameW.Buffer); - return Ret; + return Ret; } /* EOF */

1 0

[tkreuzer] 53822: [NTOSKRNL] Add MiScanMemoryDescriptors, that combines the work of MiPagesInLoaderBlock, the loop in MmInitializeMemoryLimits and the loop in MiInitMachineDependent.
by tkreuzer＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: tkreuzer Date: Sat Sep 24 00:12:58 2011 New Revision: 53822 URL: http://svn.reactos.org/svn/reactos?rev=53822&view=rev Log: [NTOSKRNL] Add MiScanMemoryDescriptors, that combines the work of MiPagesInLoaderBlock, the loop in MmInitializeMemoryLimits and the loop in MiInitMachineDependent. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Sep 24 00:12:58 2011 @@ -28,6 +28,8 @@ /* Template PTE for prototype page */ MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; + +extern PFN_NUMBER MiNumberOfFreePages; /* PRIVATE FUNCTIONS **********************************************************/ @@ -152,9 +154,6 @@ INIT_FUNCTION MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - ULONG FreePages = 0; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; @@ -190,101 +189,8 @@ EndPde = MiAddressToPde(KSEG0_BASE); RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); - // - // Loop the memory descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // Get the memory block - // - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - - // - // Skip invisible memory - // - if ((MdBlock->MemoryType != LoaderFirmwarePermanent) && - (MdBlock->MemoryType != LoaderSpecialMemory) && - (MdBlock->MemoryType != LoaderHALCachedMemory) && - (MdBlock->MemoryType != LoaderBBTMemory)) - { - // - // Check if BURNMEM was used - // - if (MdBlock->MemoryType != LoaderBad) - { - // - // Count this in the total of pages - // - MmNumberOfPhysicalPages += MdBlock->PageCount; - } - - // - // Check if this is the new lowest page - // - if (MdBlock->BasePage < MmLowestPhysicalPage) - { - // - // Update the lowest page - // - MmLowestPhysicalPage = MdBlock->BasePage; - } - - // - // Check if this is the new highest page - // - PageFrameIndex = MdBlock->BasePage + MdBlock->PageCount; - if (PageFrameIndex > MmHighestPhysicalPage) - { - // - // Update the highest page - // - MmHighestPhysicalPage = PageFrameIndex - 1; - } - - // - // Check if this is free memory - // - if ((MdBlock->MemoryType == LoaderFree) || - (MdBlock->MemoryType == LoaderLoadedProgram) || - (MdBlock->MemoryType == LoaderFirmwareTemporary) || - (MdBlock->MemoryType == LoaderOsloaderStack)) - { - // - // Check if this is the largest memory descriptor - // - if (MdBlock->PageCount > FreePages) - { - // - // For now, it is - // - MxFreeDescriptor = MdBlock; - } - - // - // More free pages - // - FreePages += MdBlock->PageCount; - } - } - - // - // Keep going - // - NextEntry = MdBlock->ListEntry.Flink; - } - - // - // Save original values of the free descriptor, since it'll be - // altered by early allocations - // - MxOldFreeDescriptor = *MxFreeDescriptor; - /* Compute non paged pool limits and size */ - MiComputeNonPagedPoolVa(FreePages); + MiComputeNonPagedPoolVa(MiNumberOfFreePages); /* Compute color information (L2 cache-separated paging lists) */ MiComputeColorInformation(); 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] Sat Sep 24 00:12:58 2011 @@ -364,7 +364,93 @@ FALSE; #endif +/* Number of memory descriptors in the loader block */ +ULONG MiNumberDescriptors = 0; + +/* Number of free pages in the loader block */ +PFN_NUMBER MiNumberOfFreePages = 0; + + /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MiScanMemoryDescriptors(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY ListEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; + PFN_NUMBER PageFrameIndex, FreePages = 0; + + /* Loop the memory descriptors */ + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Flink) + { + /* Get the descriptor */ + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + DPRINT("MD Type: %lx Base: %lx Count: %lx\n", + Descriptor->MemoryType, Descriptor->BasePage, Descriptor->PageCount); + + /* Count this descriptor */ + MiNumberDescriptors++; + + /* Check if this is invisible memory */ + if ((Descriptor->MemoryType == LoaderFirmwarePermanent) && + (Descriptor->MemoryType == LoaderSpecialMemory) && + (Descriptor->MemoryType == LoaderHALCachedMemory) && + (Descriptor->MemoryType == LoaderBBTMemory)) + { + /* Skip this descriptor */ + continue; + } + + /* Check if this is bad memory */ + if (Descriptor->MemoryType != LoaderBad) + { + /* Count this in the total of pages */ + MmNumberOfPhysicalPages += Descriptor->PageCount; + } + + /* Check if this is the new lowest page */ + if (Descriptor->BasePage < MmLowestPhysicalPage) + { + /* Update the lowest page */ + MmLowestPhysicalPage = Descriptor->BasePage; + } + + /* Check if this is the new highest page */ + PageFrameIndex = Descriptor->BasePage + Descriptor->PageCount; + if (PageFrameIndex > MmHighestPhysicalPage) + { + /* Update the highest page */ + MmHighestPhysicalPage = PageFrameIndex - 1; + } + + /* Check if this is free memory */ + if ((Descriptor->MemoryType == LoaderFree) || + (Descriptor->MemoryType == LoaderLoadedProgram) || + (Descriptor->MemoryType == LoaderFirmwareTemporary) || + (Descriptor->MemoryType == LoaderOsloaderStack)) + { + /* Count it too free pages */ + MiNumberOfFreePages += Descriptor->PageCount; + + /* Check if this is the largest memory descriptor */ + if (Descriptor->PageCount > FreePages) + { + /* Remember it */ + MxFreeDescriptor = Descriptor; + FreePages = Descriptor->PageCount; + } + } + } + + /* Save original values of the free descriptor, since it'll be + * altered by early allocations */ + MxOldFreeDescriptor = *MxFreeDescriptor; +} PFN_NUMBER NTAPI @@ -1375,48 +1461,6 @@ KeLowerIrql(OldIrql); } -PFN_NUMBER -NTAPI -MiPagesInLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PBOOLEAN IncludeType) -{ - PLIST_ENTRY NextEntry; - PFN_NUMBER PageCount = 0; - PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; - - // - // Now loop through the descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // Grab each one, and check if it's one we should include - // - MdBlock = CONTAINING_RECORD(NextEntry, - MEMORY_ALLOCATION_DESCRIPTOR, - ListEntry); - if ((MdBlock->MemoryType < LoaderMaximum) && - (IncludeType[MdBlock->MemoryType])) - { - // - // Add this to our running total - // - PageCount += MdBlock->PageCount; - } - - // - // Try the next descriptor - // - NextEntry = MdBlock->ListEntry.Flink; - } - - // - // Return the total - // - return PageCount; -} - PPHYSICAL_MEMORY_DESCRIPTOR NTAPI INIT_FUNCTION @@ -1424,23 +1468,15 @@ IN PBOOLEAN IncludeType) { PLIST_ENTRY NextEntry; - ULONG Run = 0, InitialRuns = 0; + ULONG Run = 0, InitialRuns; PFN_NUMBER NextPage = -1, PageCount = 0; PPHYSICAL_MEMORY_DESCRIPTOR Buffer, NewBuffer; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; // - // Scan the memory descriptors - // - NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; - while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) - { - // - // For each one, increase the memory allocation estimate - // - InitialRuns++; - NextEntry = NextEntry->Flink; - } + // Start with the maximum we might need + // + InitialRuns = MiNumberDescriptors; // // Allocate the maximum we'll ever need @@ -1970,7 +2006,8 @@ // // Count physical pages on the system // - PageCount = MiPagesInLoaderBlock(LoaderBlock, IncludeType); + MiScanMemoryDescriptors(LoaderBlock); + PageCount = MmNumberOfPhysicalPages; // // Check if this is a machine with less than 19MB of RAM

1 0

[akhaldi] 53821: [SHELL32_WINETEST] * Sync to Wine 1.3.29.
by akhaldi＠svn.reactos.org 23 Sep '11

23 Sep '11

Author: akhaldi Date: Fri Sep 23 23:14:50 2011 New Revision: 53821 URL: http://svn.reactos.org/svn/reactos?rev=53821&view=rev Log: [SHELL32_WINETEST] * Sync to Wine 1.3.29. Added: trunk/rostests/winetests/shell32/brsfolder.c (with props) trunk/rostests/winetests/shell32/ebrowser.c (with props) trunk/rostests/winetests/shell32/recyclebin.c (with props) trunk/rostests/winetests/shell32/shelldispatch.c (with props) trunk/rostests/winetests/shell32/shellole.c (with props) Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/autocomplete.c trunk/rostests/winetests/shell32/progman_dde.c trunk/rostests/winetests/shell32/shell32.rbuild trunk/rostests/winetests/shell32/shell32_test.h trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shellpath.c trunk/rostests/winetests/shell32/shfldr_special.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/shlview.c trunk/rostests/winetests/shell32/systray.c trunk/rostests/winetests/shell32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… Modified: trunk/rostests/winetests/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/autocom… Added: trunk/rostests/winetests/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/brsfold… Added: trunk/rostests/winetests/shell32/ebrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/ebrowse… Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… Added: trunk/rostests/winetests/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/recycle… Modified: trunk/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shell32_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Added: trunk/rostests/winetests/shell32/shelldispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shelldi… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Added: trunk/rostests/winetests/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellol… Modified: trunk/rostests/winetests/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellpa… Modified: trunk/rostests/winetests/shell32/shfldr_special.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shfldr_… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlview… Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…

1 0

[akhaldi] 53820: [PSDK] * Bring-in some idl changes from Wine. These changes (and the related changes below) are to allow us to sync shell32 tests to Wine 1.3.29. [UUID] * CLSID_TaskbarList is no l...
by akhaldi＠svn.reactos.org 23 Sep '11

23 Sep '11

Author: akhaldi Date: Fri Sep 23 23:12:53 2011 New Revision: 53820 URL: http://svn.reactos.org/svn/reactos?rev=53820&view=rev Log: [PSDK] * Bring-in some idl changes from Wine. These changes (and the related changes below) are to allow us to sync shell32 tests to Wine 1.3.29. [UUID] * CLSID_TaskbarList is no longer needed in here. [ACTXPRXY] * Sync with Wine 1.3.29. Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl (with props) trunk/reactos/include/psdk/knownfolders.h (with props) trunk/reactos/include/psdk/objectarray.idl (with props) Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl trunk/reactos/dll/win32/actxprxy/usrmarshal.c trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/psdk/propsys.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/shldisp.idl trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shobjidl.idl trunk/reactos/include/psdk/shtypes.idl trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -13,6 +13,7 @@ actxprxy_objsafe.idl actxprxy_ocmm.idl actxprxy_servprov.idl + actxprxy_shldisp.idl actxprxy_shobjidl.idl actxprxy_urlhist.idl) @@ -26,6 +27,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_objsafe_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_ocmm_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_servprov_p.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_shldisp_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_shobjidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy_urlhist_p.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -30,6 +30,7 @@ <file>actxprxy_objsafe.idl</file> <file>actxprxy_ocmm.idl</file> <file>actxprxy_servprov.idl</file> + <file>actxprxy_shldisp.idl</file> <file>actxprxy_shobjidl.idl</file> <file>actxprxy_urlhist.idl</file> </module> Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for activscp.idl */ #include "activscp.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for comcat.idl */ #include "comcat.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for docobj.idl */ #include "docobj.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for hlink.idl */ #include "hlink.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for htiframe.idl */ #include "htiframe.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for objsafe.idl */ #include "objsafe.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for ocmm.idl */ #include "ocmm.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -1,1 +1,7 @@ #include "servprov.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Added: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl (added) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -1,0 +1,27 @@ +/* + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* just a wrapper for shldisp.idl */ + +#include "shldisp.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Propchange: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for shobjidl.idl */ #include "shobjidl.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -19,3 +19,9 @@ /* just a wrapper for urlhist.idl */ #include "urlhist.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Modified: trunk/reactos/dll/win32/actxprxy/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/usrmars… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -34,6 +34,7 @@ #include "servprov.h" #include "comcat.h" #include "docobj.h" +#include "shobjidl.h" #include "wine/debug.h" @@ -168,3 +169,45 @@ TRACE("(%p)\n", This); return IEnumOleDocumentViews_Next( This, cViews, rgpView, pcFetched ); } + +HRESULT CALLBACK IEnumShellItems_Next_Proxy( + IEnumShellItems *This, + ULONG celt, + IShellItem **rgelt, + ULONG *pceltFetched) +{ + ULONG fetched; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + if (!pceltFetched) pceltFetched = &fetched; + return IEnumShellItems_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); +} + +HRESULT __RPC_STUB IEnumShellItems_Next_Stub( + IEnumShellItems *This, + ULONG celt, + IShellItem **rgelt, + ULONG *pceltFetched) +{ + HRESULT hr; + TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, pceltFetched); + *pceltFetched = 0; + hr = IEnumShellItems_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; +} + +HRESULT CALLBACK IModalWindow_Show_Proxy( + IModalWindow *This, + HWND hwndOwner) +{ + TRACE("(%p)->(%p)\n", This, hwndOwner); + return IModalWindow_RemoteShow_Proxy(This, hwndOwner); +} + +HRESULT __RPC_STUB IModalWindow_Show_Stub( + IModalWindow *This, + HWND hwndOwner) +{ + TRACE("(%p)->(%p)\n", This, hwndOwner); + return IModalWindow_Show(This, hwndOwner); +} Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -59,6 +59,7 @@ netcon.idl netfw.idl oaidl.idl + objectarray.idl objidl.idl objsafe.idl ocidl.idl Added: trunk/reactos/include/psdk/knownfolders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/knownfolders.… ============================================================================== --- trunk/reactos/include/psdk/knownfolders.h (added) +++ trunk/reactos/include/psdk/knownfolders.h [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -1,0 +1,142 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef DEFINE_KNOWN_FOLDER +#undef DEFINE_KNOWN_FOLDER +#endif + +#ifdef INITGUID +#ifdef __cplusplus +#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#else +#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const GUID name DECLSPEC_HIDDEN; \ + const GUID name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#endif +#else +#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID name DECLSPEC_HIDDEN +#endif + +DEFINE_KNOWN_FOLDER(FOLDERID_AddNewPrograms, 0xde61d971, 0x5ebc, 0x4f02, 0xa3, 0xa9, 0x6c, 0x82, 0x89, 0x5e, 0x5c, 0x04); +DEFINE_KNOWN_FOLDER(FOLDERID_AdminTools, 0x724ef170, 0xa42d, 0x4fef, 0x9f, 0x26, 0xb6, 0x0e, 0x84, 0x6f, 0xba, 0x4f); +DEFINE_KNOWN_FOLDER(FOLDERID_AppUpdates, 0xa305ce99, 0xf527, 0x492b, 0x8b, 0x1a, 0x7e, 0x76, 0xfa, 0x98, 0xd6, 0xe4); +DEFINE_KNOWN_FOLDER(FOLDERID_CDBurning, 0x9e52ab10, 0xf80d, 0x49df, 0xac, 0xb8, 0x43, 0x30, 0xf5, 0x68, 0x78, 0x55); +DEFINE_KNOWN_FOLDER(FOLDERID_ChangeRemovePrograms, 0xdf7266ac, 0x9274, 0x4867, 0x8d, 0x55, 0x3b, 0xd6, 0x61, 0xde, 0x87, 0x2d); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonAdminTools, 0xd0384e7d, 0xbac3, 0x4797, 0x8f, 0x14, 0xcb, 0xa2, 0x29, 0xb3, 0x92, 0xb5); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonOEMLinks, 0xc1bae2d0, 0x10df, 0x4334, 0xbe, 0xdd, 0x7a, 0xa2, 0x0b, 0x22, 0x7a, 0x9d); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonPrograms, 0x0139d44e, 0x6afe, 0x49f2, 0x86, 0x90, 0x3d, 0xaf, 0xca, 0xe6, 0xff, 0xb8); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartMenu, 0xa4115719, 0xd62e, 0x491d, 0xaa, 0x7c, 0xe7, 0x4b, 0x8b, 0xe3, 0xb0, 0x67); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonStartup, 0x82a5ea35, 0xd9cd, 0x47c5, 0x96, 0x29, 0xe1, 0x5d, 0x2f, 0x71, 0x4e, 0x6e); +DEFINE_KNOWN_FOLDER(FOLDERID_CommonTemplates, 0xb94237e7, 0x57ac, 0x4347, 0x91, 0x51, 0xb0, 0x8c, 0x6c, 0x32, 0xd1, 0xf7); +DEFINE_KNOWN_FOLDER(FOLDERID_ComputerFolder, 0x0ac0837c, 0xbbf8, 0x452a, 0x85, 0x0d, 0x79, 0xd0, 0x8e, 0x66, 0x7c, 0xa7); +DEFINE_KNOWN_FOLDER(FOLDERID_ConflictFolder, 0x4bfefb45, 0x347d, 0x4006, 0xa5, 0xbe, 0xac, 0x0c, 0xb0, 0x56, 0x71, 0x92); +DEFINE_KNOWN_FOLDER(FOLDERID_ConnectionsFolder, 0x6f0cd92b, 0x2e97, 0x45d1, 0x88, 0xff, 0xb0, 0xd1, 0x86, 0xb8, 0xde, 0xdd); +DEFINE_KNOWN_FOLDER(FOLDERID_Contacts, 0x56784854, 0xc6cb, 0x462b, 0x81, 0x69, 0x88, 0xe3, 0x50, 0xac, 0xb8, 0x82); +DEFINE_KNOWN_FOLDER(FOLDERID_ControlPanelFolder, 0x82a74aeb, 0xaeb4, 0x465c, 0xa0, 0x14, 0xd0, 0x97, 0xee, 0x34, 0x6d, 0x63); +DEFINE_KNOWN_FOLDER(FOLDERID_Cookies, 0x2b0f765d, 0xc0e9, 0x4171, 0x90, 0x8e, 0x08, 0xa6, 0x11, 0xb8, 0x4f, 0xf6); +DEFINE_KNOWN_FOLDER(FOLDERID_Desktop, 0xb4bfcc3a, 0xdb2c, 0x424c, 0xb0, 0x29, 0x7f, 0xe9, 0x9a, 0x87, 0xc6, 0x41); +DEFINE_KNOWN_FOLDER(FOLDERID_DeviceMetadataStore, 0x5ce4a5e9, 0xe4eb, 0x479d, 0xb8, 0x9f, 0x13, 0x0c, 0x02, 0x88, 0x61, 0x55); +DEFINE_KNOWN_FOLDER(FOLDERID_Documents, 0xfdd39ad0, 0x238f, 0x46af, 0xad, 0xb4, 0x6c, 0x85, 0x48, 0x03, 0x69, 0xc7); +DEFINE_KNOWN_FOLDER(FOLDERID_DocumentsLibrary, 0x7b0db17d, 0x9cd2, 0x4a93, 0x97, 0x33, 0x46, 0xcc, 0x89, 0x02, 0x2e, 0x7c); +DEFINE_KNOWN_FOLDER(FOLDERID_Downloads, 0x374de290, 0x123f, 0x4565, 0x91, 0x64, 0x39, 0xc4, 0x92, 0x5e, 0x46, 0x7b); +DEFINE_KNOWN_FOLDER(FOLDERID_Favorites, 0x1777f761, 0x68ad, 0x4d8a, 0x87, 0xbd, 0x30, 0xb7, 0x59, 0xfa, 0x33, 0xdd); +DEFINE_KNOWN_FOLDER(FOLDERID_Fonts, 0xfd228cb7, 0xae11, 0x4ae3, 0x86, 0x4c, 0x16, 0xf3, 0x91, 0x0a, 0xb8, 0xfe); +DEFINE_KNOWN_FOLDER(FOLDERID_Games, 0xcac52c1a, 0xb53d, 0x4edc, 0x92, 0xd7, 0x6b, 0x2e, 0x8a, 0xc1, 0x94, 0x34); +DEFINE_KNOWN_FOLDER(FOLDERID_GameTasks, 0x054fae61, 0x4dd8, 0x4787, 0x80, 0xb6, 0x09, 0x02, 0x20, 0xc4, 0xb7, 0x00); +DEFINE_KNOWN_FOLDER(FOLDERID_History, 0xd9dc8a3b, 0xb784, 0x432e, 0xa7, 0x81, 0x5a, 0x11, 0x30, 0xa7, 0x59, 0x63); +DEFINE_KNOWN_FOLDER(FOLDERID_HomeGroup, 0x52528a6b, 0xb9e3, 0x4add, 0xb6, 0x0d, 0x58, 0x8c, 0x2d, 0xba, 0x84, 0x2d); +DEFINE_KNOWN_FOLDER(FOLDERID_ImplicitAppShortcuts, 0xbcb5256f, 0x79f6, 0x4cee, 0xb7, 0x25, 0xdc, 0x34, 0xe4, 0x02, 0xfd, 0x46); +DEFINE_KNOWN_FOLDER(FOLDERID_InternetCache, 0x352481e8, 0x33be, 0x4251, 0xba, 0x85, 0x60, 0x07, 0xca, 0xed, 0xcf, 0x9d); +DEFINE_KNOWN_FOLDER(FOLDERID_InternetFolder, 0x4d9f7874, 0x4e0c, 0x4904, 0x96, 0x7b, 0x40, 0xb0, 0xd2, 0x0c, 0x3e, 0x4b); +DEFINE_KNOWN_FOLDER(FOLDERID_Libraries, 0x1b3ea5dc, 0xb587, 0x4786, 0xb4, 0xef, 0xbd, 0x1d, 0xc3, 0x32, 0xae, 0xae); +DEFINE_KNOWN_FOLDER(FOLDERID_Links, 0xbfb9d5e0, 0xc6a9, 0x404c, 0xb2, 0xb2, 0xae, 0x6d, 0xb6, 0xaf, 0x49, 0x68); +DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppData, 0xf1b32785, 0x6fba, 0x4fcf, 0x9d, 0x55, 0x7b, 0x8e, 0x7f, 0x15, 0x70, 0x91); +DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppDataLow, 0xa520a1a4, 0x1780, 0x4ff6, 0xbd, 0x18, 0x16, 0x73, 0x43, 0xc5, 0xaf, 0x16); +DEFINE_KNOWN_FOLDER(FOLDERID_LocalizedResourcesDir, 0x2a00375e, 0x224c, 0x49de, 0xb8, 0xd1, 0x44, 0x0d, 0xf7, 0xef, 0x3d, 0xdc); +DEFINE_KNOWN_FOLDER(FOLDERID_Music, 0x4bd8d571, 0x6d19, 0x48d3, 0xbe, 0x97, 0x42, 0x22, 0x20, 0x08, 0x0e, 0x43); +DEFINE_KNOWN_FOLDER(FOLDERID_MusicLibrary, 0x2112ab0a, 0xc86a, 0x4ffe, 0xa3, 0x68, 0x0d, 0xe9, 0x6e, 0x47, 0x01, 0x2e); +DEFINE_KNOWN_FOLDER(FOLDERID_NetHood, 0xc5abbf53, 0xe17f, 0x4121, 0x89, 0x00, 0x86, 0x62, 0x6f, 0xc2, 0xc9, 0x73); +DEFINE_KNOWN_FOLDER(FOLDERID_NetworkFolder, 0xd20beec4, 0x5ca8, 0x4905, 0xae, 0x3b, 0xbf, 0x25, 0x1e, 0xa0, 0x9b, 0x53); +DEFINE_KNOWN_FOLDER(FOLDERID_OriginalImages, 0x2c36c0aa, 0x5812, 0x4b87, 0xbf, 0xd0, 0x4c, 0xd0, 0xdf, 0xb1, 0x9b, 0x39); +DEFINE_KNOWN_FOLDER(FOLDERID_PhotoAlbums, 0x69d2cf90, 0xfc33, 0x4fb7, 0x9a, 0x0c, 0xeb, 0xb0, 0xf0, 0xfc, 0xb4, 0x3c); +DEFINE_KNOWN_FOLDER(FOLDERID_Pictures, 0x33e28130, 0x4e1e, 0x4676, 0x83, 0x5a, 0x98, 0x39, 0x5c, 0x3b, 0xc3, 0xbb); +DEFINE_KNOWN_FOLDER(FOLDERID_PicturesLibrary, 0xa990ae9f, 0xa03b, 0x4e80, 0x94, 0xbc, 0x99, 0x12, 0xd7, 0x50, 0x41, 0x04); +DEFINE_KNOWN_FOLDER(FOLDERID_Playlists, 0xde92c1c7, 0x837f, 0x4f69, 0xa3, 0xbb, 0x86, 0xe6, 0x31, 0x20, 0x4a, 0x23); +DEFINE_KNOWN_FOLDER(FOLDERID_PrintersFolder, 0x76fc4e2d, 0xd6ad, 0x4519, 0xa6, 0x63, 0x37, 0xbd, 0x56, 0x06, 0x81, 0x85); +DEFINE_KNOWN_FOLDER(FOLDERID_PrintHood, 0x9274bd8d, 0xcfd1, 0x41c3, 0xb3, 0x5e, 0xb1, 0x3f, 0x55, 0xa7, 0x58, 0xf4); +DEFINE_KNOWN_FOLDER(FOLDERID_Profile, 0x5e6c858f, 0x0e22, 0x4760, 0x9a, 0xfe, 0xea, 0x33, 0x17, 0xb6, 0x71, 0x73); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramData, 0x62ab5d82, 0xfdc1, 0x4dc3, 0xa9, 0xdd, 0x07, 0x0d, 0x1d, 0x49, 0x5d, 0x97); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFiles, 0x905e63b6, 0xc1bf, 0x494e, 0xb2, 0x9c, 0x65, 0xb7, 0x32, 0xd3, 0xd2, 0x1a); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFilesCommon, 0xf7f1ed05, 0x9f6d, 0x47a2, 0xaa, 0xae, 0x29, 0xd3, 0x17, 0xc6, 0xf0, 0x66); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX64, 0x6365d5a7, 0x0f0d, 0x45e5, 0x87, 0xf6, 0x0d, 0xa5, 0x6b, 0x6a, 0x4f, 0x7d); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFilesCommonX86, 0xde974d24, 0xd9c6, 0x4d3e, 0xbf, 0x91, 0xf4, 0x45, 0x51, 0x20, 0xb9, 0x17); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFilesX64, 0x6d809377, 0x6af0, 0x444b, 0x89, 0x57, 0xa3, 0x77, 0x3f, 0x02, 0x20, 0x0e); +DEFINE_KNOWN_FOLDER(FOLDERID_ProgramFilesX86, 0x7c5a40ef, 0xa0fb, 0x4bfc, 0x87, 0x4a, 0xc0, 0xf2, 0xe0, 0xb9, 0xfa, 0x8e); +DEFINE_KNOWN_FOLDER(FOLDERID_Programs, 0xa77f5d77, 0x2e2b, 0x44c3, 0xa6, 0xa2, 0xab, 0xa6, 0x01, 0x05, 0x4a, 0x51); +DEFINE_KNOWN_FOLDER(FOLDERID_Public, 0xdfdf76a2, 0xc82a, 0x4d63, 0x90, 0x6a, 0x56, 0x44, 0xac, 0x45, 0x73, 0x85); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicDesktop, 0xc4aa340d, 0xf20f, 0x4863, 0xaf, 0xef, 0xf8, 0x7e, 0xf2, 0xe6, 0xba, 0x25); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicDocuments, 0xed4824af, 0xdce4, 0x45a8, 0x81, 0xe2, 0xfc, 0x79, 0x65, 0x08, 0x36, 0x34); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicDownloads, 0x3d644c9b, 0x1fb8, 0x4f30, 0x9b, 0x45, 0xf6, 0x70, 0x23, 0x5f, 0x79, 0xc0); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicGameTasks, 0xdebf2536, 0xe1a8, 0x4c59, 0xb6, 0xa2, 0x41, 0x45, 0x86, 0x47, 0x6a, 0xea); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicLibraries, 0x48daf80b, 0xe6cf, 0x4f4e, 0xb8, 0x00, 0x0e, 0x69, 0xd8, 0x4e, 0xe3, 0x84); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicMusic, 0x3214fab5, 0x9757, 0x4298, 0xbb, 0x61, 0x92, 0xa9, 0xde, 0xaa, 0x44, 0xff); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicPictures, 0xb6ebfb86, 0x6907, 0x413c, 0x9a, 0xf7, 0x4f, 0xc2, 0xab, 0xf0, 0x7c, 0xc5); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicRingtones, 0xe555ab60, 0x153b, 0x4d17, 0x9f, 0x04, 0xa5, 0xfe, 0x99, 0xfc, 0x15, 0xec); +DEFINE_KNOWN_FOLDER(FOLDERID_PublicVideos, 0x2400183a, 0x6185, 0x49fb, 0xa2, 0xd8, 0x4a, 0x39, 0x2a, 0x60, 0x2b, 0xa3); +DEFINE_KNOWN_FOLDER(FOLDERID_QuickLaunch, 0x52a4f021, 0x7b75, 0x48a9, 0x9f, 0x6b, 0x4b, 0x87, 0xa2, 0x10, 0xbc, 0x8f); +DEFINE_KNOWN_FOLDER(FOLDERID_Recent, 0xae50c081, 0xebd2, 0x438a, 0x86, 0x55, 0x8a, 0x09, 0x2e, 0x34, 0x98, 0x7a); +DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTV, 0xbd85e001, 0x112e, 0x431e, 0x98, 0x3b, 0x7b, 0x15, 0xac, 0x09, 0xff, 0xf1); +DEFINE_KNOWN_FOLDER(FOLDERID_RecordedTVLibrary, 0x1a6fdba2, 0xf42d, 0x4358, 0xa7, 0x98, 0xb7, 0x4d, 0x74, 0x59, 0x26, 0xc5); +DEFINE_KNOWN_FOLDER(FOLDERID_RecycleBinFolder, 0xb7534046, 0x3ecb, 0x4c18, 0xbe, 0x4e, 0x64, 0xcd, 0x4c, 0xb7, 0xd6, 0xac); +DEFINE_KNOWN_FOLDER(FOLDERID_ResourceDir, 0x8ad10c31, 0x2adb, 0x4296, 0xa8, 0xf7, 0xe4, 0x70, 0x12, 0x32, 0xc9, 0x72); +DEFINE_KNOWN_FOLDER(FOLDERID_Ringtones, 0xc870044b, 0xf49e, 0x4126, 0xa9, 0xc3, 0xb5, 0x2a, 0x1f, 0xf4, 0x11, 0xe8); +DEFINE_KNOWN_FOLDER(FOLDERID_RoamingAppData, 0x3eb685db, 0x65f9, 0x4cf6, 0xa0, 0x3a, 0xe3, 0xef, 0x65, 0x72, 0x9f, 0x3d); +DEFINE_KNOWN_FOLDER(FOLDERID_SampleMusic, 0xb250c668, 0xf57d, 0x4ee1, 0xa6, 0x3c, 0x29, 0x0e, 0xe7, 0xd1, 0xaa, 0x1f); +DEFINE_KNOWN_FOLDER(FOLDERID_SamplePictures, 0xc4900540, 0x2379, 0x4c75, 0x84, 0x4b, 0x64, 0xe6, 0xfa, 0xf8, 0x71, 0x6b); +DEFINE_KNOWN_FOLDER(FOLDERID_SamplePlaylists, 0x15ca69b3, 0x30ee, 0x49c1, 0xac, 0xe1, 0x6b, 0x5e, 0xc3, 0x72, 0xaf, 0xb5); +DEFINE_KNOWN_FOLDER(FOLDERID_SampleVideos, 0x859ead94, 0x2e85, 0x48ad, 0xa7, 0x1a, 0x09, 0x69, 0xcb, 0x56, 0xa6, 0xcd); +DEFINE_KNOWN_FOLDER(FOLDERID_SavedGames, 0x4c5c32ff, 0xbb9d, 0x43b0, 0xb5, 0xb4, 0x2d, 0x72, 0xe5, 0x4e, 0xaa, 0xa4); +DEFINE_KNOWN_FOLDER(FOLDERID_SavedSearches, 0x7d1d3a04, 0xdebb, 0x4115, 0x95, 0xcf, 0x2f, 0x29, 0xda, 0x29, 0x20, 0xda); +DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_CSC, 0xee32e446, 0x31ca, 0x4aba, 0x81, 0x4f, 0xa5, 0xeb, 0xd2, 0xfd, 0x6d, 0x5e); +DEFINE_KNOWN_FOLDER(FOLDERID_SearchHome, 0x190337d1, 0xb8ca, 0x4121, 0xa6, 0x39, 0x6d, 0x47, 0x2d, 0x16, 0x97, 0x2a); +DEFINE_KNOWN_FOLDER(FOLDERID_SEARCH_MAPI, 0x98ec0e18, 0x2098, 0x4d44, 0x86, 0x44, 0x66, 0x97, 0x93, 0x15, 0xa2, 0x81); +DEFINE_KNOWN_FOLDER(FOLDERID_SendTo, 0x8983036c, 0x27c0, 0x404b, 0x8f, 0x08, 0x10, 0x2d, 0x10, 0xdc, 0xfd, 0x74); +DEFINE_KNOWN_FOLDER(FOLDERID_SidebarDefaultParts, 0x7b396e54, 0x9ec5, 0x4300, 0xbe, 0x0a, 0x24, 0x82, 0xeb, 0xae, 0x1a, 0x26); +DEFINE_KNOWN_FOLDER(FOLDERID_SidebarParts, 0xa75d362e, 0x50fc, 0x4fb7, 0xac, 0x2c, 0xa8, 0xbe, 0xaa, 0x31, 0x44, 0x93); +DEFINE_KNOWN_FOLDER(FOLDERID_StartMenu, 0x625b53c3, 0xab48, 0x4ec1, 0xba, 0x1f, 0xa1, 0xef, 0x41, 0x46, 0xfc, 0x19); +DEFINE_KNOWN_FOLDER(FOLDERID_Startup, 0xb97d20bb, 0xf46a, 0x4c97, 0xba, 0x10, 0x5e, 0x36, 0x08, 0x43, 0x08, 0x54); +DEFINE_KNOWN_FOLDER(FOLDERID_SyncManagerFolder, 0x43668bf8, 0xc14e, 0x49b2, 0x97, 0xc9, 0x74, 0x77, 0x84, 0xd7, 0x84, 0xb7); +DEFINE_KNOWN_FOLDER(FOLDERID_SyncResultsFolder, 0x289a9a43, 0xbe44, 0x4057, 0xa4, 0x1b, 0x58, 0x7a, 0x76, 0xd7, 0xe7, 0xf9); +DEFINE_KNOWN_FOLDER(FOLDERID_SyncSetupFolder, 0x0f214138, 0xb1d3, 0x4a90, 0xbb, 0xa9, 0x27, 0xcb, 0xc0, 0xc5, 0x38, 0x9a); +DEFINE_KNOWN_FOLDER(FOLDERID_System, 0x1ac14e77, 0x02e7, 0x4e5d, 0xb7, 0x44, 0x2e, 0xb1, 0xae, 0x51, 0x98, 0xb7); +DEFINE_KNOWN_FOLDER(FOLDERID_SystemX86, 0xd65231b0, 0xb2f1, 0x4857, 0xa4, 0xce, 0xa8, 0xe7, 0xc6, 0xea, 0x7d, 0x27); +DEFINE_KNOWN_FOLDER(FOLDERID_Templates, 0xa63293e8, 0x664e, 0x48db, 0xa0, 0x79, 0xdf, 0x75, 0x9e, 0x05, 0x09, 0xf7); +DEFINE_KNOWN_FOLDER(FOLDERID_UserPinned, 0x9e3995ab, 0x1f9c, 0x4f13, 0xb8, 0x27, 0x48, 0xb2, 0x4b, 0x6c, 0x71, 0x74); +DEFINE_KNOWN_FOLDER(FOLDERID_UserProfiles, 0x0762d272, 0xc50a, 0x4bb0, 0xa3, 0x82, 0x69, 0x7d, 0xcd, 0x72, 0x9b, 0x80); +DEFINE_KNOWN_FOLDER(FOLDERID_UserProgramFiles, 0x5cd7aee2, 0x2219, 0x4a67, 0xb8, 0x5d, 0x6c, 0x9c, 0xe1, 0x56, 0x60, 0xcb); +DEFINE_KNOWN_FOLDER(FOLDERID_UserProgramFilesCommon, 0xbcbd3057, 0xca5c, 0x4622, 0xb4, 0x2d, 0xbc, 0x56, 0xdb, 0x0a, 0xe5, 0x16); +DEFINE_KNOWN_FOLDER(FOLDERID_UsersFiles, 0xf3ce0f7c, 0x4901, 0x4acc, 0x86, 0x48, 0xd5, 0xd4, 0x4b, 0x04, 0xef, 0x8f); +DEFINE_KNOWN_FOLDER(FOLDERID_UsersLibraries, 0xa302545d, 0xdeff, 0x464b, 0xab, 0xe8, 0x61, 0xc8, 0x64, 0x8d, 0x93, 0x9b); +DEFINE_KNOWN_FOLDER(FOLDERID_Videos, 0x18989b1d, 0x99b5, 0x455b, 0x84, 0x1c, 0xab, 0x7c, 0x74, 0xe4, 0xdd, 0xfc); +DEFINE_KNOWN_FOLDER(FOLDERID_VideosLibrary, 0x491e922f, 0x5643, 0x4af4, 0xa7, 0xeb, 0x4e, 0x7a, 0x13, 0x8d, 0x81, 0x74); +DEFINE_KNOWN_FOLDER(FOLDERID_Windows, 0xf38bf404, 0x1d43, 0x42f2, 0x93, 0x05, 0x67, 0xde, 0x0b, 0x28, 0xfc, 0x23); Propchange: trunk/reactos/include/psdk/knownfolders.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/objectarray.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objectarray.i… ============================================================================== --- trunk/reactos/include/psdk/objectarray.idl (added) +++ trunk/reactos/include/psdk/objectarray.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -1,0 +1,47 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + uuid(92ca9dcd-5622-4bba-a805-5e9f541bd8c9), + object, + pointer_default(unique) +] +interface IObjectArray : IUnknown +{ + HRESULT GetCount([out] UINT *pcObjects); + HRESULT GetAt( + [in] UINT uiIndex, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); +} + +[ + uuid(5632b1a4-e38a-400a-928a-d4cd63230295), + object, + pointer_default(unique) +] +interface IObjectCollection : IObjectArray +{ + HRESULT AddObject([in] IUnknown *punk); + HRESULT AddFromArray([in] IObjectArray *poaSource); + HRESULT RemoveObjectAt([in] UINT uiIndex); + HRESULT Clear(); +} Propchange: trunk/reactos/include/psdk/objectarray.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/propsys.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propsys.idl?r… ============================================================================== --- trunk/reactos/include/psdk/propsys.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/propsys.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -802,6 +802,7 @@ cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") /* TODO: Add remainder of the C api here */ Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -38,6 +38,7 @@ <file>netfw.idl</file> <file>netcon.idl</file> <file>oaidl.idl</file> + <file>objectarray.idl</file> <file>objidl.idl</file> <file>objsafe.idl</file> <file>ocidl.idl</file> Modified: trunk/reactos/include/psdk/shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shldisp.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shldisp.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -31,6 +31,7 @@ * IAutoComplete interface */ [ + local, object, uuid(00bb2762-6a77-11d0-a535-00c04fd7d062), pointer_default(unique) @@ -51,6 +52,7 @@ * IAutoComplete2 interface */ [ + local, object, uuid(eac04bc0-3791-11d2-bb95-0060977b464c), pointer_default(unique) @@ -77,7 +79,17 @@ } [ - object, + uuid(50a7e9b0-70ef-11d1-b75a-00a0c90564fe), + version(1.0) +] +library Shell32 +{ + +importlib("stdole2.tlb"); + +[ + object, + oleautomation, uuid(9ba05970-f6a8-11cf-a442-00a0c90a8f39), pointer_default(unique) ] @@ -119,6 +131,363 @@ [default, source] dispinterface DShellFolderViewEvents; } +interface FolderItem; +interface FolderItems; +interface FolderItemVerb; +interface FolderItemVerbs; + +/***************************************************************************** + * Folder interface + */ +[ + object, + uuid(bbcbde60-c3ff-11ce-8350-444553540000), + oleautomation, + dual +] +interface Folder : IDispatch +{ + [propget, id(DISPID_VALUE)] + HRESULT Title( [out, retval] BSTR *pbs ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT ParentFolder( [out, retval] Folder **ppsf ); + + HRESULT Items( [out, retval] FolderItems **ppid ); + + HRESULT ParseName( [in] BSTR bName, [out, retval] FolderItem **ppid ); + + HRESULT NewFolder( [in] BSTR bName, [in, optional] VARIANT vOptions ); + + HRESULT MoveHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT CopyHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT GetDetailsOf( [in] VARIANT vItem, + [in] int iColumn, + [out, retval] BSTR *pbs ); +} + +/***************************************************************************** + * Folder2 interface + */ +[ + object, + uuid(f0d2d8ef-3890-11d2-bf8b-00c04fb93661), + oleautomation, + dual +] +interface Folder2 : Folder +{ + [propget] + HRESULT Self( [out, retval] FolderItem **ppfi ); + + [propget] + HRESULT OfflineStatus( [out, retval] LONG *pul ); + + HRESULT Synchronize(); + + [propget, id(1)] + HRESULT HaveToShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbHaveToShowWebViewBarricade ); + + HRESULT DismissedWebViewBarricade(); +} + +/***************************************************************************** + * Folder3 interface + */ +[ + object, + uuid(a7ae5f64-c4d7-4d7f-9307-4d24ee54b841), + oleautomation, + dual +] +interface Folder3 : Folder2 +{ + [propget, id(2)] + HRESULT ShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbShowWebViewBarricade ); + + [propput, id(2)] + HRESULT ShowWebViewBarricade( [in] VARIANT_BOOL bShowWebViewBarricade ); +} + +/***************************************************************************** + * FolderItem interface + */ +[ + object, + uuid(fac32c80-cbe4-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItem : IDispatch +{ + typedef FolderItem *LPFOLDERITEM; + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + [propput, id(DISPID_VALUE)] + HRESULT Name( [in] BSTR bs ); + + [propget] + HRESULT Path( [out, retval] BSTR *pbs ); + + [propget] + HRESULT GetLink( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT GetFolder( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT IsLink( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFolder( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFileSystem( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsBrowsable( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT ModifyDate( [out, retval] DATE *pdt ); + + [propput] + HRESULT ModifyDate( [in] DATE dt ); + + [propget] + HRESULT Size( [out, retval] LONG *pul ); + + [propget] + HRESULT Type( [out, retval] BSTR *pbs ); + + HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); + + HRESULT InvokeVerb( [in, optional] VARIANT vVerb ); +} + +/***************************************************************************** + * FolderItems interface + */ +[ + object, + uuid(744129e0-cbe5-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItems : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItem **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * FolderItemVerb interface + */ +[ + object, + uuid(08ec3e00-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerb : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + HRESULT DoIt(); +} + +/***************************************************************************** + * FolderItemVerbs interface + */ +[ + object, + uuid(1f8352c0-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerbs : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItemVerb **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * IShellDispatch interface + */ +[ + object, + uuid(d8f015c0-c278-11ce-a49e-444553540000), + oleautomation, + hidden, + dual +] +interface IShellDispatch : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT NameSpace( [in] VARIANT vDir, [out, retval] Folder **ppsdf ); + + HRESULT BrowseForFolder( [in] long Hwnd, + [in] BSTR Title, + [in] long Options, + [in, optional] VARIANT RootFolder, + [out, retval] Folder **ppsdf ); + + HRESULT Windows( [out, retval] IDispatch **ppid ); + + HRESULT Open( [in] VARIANT vDir ); + + HRESULT Explore( [in] VARIANT vDir ); + + HRESULT MinimizeAll(); + + HRESULT UndoMinimizeALL(); + + HRESULT FileRun(); + + HRESULT CascadeWindows(); + + HRESULT TileVertically(); + + HRESULT TileHorizontally(); + + HRESULT ShutdownWindows(); + + HRESULT Suspend(); + + HRESULT EjectPC(); + + HRESULT SetTime(); + + HRESULT TrayProperties(); + + HRESULT Help(); + + HRESULT FindFiles(); + + HRESULT FindComputer(); + + HRESULT RefreshMenu(); + + HRESULT ControlPanelItem( [in] BSTR szDir ); +} + +[ + uuid(13709620-c279-11ce-a49e-444553540000) +] +coclass Shell +{ + [default] interface IShellDispatch; +} + +[ + uuid(0a89a860-d7b1-11ce-8350-444553540000), + hidden +] +coclass ShellDispatchInproc +{ + interface IUnknown; +} + +typedef +[ + uuid(ca31ea20-48d0-11cf-8350-444553540000) +] +enum ShellSpecialFolderConstants { + ssfDESKTOP = 0x00, + ssfPROGRAMS = 0x02, + ssfCONTROLS = 0x03, + ssfPRINTERS = 0x04, + ssfPERSONAL = 0x05, + ssfFAVORITES = 0x06, + ssfSTARTUP = 0x07, + ssfRECENT = 0x08, + ssfSENDTO = 0x09, + ssfBITBUCKET = 0x0a, + ssfSTARTMENU = 0x0b, + ssfDESKTOPDIRECTORY = 0x10, + ssfDRIVES = 0x11, + ssfNETWORK = 0x12, + ssfNETHOOD = 0x13, + ssfFONTS = 0x14, + ssfTEMPLATES = 0x15, + ssfCOMMONSTARTMENU = 0x16, + ssfCOMMONPROGRAMS = 0x17, + ssfCOMMONSTARTUP = 0x18, + ssfCOMMONDESKTOPDIR = 0x19, + ssfAPPDATA = 0x1a, + ssfPRINTHOOD = 0x1b, + ssfLOCALAPPDATA = 0x1c, + ssfALTSTARTUP = 0x1d, + ssfCOMMONALTSTARTUP = 0x1e, + ssfCOMMONFAVORITES = 0x1f, + ssfINTERNETCACHE = 0x20, + ssfCOOKIES = 0x21, + ssfHISTORY = 0x22, + ssfCOMMONAPPDATA = 0x23, + ssfWINDOWS = 0x24, + ssfSYSTEM = 0x25, + ssfPROGRAMFILES = 0x26, + ssfMYPICTURES = 0x27, + ssfPROFILE = 0x28, + ssfSYSTEMx86 = 0x29, + ssfPROGRAMFILESx86 = 0x30 +} ShellSpecialFolderConstants; + +} /* library Shell32 */ + /***************************************************************************** * IAsyncOperation interface */ Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -20,7 +20,6 @@ #define __WINE_SHLGUID_H DEFINE_OLEGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0); -DEFINE_OLEGUID(CLSID_ShellLink, 0x00021401L, 0, 0); DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490L, 0, 0); DEFINE_OLEGUID(CATID_BrowseInPlace, 0x00021491L, 0, 0); @@ -184,8 +183,6 @@ /* END REACTOS ONLY */ /* IExplorerBrowser */ -DEFINE_GUID(CLSID_ExplorerBrowser, 0x71F96385, 0xDDD6, 0x48D3, 0xA0, 0xC1, 0xAE, 0x06, 0xE8, 0xB0, 0x55, 0xFB); - DEFINE_GUID(EP_NavPane, 0xCB316B22, 0x25F7, 0x42B8, 0x8A, 0x09, 0x54, 0x0D, 0x23, 0xA4, 0x3C, 0x2F); DEFINE_GUID(EP_Commands,0xD9745868, 0xCA5F, 0x4A76, 0x91, 0xCD, 0xF5, 0xA1, 0x29, 0xFB, 0xB0, 0x76); DEFINE_GUID(EP_Commands_Organize, 0x72E81700, 0xE3EC, 0x4660, 0xBF, 0x24, 0x3C, 0x3B, 0x7B, 0x64, 0x88, 0x06); @@ -195,4 +192,21 @@ DEFINE_GUID(EP_QueryPane, 0x65BCDE4F, 0x4F07, 0x4F27, 0x83, 0xA7, 0x1A, 0xFC, 0xA4, 0xDF, 0x7D, 0xDD); DEFINE_GUID(EP_AdvQueryPane, 0xB4E9DB8B, 0x34BA, 0x4C39, 0xB5, 0xCC, 0x16, 0xA1, 0xBD, 0x2C, 0x41, 0x1C); +/* IShellItem/IShellItemArray BindToHandler */ +DEFINE_GUID(BHID_SFObject, 0x3981E224, 0xF559, 0x11D3, 0x8E,0x3A, 0x00,0xC0,0x4F,0x68,0x37,0xD5); +DEFINE_GUID(BHID_SFUIObject, 0x3981E225, 0xF559, 0x11D3, 0x8E,0x3A, 0x00,0xC0,0x4F,0x68,0x37,0xD5); +DEFINE_GUID(BHID_SFViewObject,0x3981E226, 0xF559, 0x11D3, 0x8E,0x3A, 0x00,0xC0,0x4F,0x68,0x37,0xD5); +DEFINE_GUID(BHID_Storage, 0x3981E227, 0xF559, 0x11D3, 0x8E,0x3A, 0x00,0xC0,0x4F,0x68,0x37,0xD5); +DEFINE_GUID(BHID_Stream, 0x1CEBB3AB, 0x7C10, 0x499A, 0xA4,0x17, 0x92,0xCA,0x16,0xC4,0xCB,0x83); +DEFINE_GUID(BHID_StorageEnum, 0x4621A4E3, 0xF0D6, 0x4773, 0x8A,0x9C, 0x46,0xE7,0x7B,0x17,0x48,0x40); +DEFINE_GUID(BHID_Transfer, 0xD5E346A1, 0xF753, 0x4932, 0xB4,0x03, 0x45,0x74,0x80,0x0E,0x24,0x98); +DEFINE_GUID(BHID_EnumItems, 0x94F60519, 0x2850, 0x4924, 0xAA,0x5A, 0xD1,0x5E,0x84,0x86,0x80,0x39); +DEFINE_GUID(BHID_DataObject, 0xB8C0BD9F, 0xED24, 0x455C, 0x83,0xE6, 0xD5,0x39,0x0C,0x4F,0xE8,0xC4); +DEFINE_GUID(BHID_Filter, 0x38D08778, 0xF557, 0x4690, 0x9E,0xBF, 0xBA,0x54,0x70,0x6A,0xD8,0xF7); +DEFINE_GUID(BHID_LinkTargetItem, 0x3981E228, 0xF559, 0x11D3, 0x8E,0x3A, 0x00,0xC0,0x4F,0x68,0x37,0xD5); +DEFINE_GUID(BHID_PropertyStore, 0x0384E1A4, 0x1523, 0x439C, 0xA4,0xC8, 0xAB,0x91,0x10,0x52,0xF5,0x86); +DEFINE_GUID(BHID_ThumbnailHandler, 0x7B2E650A, 0x8E20, 0x4F4A, 0xB0,0x9E, 0x65,0x97,0xAF,0xC7,0x2F,0xB0); +DEFINE_GUID(BHID_AssociationArray, 0xBEA9EF17, 0x82F1, 0x4F60, 0x92,0x84, 0x4F,0x8D,0xB7,0x5C,0x3B,0xE9); +DEFINE_GUID(BHID_EnumAssocHandlers,0xB8AB0B9C, 0xC2EC, 0x4F7A, 0x91,0x8D, 0x31,0x49,0x00,0xE6,0x28,0x0A); + #endif /* __WINE_SHLGUID_H */ Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -30,7 +30,8 @@ /* FIXME: import "prsht.idl";*/ import "msxml.idl"; import "wtypes.idl"; -/* FIXME: import "propsys.idl"; */ +import "propsys.idl"; +import "objectarray.idl"; /* FIXME: import "structuredquery.idl"; */ cpp_quote("/* FIXME: #include <sherrors.h> */") @@ -346,8 +347,25 @@ ] interface IShellItem : IUnknown { - typedef DWORD SIGDN; - + typedef [v1_enum] enum { + SIGDN_NORMALDISPLAY = 0, + SIGDN_PARENTRELATIVEPARSING = 0x80018001, + SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000, + SIGDN_PARENTRELATIVEEDITING = 0x80031001, + SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000, + SIGDN_FILESYSPATH = 0x80058000, + SIGDN_URL = 0x80068000, + SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001, + SIGDN_PARENTRELATIVE = 0x80080001 + } SIGDN; /* & 0xFFFF => SHGDN */ + + [v1_enum] enum _SICHINTF + { + SICHINT_DISPLAY = 0x00000000, + SICHINT_CANONICAL = 0x10000000, + SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000, + SICHINT_ALLFIELDS = 0x80000000 + }; typedef DWORD SICHINTF; HRESULT BindToHandler( @@ -370,6 +388,75 @@ [in] IShellItem *psi, [in] SICHINTF hint, [out] int *piOrder); +} + +/***************************************************************************** + * IShellItem2 interface + */ +[ + object, + uuid(7E9FB0D3-919F-4307-AB2E-9B1860310C93), + pointer_default(unique) +] +interface IShellItem2 : IShellItem +{ + HRESULT GetPropertyStore( + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreWithCreateObject( + [in] GETPROPERTYSTOREFLAGS flags, + [in] IUnknown *punkCreateObject, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyStoreForKeys( + [in, size_is(cKeys)] const PROPERTYKEY *rgKeys, + [in] UINT cKeys, + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyDescriptionList( + [in] REFPROPERTYKEY keyType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT Update( + [in, unique] IBindCtx *pbc); + + HRESULT GetProperty( + [in] REFPROPERTYKEY key, + [out] PROPVARIANT *ppropvar); + + HRESULT GetCLSID( + [in] REFPROPERTYKEY key, + [out] CLSID *pclsid); + + HRESULT GetFileTime ( + [in] REFPROPERTYKEY key, + [out] FILETIME *pft); + + HRESULT GetInt32( + [in] REFPROPERTYKEY key, + [out] int *pi); + + HRESULT GetString( + [in] REFPROPERTYKEY key, + [out, string] LPWSTR *ppsz); + + HRESULT GetUInt32( + [in] REFPROPERTYKEY key, + [out] ULONG *pui); + + HRESULT GetUInt64( + [in] REFPROPERTYKEY key, + [out] ULONGLONG *pull); + + HRESULT GetBool( + [in] REFPROPERTYKEY key, + [out] BOOL *pf); } typedef enum tagNWMF { @@ -402,6 +489,125 @@ } cpp_quote("#define SID_SNewWindowManager IID_INewWindowManager") + +/***************************************************************************** + * IEnumShellItems interface + */ +[ + object, + uuid(70629033-E363-4A28-A567-0DB78006E6D7), + pointer_default(unique) +] +interface IEnumShellItems : IUnknown +{ + [local] HRESULT Next( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IShellItem **rgelt, + [out] ULONG *pceltFetched); + + [call_as(Next)] HRESULT RemoteNext( + [in] ULONG celt, + [out, size_is(celt), length_is(*pceltFetched)] IShellItem **rgelt, + [out] ULONG *pceltFetched); + + HRESULT Skip( + [in] ULONG celt); + + HRESULT Reset(); + + HRESULT Clone( + [out] IEnumShellItems **ppenum); +} + +/***************************************************************************** + * IShellItemArray interface + */ +[ + object, + uuid(B63EA76D-1F85-456F-A19C-48159EFA858B), + pointer_default(unique) +] +interface IShellItemArray : IUnknown +{ + typedef [v1_enum] enum SIATTRIBFLAGS { + SIATTRIBFLAGS_AND = 0x0001, + SIATTRIBFLAGS_OR = 0x0002, + SIATTRIBFLAGS_APPCOMPAT = 0x0003, + SIATTRIBFLAGS_MASK = 0x0003, + SIATTRIBFLAGS_ALLITEMS = 0x4000 + } SIATTRIBFLAGS; + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(SIATTRIBFLAGS)") + + HRESULT BindToHandler( + [in, unique] IBindCtx *pbc, + [in] REFGUID bhid, + [in] REFIID riid, + [out, iid_is(riid)] void **ppvOut); + + HRESULT GetPropertyStore( + [in] GETPROPERTYSTOREFLAGS flags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPropertyDescriptionList( + [in] REFPROPERTYKEY keyType, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetAttributes( + [in] SIATTRIBFLAGS AttribFlags, + [in] SFGAOF sfgaoMask, + [out] SFGAOF *psfgaoAttribs); + + HRESULT GetCount( + [out] DWORD *pdwNumItems); + + HRESULT GetItemAt( + [in] DWORD dwIndex, + [out] IShellItem **ppsi); + + HRESULT EnumItems( + [out] IEnumShellItems **ppenumShellItems); + +} + +typedef [v1_enum] enum DATAOBJ_GET_ITEM_FLAGS +{ + DOGIF_DEFAULT = 0x0, + DOGIF_TRAVERSE_LINK = 0x1, + DOGIF_NO_HDROP = 0x2, + DOGIF_NO_URL = 0x4, + DOGIF_ONLY_IF_ONE = 0x8 +} DATAOBJ_GET_ITEM_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(DATAOBJ_GET_ITEM_FLAGS)") + +cpp_quote("HRESULT WINAPI SHGetNameFromIDList(PCIDLIST_ABSOLUTE pidl, SIGDN sigdnName, PWSTR *ppszName);") +cpp_quote("HRESULT WINAPI SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHCreateItemFromIDList(PCIDLIST_ABSOLUTE pidl, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHGetItemFromDataObject(IDataObject *pdtobj, DATAOBJ_GET_ITEM_FLAGS dwFlags, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHGetIDListFromObject(IUnknown *punk, PIDLIST_ABSOLUTE *ppidl);") +cpp_quote("HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, IShellFolder* psf, UINT cidl, PCUITEMID_CHILD_ARRAY ppidl, IShellItemArray **ppsiItemArray);") +cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromShellItem(IShellItem *psi, REFIID riid, void **ppv);") +cpp_quote("HRESULT WINAPI SHCreateShellItemArrayFromDataObject(IDataObject *pdo, REFIID riid, void **ppv);") + +/***************************************************************************** + * IShellItemFilter interface + */ +[ + object, + uuid(2659B475-EEB8-48B7-8F07-B378810F48CF), + pointer_default(unique) +] +interface IShellItemFilter : IUnknown +{ + HRESULT IncludeItem( + [in] IShellItem *psi); + + HRESULT GetEnumFlagsForItem( + [in] IShellItem *psi, + [out] SHCONTF *pgrfFlags); +} /***************************************************************************** * FOLDERSETTINGS @@ -1103,6 +1309,27 @@ [in] IShellView *ppshv); } +/***************************************************************************** + * IDockingWindow interface + */ +[ + object, + uuid(012dd920-7b26-11d0-8ca9-00a0c92dbfe8) +] +interface IDockingWindow : IOleWindow +{ + HRESULT ShowDW( + [in] BOOL fShow); + + HRESULT CloseDW( + [in] DWORD dwReserved); + + HRESULT ResizeBorderDW( + [in] LPCRECT prcBorder, + [in] IUnknown *punkToolbarSite, + [in] BOOL fReserved); +}; + /***************************************************************************** * IDockingWindowFrame interface @@ -1259,6 +1486,7 @@ cpp_quote("#define CMIC_MASK_FLAG_SEP_VDM SEE_MASK_FLAG_SEPVDM") cpp_quote("#define CMIC_MASK_HASTITLE SEE_MASK_HASTITLE") cpp_quote("#define CMIC_MASK_ASYNCOK SEE_MASK_ASYNCOK") +cpp_quote("#define CMIC_MASK_NOASYNC SEE_MASK_NOASYNC") cpp_quote("#define CMIC_MASK_SHIFT_DOWN 0x10000000") cpp_quote("#define CMIC_MASK_PTINVOKE 0x20000000") cpp_quote("#define CMIC_MASK_CONTROL_DOWN 0x40000000") @@ -1357,6 +1585,26 @@ [out] LRESULT *plResult); } +/***************************************************************************** + * IContextMenuCB interface + */ + +[ + object, + uuid(3409e930-5a39-11d1-83fa-00a0c90dc849), + pointer_default(unique), + local +] +interface IContextMenuCB : IUnknown +{ + HRESULT CallBack( + [in] IShellFolder *psf, + [in] HWND hwndOwner, + [in] IDataObject *pdtobj, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); +} /***************************************************************************** * IShellExecuteHookA interface @@ -1439,7 +1687,7 @@ object, uuid(ac60f6a0-0fd9-11d0-99cb-00c04fd64497), pointer_default(unique), - local + local ] interface IURLSearchHook : IUnknown { @@ -1476,7 +1724,7 @@ object, uuid(5ee44da4-6d32-46e3-86bc-07540dedd0e0), pointer_default(unique), - local + local ] interface IURLSearchHook2 : IURLSearchHook { @@ -1496,7 +1744,7 @@ object, uuid(000214e1-0000-0000-c000-000000000046), pointer_default(unique), - local + local ] interface INewShortcutHookA : IUnknown { @@ -1527,7 +1775,7 @@ object, uuid(000214f7-0000-0000-c000-000000000046), pointer_default(unique), - local + local ] interface INewShortcutHookW : IUnknown { @@ -1627,28 +1875,6 @@ [in] HWND hwnd); } -cpp_quote("EXTERN_C const CLSID CLSID_TaskbarList;") - -/***************************************************************************** - * IContextMenuCB interface - */ - -[ - object, - uuid(3409e930-5a39-11d1-83fa-00a0c90dc849), - pointer_default(unique) -] -interface IContextMenuCB : IUnknown -{ - HRESULT CallBack( - [in] IShellFolder *psf, - [in] HWND hwndOwner, - [in] IDataObject *pdtobj, - [in] UINT uMsg, - [in] WPARAM wParam, - [in] LPARAM lParam); -} - /***************************************************************************** * IDefaultExtractIconInit interface */ @@ -1678,27 +1904,6 @@ [in] LPCWSTR pszFile, [in] int iIcon); } - - -/***************************************************************************** - * IDockingWindow interface - */ -[ - uuid(012dd920-7b26-11d0-8ca9-00a0c92dbfe8), - object -] -interface IDockingWindow : IOleWindow -{ - HRESULT ShowDW([in] BOOL fShow); - - HRESULT CloseDW([in] DWORD dwReserved); - - HRESULT ResizeBorderDW( - [in] LPCRECT prcBorder, - [in] IUnknown* punkToolbarSite, - [in] BOOL fReserved); -} - /***************************************************************************** * IDeskBand interface @@ -2817,6 +3022,145 @@ cpp_quote("#endif /* _WIN32_IE_IE60 */") +cpp_quote("#ifdef MIDL_PASS") +typedef IUnknown* HIMAGELIST; +cpp_quote("#endif") + +typedef [v1_enum] enum THUMBBUTTONFLAGS { + THBF_ENABLED = 0x0000, + THBF_DISABLED = 0x0001, + THBF_DISMISSONCLICK = 0x0002, + THBF_NOBACKGROUND = 0x0004, + THBF_HIDDEN = 0x0008, + THBF_NONINTERACTIVE = 0x0010 +} THUMBBUTTONFLAGS; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONFLAGS)") + +typedef [v1_enum] enum THUMBBUTTONMASK { + THB_BITMAP = 0x0001, + THB_ICON = 0x0002, + THB_TOOLTIP = 0x0004, + THB_FLAGS = 0x0008 +} THUMBBUTTONMASK; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(THUMBBUTTONMASK)") + +cpp_quote("#include <pshpack8.h>") +typedef struct THUMBBUTTON { + THUMBBUTTONMASK dwMask; + UINT iId; + UINT iBitmap; + HICON hIcon; + WCHAR szTip[260]; + THUMBBUTTONFLAGS dwFlags; +} THUMBBUTTON, *LPTHUMBBUTTON; +cpp_quote("#include <poppack.h>") + +/***************************************************************************** + * ITaskbarList2 interface + */ +[ + object, + uuid(602D4995-B13A-429B-A66E-1935E44F4317), + pointer_default(unique) +] +interface ITaskbarList2 : ITaskbarList +{ + HRESULT MarkFullscreenWindow( + [in] HWND hwnd, + [in] BOOL fullscreen); +} + +[ + uuid(ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf), + object +] +interface ITaskbarList3 : ITaskbarList2 +{ + typedef [v1_enum] enum TBPFLAG { + TBPF_NOPROGRESS = 0x0000, + TBPF_INDETERMINATE = 0x0001, + TBPF_NORMAL = 0x0002, + TBPF_ERROR = 0x0004, + TBPF_PAUSED = 0x0008 + } TBPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(TBPFLAG)") + + HRESULT SetProgressValue( + [in] HWND hwnd, + [in] ULONGLONG ullCompleted, + [in] ULONGLONG ullTotal); + + HRESULT SetProgressState( + [in] HWND hwnd, + [in] TBPFLAG tbpFlags); + + HRESULT RegisterTab( + [in] HWND hwndTab, + [in] HWND hwndMDI); + + HRESULT UnregisterTab([in] HWND hwndTab); + + HRESULT SetTabOrder( + [in] HWND hwndTab, + [in] HWND hwndInsertBefore); + + HRESULT SetTabActive( + [in] HWND hwndTab, + [in] HWND hwndMDI, + [in] DWORD dwReserved); + + HRESULT ThumbBarAddButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarUpdateButtons( + [in] HWND hwnd, + [in] UINT cButtons, + [in, size_is(cButtons)] LPTHUMBBUTTON pButton); + + HRESULT ThumbBarSetImageList( + [in] HWND hwnd, + [in] HIMAGELIST himl); + + HRESULT SetOverlayIcon( + [in] HWND hwnd, + [in] HICON hIcon, + [in, unique, string] LPCWSTR pszDescription); + + HRESULT SetThumbnailTooltip( + [in] HWND hwnd, + [in, unique, string] LPCWSTR pszTip); + + HRESULT SetThumbnailClip( + [in] HWND hwnd, + [in] RECT *prcClip); +} + +[ + uuid(c43dc798-95d1-4bea-9030-bb99e2983a1a), + object +] +interface ITaskbarList4 : ITaskbarList3 +{ + typedef [v1_enum] enum STPFLAG { + STPF_NONE = 0x0000, + STPF_USEAPPTHUMBNAILALWAYS = 0x0001, + STPF_USEAPPTHUMBNAILWHENACTIVE = 0x0002, + STPF_USEAPPPEEKALWAYS = 0x0004, + STPF_USEAPPPEEKWHENACTIVE = 0x0008 + } STPFLAG; + + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(STPFLAG)") + + HRESULT SetTabProperties( + [in] HWND hwndTab, + [in] STPFLAG stpFlags); +} + /***************************************************************************** * IAutoCompleteDropDown interface */ @@ -2964,5 +3308,974 @@ HRESULT GetCurrentView( [in] REFIID riid, - [out, iid_is(riid)] IUnknown **ppv); -} + [out, iid_is(riid)] void **ppv); +} + +/***************************************************************************** + * INameSpaceTreeControl interface + */ +[ + object, + uuid(028212A3-B627-47E9-8856-C14265554E4F) +] +interface INameSpaceTreeControl : IUnknown +{ + [v1_enum] enum _NSTCSTYLE { + NSTCS_HASEXPANDOS = 0x00000001, + NSTCS_HASLINES = 0x00000002, + NSTCS_SINGLECLICKEXPAND = 0x00000004, + NSTCS_FULLROWSELECT = 0x00000008, + NSTCS_SPRINGEXPAND = 0x00000010, + NSTCS_HORIZONTALSCROLL = 0x00000020, + NSTCS_ROOTHASEXPANDO = 0x00000040, + NSTCS_SHOWSELECTIONALWAYS = 0x00000080, + NSTCS_NOINFOTIP = 0x00000200, + NSTCS_EVENHEIGHT = 0x00000400, + NSTCS_NOREPLACEOPEN = 0x00000800, + NSTCS_DISABLEDRAGDROP = 0x00001000, + NSTCS_NOORDERSTREAM = 0x00002000, + NSTCS_RICHTOOLTIP = 0x00004000, + NSTCS_BORDER = 0x00008000, + NSTCS_NOEDITLABELS = 0x00010000, + NSTCS_TABSTOP = 0x00020000, + NSTCS_FAVORITESMODE = 0x00080000, + NSTCS_AUTOHSCROLL = 0x00100000, + NSTCS_FADEINOUTEXPANDOS = 0x00200000, + NSTCS_EMPTYTEXT = 0x00400000, + NSTCS_CHECKBOXES = 0x00800000, + NSTCS_PARTIALCHECKBOXES = 0x01000000, + NSTCS_EXCLUSIONCHECKBOXES = 0x02000000, + NSTCS_DIMMEDCHECKBOXES = 0x04000000, + NSTCS_NOINDENTCHECKS = 0x08000000, + NSTCS_ALLOWJUNCTIONS = 0x10000000, + NSTCS_SHOWTABSBUTTON = 0x20000000, + NSTCS_SHOWDELETEBUTTON = 0x40000000, + NSTCS_SHOWREFRESHBUTTON = (int)0x80000000 + }; + typedef DWORD NSTCSTYLE; + + [v1_enum] enum _NSTCROOTSTYLE { + NSTCRS_VISIBLE = 0x0000, + NSTCRS_HIDDEN = 0x0001, + NSTCRS_EXPANDED = 0x0002 + }; + typedef DWORD NSTCROOTSTYLE; + + [v1_enum] enum _NSTCITEMSTATE { + NSTCIS_NONE = 0x0000, + NSTCIS_SELECTED = 0x0001, + NSTCIS_EXPANDED = 0x0002, + NSTCIS_BOLD = 0x0004, + NSTCIS_DISABLED = 0x0008, + NSTCIS_SELECTEDNOEXPAND = 0x0010 + }; + typedef DWORD NSTCITEMSTATE; + + typedef [v1_enum] enum NSTCGNI { + NSTCGNI_NEXT = 0, + NSTCGNI_NEXTVISIBLE = 1, + NSTCGNI_PREV = 2, + NSTCGNI_PREVVISIBLE = 3, + NSTCGNI_PARENT = 4, + NSTCGNI_CHILD = 5, + NSTCGNI_FIRSTVISIBLE = 6, + NSTCGNI_LASTVISIBLE = 7 + } NSTCGNI; + + HRESULT Initialize( + [in] HWND hwndParent, + [in, unique] RECT *prc, + [in] NSTCSTYLE nstcsFlags); + + HRESULT TreeAdvise( + [in] IUnknown *punk, + [out] DWORD *pdwCookie); + + HRESULT TreeUnadvise( + [in] DWORD dwCookie); + + HRESULT AppendRoot( + [in] IShellItem *psiRoot, + [in] SHCONTF grfEnumFlags, + [in] NSTCROOTSTYLE grfRootStyle, + [in, unique] IShellItemFilter *pif); + + HRESULT InsertRoot( + [in] int iIndex, + [in] IShellItem *psiRoot, + [in] SHCONTF grfEnumFlags, + [in] NSTCROOTSTYLE grfRootStyle, + [in, unique] IShellItemFilter *pif); + + HRESULT RemoveRoot( + [in] IShellItem *psiRoot); + + HRESULT RemoveAllRoots(); + + HRESULT GetRootItems( + [out] IShellItemArray **ppsiaRootItems); + + HRESULT SetItemState( + [in] IShellItem *psi, + [in] NSTCITEMSTATE nstcisMask, + [in] NSTCITEMSTATE nstcisFlags); + + HRESULT GetItemState( + [in] IShellItem *psi, + [in] NSTCITEMSTATE nstcismask, + [out] NSTCITEMSTATE *pnstcisFlags); + + HRESULT GetSelectedItems( + [out] IShellItemArray **psiaItems); + + HRESULT GetItemCustomState( + [in] IShellItem *psi, + [out] int *piStateNumber); + + HRESULT SetItemCustomState( + [in] IShellItem *psi, + [in] int iStateNumber); + + HRESULT EnsureItemVisible( + [in] IShellItem *psi); + + HRESULT SetTheme( + [in, string] LPCWSTR pszTheme); + + HRESULT GetNextItem( + [in, unique] IShellItem *psi, + [in] NSTCGNI nstcgi, + [out] IShellItem **ppsiNext); + + HRESULT HitTest( + [in] POINT *ppt, + [out] IShellItem **ppsiOut); + + HRESULT GetItemRect( + [in] IShellItem *psi, + [out] RECT *prect); + + HRESULT CollapseAll(); +} + +/***************************************************************************** + * INameSpaceTreeControl2 interface + */ +[ + object, + uuid(7CC7AED8-290E-49BC-8945-C1401CC9306C) +] +interface INameSpaceTreeControl2 : INameSpaceTreeControl +{ + typedef [v1_enum] enum NSTCSTYLE2 { + NSTCS2_DEFAULT = 0x00, + NSTCS2_INTERRUPTNOTIFICATIONS = 0x01, + NSTCS2_SHOWNULLSPACEMENU = 0x02, + NSTCS2_DISPLAYPADDING = 0x04, + NSTCS2_DISPLAYPINNEDONLY = 0x08, + NTSCS2_NOSINGLETONAUTOEXPAND = 0x10, /* The apparent typo here is */ + NTSCS2_NEVERINSERTNONENUMERATED = 0x20 /* present also in the Win SDK */ + } NSTCSTYLE2; + cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(NSTCSTYLE2)") + + HRESULT SetControlStyle( + [in] NSTCSTYLE nstcsMask, + [in] NSTCSTYLE nstcsStyle); + + HRESULT GetControlStyle( + [in] NSTCSTYLE nstcsMask, + [out] NSTCSTYLE *pnstcsStyle); + + HRESULT SetControlStyle2( + [in] NSTCSTYLE2 nstcsMask, + [in] NSTCSTYLE2 nstcsStyle); + + HRESULT GetControlStyle2( + [in] NSTCSTYLE2 nstcsMask, + [out] NSTCSTYLE2 *pnstcsStyle); +} + +/***************************************************************************** + * INameSpaceTreeControlEvents interface + */ + +[ + object, + uuid(93D77985-B3D8-4484-8318-672CDDA002CE), + local +] +interface INameSpaceTreeControlEvents : IUnknown +{ + [v1_enum] enum _NSTCEHITTEST { + NSTCEHT_NOWHERE = 0x0001, + NSTCEHT_ONITEMICON = 0x0002, + NSTCEHT_ONITEMLABEL = 0x0004, + NSTCEHT_ONITEMIDENT = 0x0008, + NSTCEHT_ONITEMBUTTON = 0x0010, + NSTCEHT_ONITEMRIGHT = 0x0020, + NSTCEHT_ONITEMSTATEICON = 0x0040, + NSTCEHT_ONITEM = 0x0046, + NSTCEHT_ONITEMTABBUTTON = 0x1000 + }; + typedef DWORD NSTCEHITTEST; + + [v1_enum] enum _NSTCECLICKTYPE { + NSTCECT_LBUTTON = 0x1, + NSTCECT_MBUTTON = 0x2, + NSTCECT_RBUTTON = 0x3, + NSTCECT_BUTTON = 0x3, + NSTCECT_DBLCLICK = 0x4 + }; + typedef DWORD NSTCECLICKTYPE; + + HRESULT OnItemClick( + [in] IShellItem *psi, + [in] NSTCEHITTEST nstceHitTest, + [in] NSTCECLICKTYPE nstceClickType); + + HRESULT OnPropertyItemCommit( + [in] IShellItem *psi); + + HRESULT OnItemStateChanging( + [in] IShellItem *psi, + [in] NSTCITEMSTATE nstcisMask, + [in] NSTCITEMSTATE nstcisState); + + HRESULT OnItemStateChanged( + [in] IShellItem *psi, + [in] NSTCITEMSTATE nstcisMask, + [in] NSTCITEMSTATE nstcisState); + + HRESULT OnSelectionChanged( + [in] IShellItemArray *psiaSelection); + + HRESULT OnKeyboardInput( + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT OnBeforeExpand( + [in] IShellItem *psi); + + HRESULT OnAfterExpand( + [in] IShellItem *psi); + + HRESULT OnBeginLabelEdit( + [in] IShellItem *psi); + + HRESULT OnEndLabelEdit( + [in] IShellItem *psi); + + HRESULT OnGetToolTip( + [in] IShellItem *psi, + [out, string, size_is(cchTip)] LPWSTR pszTip, + [in] int cchTip); + + HRESULT OnBeforeItemDelete( + [in] IShellItem *psi); + + HRESULT OnItemAdded( + [in] IShellItem *psi, + [in] BOOL fIsRoot); + + HRESULT OnItemDeleted( + [in] IShellItem *psi, + [in] BOOL fIsRoot); + + HRESULT OnBeforeContextMenu( + [in, unique] IShellItem *psi, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT OnAfterContextMenu( + [in] IShellItem *psi, + [in] IContextMenu *pcmIn, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT OnBeforeStateImageChange( + [in] IShellItem *psi); + + HRESULT OnGetDefaultIconIndex( + [in] IShellItem *psi, + [out] int *piDefaultIcon, + [out] int *piOpenIcon); +} +interface IFileDialog; + +typedef [v1_enum] enum FDE_OVERWRITE_RESPONSE +{ + FDEOR_DEFAULT = 0, + FDEOR_ACCCEP = 1, + FDEOR_REFUSE = 2 +} FDE_OVERWRITE_RESPONSE; + +typedef [v1_enum] enum FDE_SHAREVIOLATION_RESPONSE +{ + FDESVR_DEFAULT = 0, + FDESVR_ACCEPT = 1, + FDESVR_REFUSE = 2 +} FDE_SHAREVIOLATION_RESPONSE; + +/***************************************************************************** + * IFileDialogEvents interface + */ +[ + object, + uuid(973510DB-7D7F-452B-8975-74A85828D354), + pointer_default(unique) +] +interface IFileDialogEvents : IUnknown +{ + HRESULT OnFileOk( + [in] IFileDialog *pfd); + + HRESULT OnFolderChanging( + [in] IFileDialog *pfd, + [in] IShellItem *psiFolder); + + HRESULT OnFolderChange( + [in] IFileDialog *pfd); + + HRESULT OnSelectionChange( + [in] IFileDialog *pfd); + + HRESULT OnShareViolation( + [in] IFileDialog *pfd, + [in] IShellItem *psi, + [out] FDE_SHAREVIOLATION_RESPONSE *pResponse); + + HRESULT OnTypeChange( + [in] IFileDialog *pfd); + + HRESULT OnOverwrite( + [in] IFileDialog *pfd, + [in] IShellItem *psi, + [out] FDE_OVERWRITE_RESPONSE *pResponse); +} + +/***************************************************************************** + * IModalWindow interface + */ +[ + object, + uuid(B4DB1657-70D7-485E-8E3E-6FCB5A5C1802), + pointer_default(unique) +] +interface IModalWindow : IUnknown +{ + [local] + HRESULT Show( + [in, unique] HWND hwndOwner); + + [call_as(Show)] + HRESULT RemoteShow( + [in, unique] HWND hwndOwner); +} + +typedef [v1_enum] enum FDAP +{ + FDAP_BOTTOM = 0, + FDAP_TOP = 1 +} FDAP; + +/***************************************************************************** + * IFileDialog interface + */ +[ + object, + uuid(42F85136-DB7E-439C-85F1-E4075D135FC8), + pointer_default(unique) +] +interface IFileDialog : IModalWindow +{ + [v1_enum] enum _FILEOPENDIALOGOPTIONS + { + FOS_OVERWRITEPROMPT = 0x00000002, + FOS_STRICTFILETYPES = 0x00000004, + FOS_NOCHANGEDIR = 0x00000008, + FOS_PICKFOLDERS = 0x00000020, + FOS_FORCEFILESYSTEM = 0x00000040, + FOS_ALLNONSTORAGEITEMS = 0x00000080, + FOS_NOVALIDATE = 0x00000100, + FOS_ALLOWMULTISELECT = 0x00000200, + FOS_PATHMUSTEXIST = 0x00000800, + FOS_FILEMUSTEXIST = 0x00001000, + FOS_CREATEPROMPT = 0x00002000, + FOS_SHAREAWARE = 0x00004000, + FOS_NOREADONLYRETURN = 0x00008000, + FOS_NOTESTFILECREATE = 0x00010000, + FOS_HIDEMRUPLACES = 0x00020000, + FOS_HIDEPINNEDPLACES = 0x00040000, + FOS_NODEREFERENCELINKS = 0x00100000, + FOS_DONTADDTORECENT = 0x02000000, + FOS_FORCESHOWHIDDEN = 0x10000000, + FOS_DEFAULTNOMINIMODE = 0x20000000, + FOS_FORCEPREVIEWPANEON = 0x40000000 + }; + typedef DWORD FILEOPENDIALOGOPTIONS; + + HRESULT SetFileTypes( + [in] UINT cFileTypes, + [in, size_is(cFileTypes)] const COMDLG_FILTERSPEC *rgFilterSpec); + + HRESULT SetFileTypeIndex( + [in] UINT iFileType); + + HRESULT GetFileTypeIndex( + [out] UINT *piFileType); + + HRESULT Advise( + [in] IFileDialogEvents *pfde, + [out] DWORD *pdwCookie); + + HRESULT Unadvise( + [in] DWORD dwCookie); + + HRESULT SetOptions( + [in] FILEOPENDIALOGOPTIONS fos); + + HRESULT GetOptions( + [in] FILEOPENDIALOGOPTIONS *pfos); + + HRESULT SetDefaultFolder( + [in] IShellItem *psi); + + HRESULT SetFolder( + [in] IShellItem *psi); + + HRESULT GetFolder( + [out] IShellItem **ppsi); + + HRESULT GetCurrentSelection( + [out] IShellItem **ppsi); + + HRESULT SetFileName( + [in, string] LPCWSTR pszName); + + HRESULT GetFileName( + [out, string] LPWSTR *pszName); + + HRESULT SetTitle( + [in, string] LPCWSTR pszTitle); + + HRESULT SetOkButtonLabel( + [in, string] LPCWSTR pszText); + + HRESULT SetFileNameLabel( + [in, string] LPCWSTR pszLabel); + + HRESULT GetResult( + [out] IShellItem **ppsi); + + HRESULT AddPlace( + [in] IShellItem *psi, + [in] FDAP fdap); + + HRESULT SetDefaultExtension( + [in, string] LPCWSTR pszDefaultExtension); + + HRESULT Close( + [in] HRESULT hr); + + HRESULT SetClientGuid( + [in] REFGUID guid); + + HRESULT ClearClientData(); + + HRESULT SetFilter( + [in] IShellItemFilter *pFilter); +} + +/***************************************************************************** + * IFileDialog2 interface + */ +[ + object, + uuid(61744FC7-85B5-4791-A9B0-272276309B13), + pointer_default(unique) +] +interface IFileDialog2 : IFileDialog +{ + HRESULT SetCancelButtonLabel( + [in] LPCWSTR pszLabel); + + HRESULT SetNavigationRoot( + [in] IShellItem *psi); +} + +/***************************************************************************** + * IFileOperationProgressSink interface + */ +[ + object, + uuid(04B0F1A7-9490-44BC-96E1-4296A31252E2), + pointer_default(unique) +] +interface IFileOperationProgressSink : IUnknown +{ + HRESULT StartOperations(); + + HRESULT FinishOperations( + [in] HRESULT hrResult); + + HRESULT PreRenameItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in, unique, string] LPCWSTR pszNewName); + + HRESULT PostRenameItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in, string] LPCWSTR pszNewName, + [in] HRESULT hrRename, + [in] IShellItem *psiNewlyCreated); + + HRESULT PreMoveItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName); + + HRESULT PostMoveItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName, + [in] HRESULT hrMove, + [in] IShellItem *psiNewlyCreated); + + HRESULT PreCopyItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName); + + HRESULT PostCopyItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName, + [in] HRESULT hrCopy, + [in] IShellItem *psiNewlyCreated); + + HRESULT PreDeleteItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem); + + HRESULT PostDeleteItem( + [in] DWORD dwFlags, + [in] IShellItem *psiItem, + [in] HRESULT hrDelete, + [in] IShellItem *psiNewlyCreated); + + HRESULT PreNewItem( + [in] DWORD dwFlags, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName); + + HRESULT PostNewItem( + [in] DWORD dwFlags, + [in] IShellItem *psiDestinationFolder, + [in, unique, string] LPCWSTR pszNewName, + [in, unique, string] LPCWSTR pszTemplateName, + [in] DWORD dwFileAttributes, + [in] HRESULT hrNew, + [in] IShellItem *psiNewItem); + + HRESULT UpdateProgress( + [in] UINT iWorkTotal, + [in] UINT iWorkSoFar); + + HRESULT ResetTimer(); + + HRESULT PauseTimer(); + + HRESULT ResumeTimer(); +} + +/***************************************************************************** + * IFileSaveDialog interface + */ +[ + object, + uuid(84BCCD23-5FDE-4CDB-AEA4-AF64B83D78AB), + pointer_default(unique) +] +interface IFileSaveDialog : IFileDialog +{ + HRESULT SetSaveAsItem( + [in] IShellItem *psi); + + HRESULT SetProperties( + [in] IPropertyStore *pStore); + + HRESULT SetCollectedProperties( + [in] IPropertyDescriptionList *pList, + [in] BOOL fAppendDefault); + + HRESULT GetProperties( + [in] IPropertyStore **ppStore); + + HRESULT ApplyProperties( + [in] IShellItem *psi, + [in] IPropertyStore *pStore, + [in, unique] HWND hwnd, + [in, unique] IFileOperationProgressSink *pSink); +} + + +/***************************************************************************** + * IFileOpenDialog interface + */ +[ + object, + uuid(D57C7288-D4AD-4768-BE02-9D969532D960), + pointer_default(unique) +] +interface IFileOpenDialog : IFileDialog +{ + HRESULT GetResults( + [out] IShellItemArray **ppenum); + + HRESULT GetSelectedItems( + [out] IShellItemArray **ppsai); +} + +typedef [v1_enum] enum tagKF_CATEGORY +{ + KF_CATEGORY_VIRTUAL = 0x00000001, + KF_CATEGORY_FIXED = 0x00000002, + KF_CATEGORY_COMMON = 0x00000003, + KF_CATEGORY_PERUSER = 0x00000004 +} KF_CATEGORY; + +typedef [v1_enum] enum tagKF_REDIRECTION_CAPABILITIES +{ + KF_REDIRECTION_CAPABILITIES_ALLOW_ALL = 0x000000ff, + KF_REDIRECTION_CAPABILITIES_REDIRECTABLE = 0x00000001, + KF_REDIRECTION_CAPABILITIES_DENY_ALL = 0x000fff00, + KF_REDIRECTION_CAPABILITIES_DENY_POLICY_REDIRECTED = 0x00000100, + KF_REDIRECTION_CAPABILITIES_DENY_POLICY = 0x00000200, + KF_REDIRECTION_CAPABILITIES_DENY_PERMISSIONS = 0x00000400 +} KF_REDIRECTION_CAPABILITIES; + +typedef [v1_enum] enum tagKF_DEFINITION_FLAGS +{ + KFDF_LOCAL_REDIRECT_ONLY = 0x00000002, + KFDF_ROAMABLE = 0x00000004, + KFDF_PRECREATE = 0x00000008, + KFDF_STREAM = 0x00000010, + KFDF_PUBLISHEXPANDEDPATH = 0x00000020 +} KF_DEFINITION_FLAGS; + +typedef struct tagKNOWNFOLDER_DEFINITION +{ + KF_CATEGORY category; + LPWSTR pszName; + LPWSTR pszDescription; + KNOWNFOLDERID fidParent; + LPWSTR pszRelativePath; + LPWSTR pszParsingName; + LPWSTR pszTooltip; + LPWSTR pszLocalizedName; + LPWSTR pszIcon; + LPWSTR pszSecurity; + DWORD dwAttributes; + KF_DEFINITION_FLAGS kfdFlags; + FOLDERTYPEID ftidType; +} KNOWNFOLDER_DEFINITION; + +[ + object, + uuid(3aa7af7e-9b36-420C-a8e3-f77d4674a488), + pointer_default(ref) +] +interface IKnownFolder : IUnknown +{ + HRESULT GetId( + [out] KNOWNFOLDERID *pkfid); + + HRESULT GetCategory( + [out] KF_CATEGORY *pCategory); + + HRESULT GetShellItem( + [in] DWORD dwFlags, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetPath( + [in] DWORD dwFlags, + [out, string] LPWSTR *ppszPath); + + HRESULT SetPath( + [in] DWORD dwFlags, + [in, string] LPCWSTR pszPath); + + HRESULT GetIDList( + [in] DWORD dwFlags, + [out] PIDLIST_ABSOLUTE *ppidl); + + HRESULT GetFolderType( + [out] FOLDERTYPEID *pftid); + + HRESULT GetRedirectionCapabilities( + [out] KF_REDIRECTION_CAPABILITIES *pCapabilities); + + HRESULT GetFolderDefinition( + [out] KNOWNFOLDER_DEFINITION *pKFD); +} + +typedef [v1_enum] enum tagKF_REDIRECT_FLAGS +{ + KF_REDIRECT_USER_EXCLUSIVE = 0x00000001, + KF_REDIRECT_COPY_SOURCE_DACL = 0x00000002, + KF_REDIRECT_OWNER_USER = 0x00000004, + KF_REDIRECT_SET_OWNER_EXPLICIT = 0x00000008, + KF_REDIRECT_CHECK_ONLY = 0x00000010, + KF_REDIRECT_WITH_UI = 0x00000020, + KF_REDIRECT_UNPIN = 0x00000040, + KF_REDIRECT_PIN = 0x00000080, + KF_REDIRECT_COPY_CONTENTS = 0x00000200, + KF_REDIRECT_DEL_SOURCE_CONTENTS = 0x00000400, + KF_REDIRECT_EXCLUDE_ALL_KNOWN_SUBFOLDERS = 0x00000800 +} KF_REDIRECT_FLAGS; + +[ + object, + uuid(8BE2D872-86AA-4d47-B776-32CCA40C7018), + pointer_default(ref) +] +interface IKnownFolderManager : IUnknown +{ + typedef [v1_enum] enum tagFFFP_MODE + { + FFFP_EXACTMATCH, + FFFP_NEARESTPARENTMATCH + } FFFP_MODE; + + HRESULT FolderIdFromCsidl( + [in] int nCsidl, + [out] KNOWNFOLDERID *pfid); + + HRESULT FolderIdToCsidl( + [in] REFKNOWNFOLDERID rfid, + [out] int *pnCsidl); + + HRESULT GetFolderIds( + [out, size_is(, *pCount)] KNOWNFOLDERID **ppKFId, + [in, out] UINT *pCount); + + HRESULT GetFolder( + [in] REFKNOWNFOLDERID rfid, + [out] IKnownFolder **ppkf); + + HRESULT GetFolderByName( + [in, string] LPCWSTR pszCanonicalName, + [out] IKnownFolder **ppkf); + + HRESULT RegisterFolder( + [in] REFKNOWNFOLDERID rfid, + [in] KNOWNFOLDER_DEFINITION const *pKFD); + + HRESULT UnregisterFolder( + [in] REFKNOWNFOLDERID rfid); + + HRESULT FindFolderFromPath( + [in, string] LPCWSTR pszPath, + [in] FFFP_MODE mode, + [out] IKnownFolder **ppkf); + + HRESULT FindFolderFromIDList( + [in] PCIDLIST_ABSOLUTE pidl, + [out] IKnownFolder **ppkf); + + HRESULT Redirect( + [in] REFKNOWNFOLDERID rfid, + [in, unique] HWND hwnd, + [in] KF_REDIRECT_FLAGS flags, + [in, unique, string] LPCWSTR pszTargetPath, + [in] UINT cFolders, + [in, size_is(cFolders), unique] KNOWNFOLDERID const *pExclusion, + [out, string] LPWSTR *ppszError); +} + +/* function for releasing structure returned from IKnownFolder::GetFolderDefinition */ +cpp_quote("static inline void FreeKnownFolderDefinitionFields(KNOWNFOLDER_DEFINITION *pKFD)") +cpp_quote("{") +cpp_quote(" CoTaskMemFree(pKFD->pszName);") +cpp_quote(" CoTaskMemFree(pKFD->pszDescription);") +cpp_quote(" CoTaskMemFree(pKFD->pszRelativePath);") +cpp_quote(" CoTaskMemFree(pKFD->pszParsingName);") +cpp_quote(" CoTaskMemFree(pKFD->pszTooltip);") +cpp_quote(" CoTaskMemFree(pKFD->pszLocalizedName);") +cpp_quote(" CoTaskMemFree(pKFD->pszIcon);") +cpp_quote(" CoTaskMemFree(pKFD->pszSecurity);") +cpp_quote("}") + +typedef [v1_enum] enum ASSOCIATIONLEVEL { + AL_MACHINE, + AL_EFFECTIVE, + AL_USER +} ASSOCIATIONLEVEL; + +typedef [v1_enum] enum ASSOCIATIONTYPE { + AT_FILEEXTENSION, + AT_URLPROTOCOL, + AT_STARTMENUCLIENT, + AT_MIMETYPE +} ASSOCIATIONTYPE; + +[ + object, + uuid(4e530b0a-e611-4c77-a3ac-9031d022281b), + pointer_default(unique) +] +interface IApplicationAssociationRegistration : IUnknown +{ + HRESULT QueryCurrentDefault( + [in, string] LPCWSTR pszQuery, + [in] ASSOCIATIONTYPE atQueryType, + [in] ASSOCIATIONLEVEL alQueryLevel, + [out, string] LPWSTR *ppszAssociation); + + HRESULT QueryAppIsDefault( + [in, string] LPCWSTR pszQuery, + [in] ASSOCIATIONTYPE atQueryType, + [in] ASSOCIATIONLEVEL alQueryLevel, + [in, string] LPCWSTR pszAppRegistryName, + [out] BOOL *pfDefault); + + HRESULT QueryAppIsDefaultAll( + [in] ASSOCIATIONLEVEL alQueryLevel, + [in, string] LPCWSTR pszAppRegistryName, + [out] BOOL* pfDefault); + + HRESULT SetAppAsDefault( + [in, string] LPCWSTR pszAppRegistryName, + [in, string] LPCWSTR pszSet, + [in] ASSOCIATIONTYPE atSetType); + + HRESULT SetAppAsDefaultAll( + [in, string] LPCWSTR pszAppRegistryName); + + HRESULT ClearUserAssociations(); +} + +[ + uuid(6332debf-87b5-4670-90c0-5e57b408a49e), + object, + pointer_default(unique) +] +interface ICustomDestinationList : IUnknown +{ + typedef [v1_enum] enum KNOWNDESTCATEGORY { + KDC_FREQUENT = 1, + KDC_RECENT + } KNOWNDESTCATEGORY; + + HRESULT SetAppID([in, string] LPCWSTR pszAppID); + + HRESULT BeginList( + [out] UINT *pcMinSlots, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT AppendCategory( + [in, string] LPCWSTR pszCategory, + [in] IObjectArray *poa); + + HRESULT AppendKnownCategory([in] KNOWNDESTCATEGORY category); + HRESULT AddUserTasks([in] IObjectArray *poa); + HRESULT CommitList(); + + HRESULT GetRemovedDestinations( + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT DeleteList([in, unique, string] LPCWSTR pszAppID); + HRESULT AbortList(); +} + +/***************************************************************************** + * ShellObjects typelibrary + */ +[ + uuid(50A7E9B1-70EF-11D1-B75A-00A0C90564FE), + lcid(0x0000), + version(1.0) +] +library ShellObjects +{ + [ + uuid(71F96385-DDD6-48D3-A0C1-AE06E8B055FB) + ] + coclass ExplorerBrowser + { + interface IExplorerBrowser; + } + + [ + uuid(DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7) + ] + coclass FileOpenDialog + { + interface IFileOpenDialog; + } + + [ + uuid(C0B4E2F3-BA21-4773-8DBA-335EC946EB8B) + ] + coclass FileSaveDialog + { + interface IFileSaveDialog; + } + + [ + uuid(AE054212-3535-4430-83ED-D501AA6680E6) + ] + coclass NamespaceTreeControl + { + interface INameSpaceTreeControl2; + } + + [ + uuid(4df0c730-df9d-4ae3-9153-aa6b82e9795a) + ] + coclass KnownFolderManager + { + interface IKnownFolderManager; + } + + [ + uuid(591209c7-767b-42b2-9fba-44ee4615f2c7) + ] + coclass ApplicationAssociationRegistration + { + interface IApplicationAssociationRegistration; + } + + [ + uuid(00021401-0000-0000-c000-000000000046) + ] + coclass ShellLink + { + interface IShellLinkW; + } + + [ + uuid(56fdf344-fd6d-11d0-958a-006097c9a090) + ] + coclass TaskbarList + { + interface ITaskbarList4; + } + + [ + uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) + ] + coclass DestinationList { + interface ICustomDestinationList; + } + +} Modified: trunk/reactos/include/psdk/shtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shtypes.idl?r… ============================================================================== --- trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shtypes.idl [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -80,6 +80,12 @@ } SHELLDETAILS, *LPSHELLDETAILS; cpp_quote("#include <poppack.h>") +typedef struct _COMDLG_FILTERSPEC +{ + [string] LPCWSTR pszName; + [string] LPCWSTR pszSpec; +} COMDLG_FILTERSPEC; + typedef [v1_enum] enum tagSHCOLSTATE { SHCOLSTATE_DEFAULT = 0, @@ -105,3 +111,27 @@ } SHCOLSTATE; typedef DWORD SHCOLSTATEF; + +typedef GUID KNOWNFOLDERID; + +cpp_quote("#if 0") +typedef KNOWNFOLDERID *REFKNOWNFOLDERID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID &") +cpp_quote("#else") +cpp_quote("#define REFKNOWNFOLDERID const KNOWNFOLDERID * __MIDL_CONST") +cpp_quote("#endif") + +typedef GUID FOLDERTYPEID; + +cpp_quote("#if 0") +typedef FOLDERTYPEID *REFFOLDERTYPEID; +cpp_quote("#endif") + +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID &") +cpp_quote("#else") +cpp_quote("#define REFFOLDERTYPEID const FOLDERTYPEID * __MIDL_CONST") +cpp_quote("#endif") Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=53… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Sep 23 23:12:53 2011 @@ -158,7 +158,6 @@ DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TF_DisplayAttributeMgr, 0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53); -DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs