Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 44176: Fix file dereference bug. Now we only dereference the file in one place after the section is created.
by arty＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: arty Date: Sun Nov 15 19:17:18 2009 New Revision: 44176 URL: http://svn.reactos.org/svn/reactos?rev=44176&view=rev Log: Fix file dereference bug. Now we only dereference the file in one place after the section is created. Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Sun Nov 15 19:17:18 2009 @@ -1630,6 +1630,7 @@ * Reference the file handle */ ObReferenceObject(FileObject); + Section->FileObject = FileObject; DPRINT("Getting original file size\n"); /* A hack: If we're cached, we can overcome deadlocking with the upper @@ -1655,7 +1656,6 @@ if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); return Status; } ASSERT(Status != STATUS_PENDING); @@ -1683,7 +1683,6 @@ if (MaximumSize.QuadPart == 0) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); return STATUS_FILE_INVALID; } @@ -1692,7 +1691,6 @@ if (Segment == NULL) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); return(STATUS_NO_MEMORY); } @@ -1762,7 +1760,6 @@ MmUnlockSectionSegment(Segment); - Section->FileObject = FileObject; Section->MaximumSize.QuadPart = MaximumSize.QuadPart; /* Extend file if section is longer */ @@ -1778,7 +1775,6 @@ { DPRINT1("Could not expand section\n"); ObDereferenceObject(Section); - ObDereferenceObject(FileObject); return Status; } }

1 0

[khornicek] 44175: - load font substitutes from both SysFontSubstitutes and FontSubstitutes registry keys - add a temporary workaround for font files mapping (compare file name instead of file index) - font selection now works
by khornicek＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: khornicek Date: Sun Nov 15 18:01:45 2009 New Revision: 44175 URL: http://svn.reactos.org/svn/reactos?rev=44175&view=rev Log: - load font substitutes from both SysFontSubstitutes and FontSubstitutes registry keys - add a temporary workaround for font files mapping (compare file name instead of file index) - font selection now works Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sun Nov 15 18:01:45 2009 @@ -482,6 +482,7 @@ void *data; size_t size; HANDLE file; + const char *filename; /* HACK see map_font_file */ }; static struct list mappings_list = LIST_INIT( mappings_list ); @@ -1013,7 +1014,7 @@ MultiByteToWideChar(CP_ACP, 0, str, -1, nc->name, len); } -static void LoadSubstList(void) +static void LoadSubstList(LPCSTR lpKey) { FontSubst *psub; HKEY hkey; @@ -1022,8 +1023,8 @@ LPVOID data; if(RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", - &hkey) == ERROR_SUCCESS) { + lpKey, + &hkey) == ERROR_SUCCESS) { RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &valuelen, &datalen, NULL, NULL); @@ -2937,7 +2938,8 @@ } DumpFontList(); - LoadSubstList(); + LoadSubstList("Software\\Microsoft\\Windows NT\\CurrentVersion\\SysFontSubstitutes"); + LoadSubstList("Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"); DumpSubstList(); LoadReplaceList(); update_reg_entries(); @@ -3004,9 +3006,11 @@ LIST_FOR_EACH_ENTRY( mapping, &mappings_list, struct font_mapping, entry ) { - if (mapping->volumeserial == hfi.dwVolumeSerialNumber && - mapping->indexhigh == hfi.nFileIndexHigh && - mapping->indexlow == hfi.nFileIndexLow ) +/* + HACK: check for filename until proper support for GetFileInformationByHandle + is implemented in our fs driver +*/ + if (!_stricmp(mapping->filename, name)) { mapping->refcount++; CloseHandle( file ); @@ -3031,6 +3035,7 @@ mapping->indexlow = hfi.nFileIndexLow; mapping->file = mapped_file; mapping->size = hfi.nFileSizeLow; + mapping->filename = name; list_add_tail( &mappings_list, &mapping->entry ); return mapping;

1 0

[tkreuzer] 44174: - Get rid of the MmGlobalKernelPageDirectory hack. It's not going to be used on amd64. Instead set up a total of 256 (1MB) shared PDPs in the PML4. - Partly implement phase 1 of MmArmInitSystem - Fix MiPteToAddress - Fix MmSystemRangeStart
by tkreuzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: tkreuzer Date: Sun Nov 15 17:10:52 2009 New Revision: 44174 URL: http://svn.reactos.org/svn/reactos?rev=44174&view=rev Log: - Get rid of the MmGlobalKernelPageDirectory hack. It's not going to be used on amd64. Instead set up a total of 256 (1MB) shared PDPs in the PML4. - Partly implement phase 1 of MmArmInitSystem - Fix MiPteToAddress - Fix MmSystemRangeStart Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sun Nov 15 17:10:52 2009 @@ -14,15 +14,15 @@ #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL #define MI_SESSION_VIEW_END (PVOID)0xFFFFF97FFF000000ULL #define MI_SESSION_SPACE_END (PVOID)0xFFFFF98000000000ULL - +#define MI_SYSTEM_PTE_START (PVOID)0xFFFFFAA000000000ULL #define MI_PAGED_POOL_START (PVOID)0xFFFFFA8000000000ULL - #define MI_NON_PAGED_SYSTEM_START_MIN 0xFFFFFAA000000000ULL #define MI_NONPAGED_POOL_END (PVOID)0xFFFFFAE000000000ULL - #define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME +#define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL +#define MI_NUMBER_SYSTEM_PTES 22000 PULONG64 FORCEINLINE @@ -68,7 +68,16 @@ } /* Convert a PTE into a corresponding address */ -#define MiPteToAddress(PTE) ((PVOID)((ULONG64)(PTE) << 9)) +PVOID +FORCEINLINE +MiPteToAddress(PMMPTE Pte) +{ + /* Use signed math */ + LONG64 Temp = (LONG64)Pte; + Temp <<= 25; + Temp >>= 16; + return (PVOID)Temp; +} //#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) //#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) @@ -78,6 +87,22 @@ #define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) #define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) #define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) + +/* We don't use these hacks */ +VOID +FORCEINLINE +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ + /* Nothing to do */ +} + +VOID +FORCEINLINE +MmInitGlobalKernelPageDirectory(VOID) +{ + /* Nothing to do */ +} + /// MIARM.H Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sun Nov 15 17:10:52 2009 @@ -5,12 +5,13 @@ * PURPOSE: Memory Manager Initialization for amd64 * * PROGRAMMERS: Timo kreuzer (timo.kreuzer(a)reactos.org) + * ReactOS Portable Systems Group */ /* INCLUDES ***************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #include "../ARM3/miarm.h" @@ -21,7 +22,7 @@ ULONG64 MmUserProbeAddress = 0x7FFFFFF0000ULL; PVOID MmHighestUserAddress = (PVOID)0x7FFFFFEFFFFULL; -PVOID MmSystemRangeStart = (PVOID)KSEG0_BASE; // FFFF080000000000 +PVOID MmSystemRangeStart = (PVOID)0xFFFF080000000000ULL; /* Size of session view, pool, and image */ ULONG64 MmSessionSize = MI_SESSION_SIZE; @@ -346,7 +347,7 @@ MmSystemViewSize); /* Use the default */ - MmNumberOfSystemPtes = 22000; + MmNumberOfSystemPtes = MI_NUMBER_SYSTEM_PTES; ASSERT(MiSessionViewEnd <= MiSessionImageStart); ASSERT(MmSessionBase <= MiSessionPoolStart); @@ -357,6 +358,7 @@ { ULONG64 PageFrameOffset; PMMPTE Pte, StartPte, EndPte; + MMPTE TmpPte; /* Get current directory base */ PageFrameOffset = ((PMMPTE)PXE_SELFMAP)->u.Hard.PageFrameNumber << PAGE_SHIFT; @@ -366,22 +368,54 @@ PsGetCurrentProcess()->Pcb.DirectoryTableBase[0] = PageFrameOffset; /* HACK: don't use freeldr debug print anymore */ - FrLdrDbgPrint = NoDbgPrint; +// FrLdrDbgPrint = NoDbgPrint; /* Clear user mode mappings in PML4 */ StartPte = MiAddressToPxe(0); EndPte = MiAddressToPxe(MmHighestUserAddress); + /* Loop the user mode PXEs */ for (Pte = StartPte; Pte <= EndPte; Pte++) { - /* Zero the pte */ - Pte->u.Long = 0; + /* Zero the PXE */ +// Pte->u.Long = 0; + } + + /* Setup a template PTE */ + TmpPte.u.Long = 0; + TmpPte.u.Flush.Valid = 1; + TmpPte.u.Flush.Write = 1; + + HyperTemplatePte = TmpPte; + + /* Create PDPTs (1MB total) for shared system address space */ + StartPte = MiAddressToPxe(MmSystemRangeStart); + EndPte = MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); + + /* Loop the system space PXEs */ + for (Pte = StartPte; Pte <= EndPte; Pte++) + { + /* Is the PXE already valid? */ + if (!Pte->u.Hard.Valid) + { + /* It's not Initialize it, creating a PDPT. */ + TmpPte.u.Flush.PageFrameNumber = MxGetNextPage(1); + *Pte = TmpPte; + + /* Zero the page. The PXE is the PTE for the PDPT. */ + RtlZeroMemory(MiPteToAddress(Pte), PAGE_SIZE); + } } /* Flush the TLB */ KeFlushCurrentTb(); - /* Setup debug mapping pte */ + /* Setup the mapping PTEs */ + MmFirstReservedMappingPte = MxGetPte((PVOID)MI_MAPPING_RANGE_START); + MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; + MmLastReservedMappingPte = MiAddressToPte((PVOID)MI_MAPPING_RANGE_END); + + /* Setup debug mapping PTE */ MmDebugPte = MxGetPte(MI_DEBUG_MAPPING); } @@ -500,12 +534,84 @@ MxGetPte(Address)->u.Long = 0; } -//DPRINT1("MmNonPagedPoolStart = %p, Pte=%p \n", MmNonPagedPoolStart, MiAddressToPte(MmNonPagedPoolStart)); /* Sanity check */ ASSERT(MiAddressToPte(MmNonPagedSystemStart) < MiAddressToPte(MmNonPagedPoolExpansionStart)); } + +PPHYSICAL_MEMORY_DESCRIPTOR +NTAPI +MmInitializeMemoryLimits(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PBOOLEAN IncludeType) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +MiBuildPhysicalMemoryBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + BOOLEAN IncludeType[LoaderMaximum]; + PPHYSICAL_MEMORY_RUN Run; + PULONG Bitmap; + ULONG Size, i; + + /* Instantiate memory that we don't consider RAM/usable */ + for (i = 0; i < LoaderMaximum; i++) IncludeType[i] = TRUE; + IncludeType[LoaderBad] = FALSE; + IncludeType[LoaderFirmwarePermanent] = FALSE; + IncludeType[LoaderSpecialMemory] = FALSE; + IncludeType[LoaderBBTMemory] = FALSE; + + /* Build the physical memory block */ + MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, IncludeType); + + /* Calculate size for the PFN bitmap */ + Size = (MmHighestPhysicalPage + sizeof(ULONG)) / sizeof(ULONG); + + /* Allocate the PFN bitmap */ + Bitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); + if (!Bitmap) + { + /* This is critical */ + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MmLowestPhysicalPage, + MmHighestPhysicalPage, + 0x101); + } + + /* Initialize it and clear all the bits to begin with */ + RtlInitializeBitMap(&MiPfnBitMap, Bitmap, MmHighestPhysicalPage + 1); + RtlClearAllBits(&MiPfnBitMap); + + /* Loop physical memory runs */ + for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) + { + /* Get the run */ + Run = &MmPhysicalMemoryBlock->Run[i]; + DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", + Run->BasePage << PAGE_SHIFT, + (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + + /* Make sure it has pages inside it */ + if (Run->PageCount) + { + /* Set the bits in the PFN bitmap */ + RtlSetBits(&MiPfnBitMap, Run->BasePage, Run->PageCount); + } + } +} + +VOID +NTAPI +MiBuildPagedPool(VOID) +{ + UNIMPLEMENTED; +} + NTSTATUS NTAPI @@ -543,11 +649,39 @@ } else if (Phase == 1) { + PMMPTE Pte; + ULONG OldCount; + PPHYSICAL_MEMORY_RUN Run; + + __debugbreak(); + /* The PFN database was created, restore the free descriptor */ *MxFreeDescriptor = MxOldFreeDescriptor; - ASSERT(FALSE); - + __debugbreak(); + + /* Initialize the nonpaged pool */ + InitializePool(NonPagedPool, 0); + +#if 0 + /* Create the system PTE space */ + Pte = MiAddressToPte(MI_SYSTEM_PTE_START); + MiInitializeSystemPtes(Pte, MmNumberOfSystemPtes, SystemPteSpace); + + /* Reserve system PTEs for zeroing PTEs and clear them */ + MiFirstReservedZeroingPte = MiReserveSystemPtes(MI_ZERO_PTES, + SystemPteSpace); + RtlZeroMemory(MiFirstReservedZeroingPte, MI_ZERO_PTES * sizeof(MMPTE)); + + /* Set the counter to maximum */ + MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; +#endif + + /* Build the physical memory block */ + MiBuildPhysicalMemoryBlock(LoaderBlock); + + /* Size up paged pool and build the shadow system page directory */ + MiBuildPagedPool(); } return STATUS_SUCCESS; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sun Nov 15 17:10:52 2009 @@ -22,9 +22,6 @@ /* GLOBALS *****************************************************************/ -ULONG64 MmGlobalKernelPageDirectory[512]; -ULONG Ke386GlobalPagesEnabled = 0; - /* PRIVATE FUNCTIONS *******************************************************/ @@ -434,84 +431,6 @@ return STATUS_UNSUCCESSFUL; } -VOID -NTAPI -MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) -{ - ULONG StartIndex, EndIndex, Index; - PMMPTE Pte; - - /* Sanity check */ - if (Address < MmSystemRangeStart) - { - KeBugCheck(0); - } - - /* Get pointer to the page directory to update */ - if (Process && Process != PsGetCurrentProcess()) - { -// Pte = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); - } - else - { - Pte = (PMMPTE)PXE_BASE; - } - - /* Update PML4 entries */ - StartIndex = VAtoPXI(Address); - EndIndex = VAtoPXI((ULONG64)Address + Size - 1); - for (Index = StartIndex; Index <= EndIndex; Index++) - { - if (Index != VAtoPXI(PXE_BASE)) - { - InterlockedCompareExchange64(&Pte[Index].u.Long, - MmGlobalKernelPageDirectory[Index], - 0); - if (!MiIsHyperspaceAddress(Pte)) - __invlpg((PVOID)((ULONG64)Index * PAGE_SIZE)); - } - } - - if (MiIsHyperspaceAddress(Pte)) - MmDeleteHyperspaceMapping((PVOID)PAGE_ROUND_DOWN(Pte)); -} - -VOID -INIT_FUNCTION -NTAPI -MmInitGlobalKernelPageDirectory(VOID) -{ - PULONG64 CurrentPageDirectory = (PULONG64)PXE_BASE; - MMPTE Pte; - ULONG i; - - /* Setup template pte */ - HyperTemplatePte.u.Long = 0; - HyperTemplatePte.u.Hard.Valid = 1; - HyperTemplatePte.u.Hard.Write = 1; - HyperTemplatePte.u.Hard.Dirty = 1; - HyperTemplatePte.u.Hard.Accessed = 1; - if (Ke386GlobalPagesEnabled) - HyperTemplatePte.u.Hard.Global = 1; - - for (i = VAtoPXI(MmSystemRangeStart); i < 512; i++) - { - if ((i < VAtoPXI(PTE_BASE) || i > VAtoPXI(PTE_TOP)) && - (i < VAtoPXI(HYPER_SPACE) || i > VAtoPXI(HYPER_SPACE_END)) && - MmGlobalKernelPageDirectory[i] == 0 && - CurrentPageDirectory[i] != 0) - { - Pte.u.Long = CurrentPageDirectory[i]; - if (Ke386GlobalPagesEnabled) - { - Pte.u.Hard.Global = 1; - CurrentPageDirectory[i] = Pte.u.Hard.Global; - } - MmGlobalKernelPageDirectory[i] = Pte.u.Hard.Global; - } - } -} - NTSTATUS NTAPI MmInitializeHandBuiltProcess(IN PEPROCESS Process,

1 0

[pschweitzer] 44173: Fixed no newline at end of file warning Renamed Ext2_fs.h to ext2_fs.h
by pschweitzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: pschweitzer Date: Sun Nov 15 15:19:22 2009 New Revision: 44173 URL: http://svn.reactos.org/svn/reactos?rev=44173&view=rev Log: Fixed no newline at end of file warning Renamed Ext2_fs.h to ext2_fs.h Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext2_fs.h - copied unchanged from r44171, branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h Removed: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -707,4 +707,5 @@ } return Status; -} +} + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -280,4 +280,5 @@ } return STATUS_SUCCESS; -} +} + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -1269,4 +1269,5 @@ } return bEmpty; -} +} + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -275,4 +275,5 @@ } return Status; -} +} + Removed: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h (removed) @@ -1,635 +1,0 @@ -/* - * linux/include/linux/ext2_fs.h - * - * Copyright (C) 1992, 1993, 1994, 1995 - * Remy Card (card(a)masi.ibp.fr) - * Laboratoire MASI - Institut Blaise Pascal - * Universite Pierre et Marie Curie (Paris VI) - * - * from - * - * linux/include/linux/minix_fs.h - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -#ifndef _LINUX_EXT2_FS_H -#define _LINUX_EXT2_FS_H - -#include <linux/types.h> - -/* - * The second extended filesystem constants/structures - */ - -/* - * Define EXT2FS_DEBUG to produce debug messages - */ -#undef EXT2FS_DEBUG - -/* - * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files - */ -#define EXT2_PREALLOCATE -#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 - -/* - * The second extended file system version - */ -#define EXT2FS_DATE "95/08/09" -#define EXT2FS_VERSION "0.5b" - -/* - * Debug code - */ -#ifdef EXT2FS_DEBUG -# define ext2_debug(f, a...) { \ - printk ("EXT2-fs DEBUG (%s, %d): %s:", \ - __FILE__, __LINE__, __FUNCTION__); \ - printk (f, ## a); \ - } -#else -//# define ext2_debug(f, a...) /**/ -#endif - -/* - * Special inode numbers - */ -#define EXT2_BAD_INO 1 /* Bad blocks inode */ -#define EXT2_ROOT_INO 2 /* Root inode */ -#define EXT2_ACL_IDX_INO 3 /* ACL inode */ -#define EXT2_ACL_DATA_INO 4 /* ACL inode */ -#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ -#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ - -/* First non-reserved inode for old ext2 filesystems */ -#define EXT2_GOOD_OLD_FIRST_INO 11 - -/* - * The second extended file system magic number - */ -#define EXT2_SUPER_MAGIC 0xEF53 - -/* - * Maximal count of links to a file - */ -#define EXT2_LINK_MAX 32000 - -/* - * Macro-instructions used to manage several block sizes - */ -#define EXT2_MIN_BLOCK_SIZE 1024 -#define EXT2_MAX_BLOCK_SIZE 4096 -#define EXT2_MIN_BLOCK_LOG_SIZE 10 -#ifdef __KERNEL__ -# define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) -#else -# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) -#endif -#define EXT2_ACLE_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_acl_entry)) -#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) -#ifdef __KERNEL__ -# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) -#else -# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) -#endif -#ifdef __KERNEL__ -#define EXT2_ADDR_PER_BLOCK_BITS(s) ((s)->u.ext2_sb.s_addr_per_block_bits) -#define EXT2_INODE_SIZE(s) ((s)->u.ext2_sb.s_inode_size) -#define EXT2_FIRST_INO(s) ((s)->u.ext2_sb.s_first_ino) -#else -#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ - EXT2_GOOD_OLD_INODE_SIZE : \ - (s)->s_inode_size) -#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ - EXT2_GOOD_OLD_FIRST_INO : \ - (s)->s_first_ino) -#endif - -/* - * Macro-instructions used to manage fragments - */ -#define EXT2_MIN_FRAG_SIZE 1024 -#define EXT2_MAX_FRAG_SIZE 4096 -#define EXT2_MIN_FRAG_LOG_SIZE 10 -#ifdef __KERNEL__ -# define EXT2_FRAG_SIZE(s) ((s)->u.ext2_sb.s_frag_size) -# define EXT2_FRAGS_PER_BLOCK(s) ((s)->u.ext2_sb.s_frags_per_block) -#else -# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) -# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) -#endif - -/* - * ACL structures - */ -struct ext2_acl_header /* Header of Access Control Lists */ -{ - __u32 aclh_size; - __u32 aclh_file_count; - __u32 aclh_acle_count; - __u32 aclh_first_acle; -}; - -struct ext2_acl_entry /* Access Control List Entry */ -{ - __u32 acle_size; - __u16 acle_perms; /* Access permissions */ - __u16 acle_type; /* Type of entry */ - __u16 acle_tag; /* User or group identity */ - __u16 acle_pad1; - __u32 acle_next; /* Pointer on next entry for the */ - /* same inode or on next free entry */ -}; - -/* - * Structure of a blocks group descriptor - */ -struct ext2_group_desc -{ - __u32 bg_block_bitmap; /* Blocks bitmap block */ - __u32 bg_inode_bitmap; /* Inodes bitmap block */ - __u32 bg_inode_table; /* Inodes table block */ - __u16 bg_free_blocks_count; /* Free blocks count */ - __u16 bg_free_inodes_count; /* Free inodes count */ - __u16 bg_used_dirs_count; /* Directories count */ - __u16 bg_pad; - __u32 bg_reserved[3]; -}; - -/* - * Macro-instructions used to manage group descriptors - */ -#ifdef __KERNEL__ -# define EXT2_BLOCKS_PER_GROUP(s) ((s)->u.ext2_sb.s_blocks_per_group) -# define EXT2_DESC_PER_BLOCK(s) ((s)->u.ext2_sb.s_desc_per_block) -# define EXT2_INODES_PER_GROUP(s) ((s)->u.ext2_sb.s_inodes_per_group) -# define EXT2_DESC_PER_BLOCK_BITS(s) ((s)->u.ext2_sb.s_desc_per_block_bits) -#else -# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) -# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) -# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) -#endif - -/* - * Constants relative to the data blocks - */ -#define EXT2_NDIR_BLOCKS 12 -#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS -#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) -#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) -#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) - -/* - * Inode flags - */ -#define EXT2_SECRM_FL 0x00000001 /* Secure deletion */ -#define EXT2_UNRM_FL 0x00000002 /* Undelete */ -#define EXT2_COMPR_FL 0x00000004 /* Compress file */ -#define EXT2_SYNC_FL 0x00000008 /* Synchronous updates */ -#define EXT2_IMMUTABLE_FL 0x00000010 /* Immutable file */ -#define EXT2_APPEND_FL 0x00000020 /* writes to file may only append */ -#define EXT2_NODUMP_FL 0x00000040 /* do not dump file */ -#define EXT2_NOATIME_FL 0x00000080 /* do not update atime */ -/* Reserved for compression usage... */ -#define EXT2_DIRTY_FL 0x00000100 -#define EXT2_COMPRBLK_FL 0x00000200 /* One or more compressed clusters */ -#define EXT2_NOCOMP_FL 0x00000400 /* Don't compress */ -#define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ -/* End compression flags --- maybe not all used */ -#define EXT2_BTREE_FL 0x00001000 /* btree format dir */ -#define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ - -#define EXT2_FL_USER_VISIBLE 0x00001FFF /* User visible flags */ -#define EXT2_FL_USER_MODIFIABLE 0x000000FF /* User modifiable flags */ - -/* - * ioctl commands - */ -#define EXT2_IOC_GETFLAGS _IOR('f', 1, long) -#define EXT2_IOC_SETFLAGS _IOW('f', 2, long) -#define EXT2_IOC_GETVERSION _IOR('v', 1, long) -#define EXT2_IOC_SETVERSION _IOW('v', 2, long) - -/* - * Structure of an inode on the disk - */ -struct ext2_inode { - __u16 i_mode; /* File mode */ - __u16 i_uid; /* Low 16 bits of Owner Uid */ - __u32 i_size; /* Size in bytes */ - __u32 i_atime; /* Access time */ - __u32 i_ctime; /* Creation time */ - __u32 i_mtime; /* Modification time */ - __u32 i_dtime; /* Deletion Time */ - __u16 i_gid; /* Low 16 bits of Group Id */ - __u16 i_links_count; /* Links count */ - __u32 i_blocks; /* Blocks count */ - __u32 i_flags; /* File flags */ - union { - struct { - __u32 l_i_reserved1; - } linux1; - struct { - __u32 h_i_translator; - } hurd1; - struct { - __u32 m_i_reserved1; - } masix1; - } osd1; /* OS dependent 1 */ - __u32 i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ - __u32 i_generation; /* File version (for NFS) */ - __u32 i_file_acl; /* File ACL */ - __u32 i_dir_acl; /* Directory ACL */ - __u32 i_faddr; /* Fragment address */ - union { - struct { - __u8 l_i_frag; /* Fragment number */ - __u8 l_i_fsize; /* Fragment size */ - __u16 i_pad1; - __u16 l_i_uid_high; /* these 2 fields */ - __u16 l_i_gid_high; /* were reserved2[0] */ - __u32 l_i_reserved2; - } linux2; - struct { - __u8 h_i_frag; /* Fragment number */ - __u8 h_i_fsize; /* Fragment size */ - __u16 h_i_mode_high; - __u16 h_i_uid_high; - __u16 h_i_gid_high; - __u32 h_i_author; - } hurd2; - struct { - __u8 m_i_frag; /* Fragment number */ - __u8 m_i_fsize; /* Fragment size */ - __u16 m_pad1; - __u32 m_i_reserved2[2]; - } masix2; - } osd2; /* OS dependent 2 */ - __le16 i_extra_isize; - __le16 i_pad1; -}; - -#define i_size_high i_dir_acl - -#if defined(__KERNEL__) || defined(__linux__) -#define i_reserved1 osd1.linux1.l_i_reserved1 -#define i_frag osd2.linux2.l_i_frag -#define i_fsize osd2.linux2.l_i_fsize -#define i_uid_low i_uid -#define i_gid_low i_gid -#define i_uid_high osd2.linux2.l_i_uid_high -#define i_gid_high osd2.linux2.l_i_gid_high -#define i_reserved2 osd2.linux2.l_i_reserved2 -#endif - -#ifdef __hurd__ -#define i_translator osd1.hurd1.h_i_translator -#define i_frag osd2.hurd2.h_i_frag; -#define i_fsize osd2.hurd2.h_i_fsize; -#define i_uid_high osd2.hurd2.h_i_uid_high -#define i_gid_high osd2.hurd2.h_i_gid_high -#define i_author osd2.hurd2.h_i_author -#endif - -#ifdef __masix__ -#define i_reserved1 osd1.masix1.m_i_reserved1 -#define i_frag osd2.masix2.m_i_frag -#define i_fsize osd2.masix2.m_i_fsize -#define i_reserved2 osd2.masix2.m_i_reserved2 -#endif - -/* - * File system states - */ -#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ -#define EXT2_ERROR_FS 0x0002 /* Errors detected */ - -/* - * Mount flags - */ -#define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */ -#define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */ -#define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */ -#define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ -#define EXT2_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */ -#define EXT2_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */ -#define EXT2_MOUNT_MINIX_DF 0x0080 /* Mimics the Minix statfs */ -#define EXT2_MOUNT_NO_UID32 0x0200 /* Disable 32-bit UIDs */ - -#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -#define set_opt(o, opt) o |= EXT2_MOUNT_##opt -#define test_opt(sb, opt) ((sb)->u.ext2_sb.s_mount_opt & \ - EXT2_MOUNT_##opt) -/* - * Maximal mount counts between two filesystem checks - */ -#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ -#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ - -/* - * Behaviour when detecting errors - */ -#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ -#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ -#define EXT2_ERRORS_PANIC 3 /* Panic */ -#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE - -/* - * Structure of the super block - */ -struct ext2_super_block { - __u32 s_inodes_count; /* Inodes count */ - __u32 s_blocks_count; /* Blocks count */ - __u32 s_r_blocks_count; /* Reserved blocks count */ - __u32 s_free_blocks_count; /* Free blocks count */ - __u32 s_free_inodes_count; /* Free inodes count */ - __u32 s_first_data_block; /* First Data Block */ - __u32 s_log_block_size; /* Block size */ - __s32 s_log_frag_size; /* Fragment size */ - __u32 s_blocks_per_group; /* # Blocks per group */ - __u32 s_frags_per_group; /* # Fragments per group */ - __u32 s_inodes_per_group; /* # Inodes per group */ - __u32 s_mtime; /* Mount time */ - __u32 s_wtime; /* Write time */ - __u16 s_mnt_count; /* Mount count */ - __s16 s_max_mnt_count; /* Maximal mount count */ - __u16 s_magic; /* Magic signature */ - __u16 s_state; /* File system state */ - __u16 s_errors; /* Behaviour when detecting errors */ - __u16 s_minor_rev_level; /* minor revision level */ - __u32 s_lastcheck; /* time of last check */ - __u32 s_checkinterval; /* max. time between checks */ - __u32 s_creator_os; /* OS */ - __u32 s_rev_level; /* Revision level */ - __u16 s_def_resuid; /* Default uid for reserved blocks */ - __u16 s_def_resgid; /* Default gid for reserved blocks */ - /* - * These fields are for EXT2_DYNAMIC_REV superblocks only. - * - * Note: the difference between the compatible feature set and - * the incompatible feature set is that if there is a bit set - * in the incompatible feature set that the kernel doesn't - * know about, it should refuse to mount the filesystem. - * - * e2fsck's requirements are more strict; if it doesn't know - * about a feature in either the compatible or incompatible - * feature set, it must abort and not try to meddle with - * things it doesn't understand... - */ - __u32 s_first_ino; /* First non-reserved inode */ - __u16 s_inode_size; /* size of inode structure */ - __u16 s_block_group_nr; /* block group # of this superblock */ - __u32 s_feature_compat; /* compatible feature set */ - __u32 s_feature_incompat; /* incompatible feature set */ - __u32 s_feature_ro_compat; /* readonly-compatible feature set */ - __u8 s_uuid[16]; /* 128-bit uuid for volume */ - char s_volume_name[16]; /* volume name */ - char s_last_mounted[64]; /* directory where last mounted */ - __u32 s_algorithm_usage_bitmap; /* For compression */ - /* - * Performance hints. Directory preallocation should only - * happen if the EXT2_COMPAT_PREALLOC flag is on. - */ - __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ - __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ - __u16 s_padding1; - __u32 s_reserved[204]; /* Padding to the end of the block */ -}; - -#ifdef __KERNEL__ -#define EXT2_SB(sb) (&((sb)->u.ext2_sb)) -#else -/* Assume that user mode programs are passing in an ext2fs superblock, not - * a kernel struct super_block. This will allow us to call the feature-test - * macros from user land. */ -#define EXT2_SB(sb) (sb) -#endif - -/* - * Codes for operating systems - */ -#define EXT2_OS_LINUX 0 -#define EXT2_OS_HURD 1 -#define EXT2_OS_MASIX 2 -#define EXT2_OS_FREEBSD 3 -#define EXT2_OS_LITES 4 - -/* - * Revision levels - */ -#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ -#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ - -#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV -#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV - -#define EXT2_GOOD_OLD_INODE_SIZE 128 - -/* - * Feature set definitions - */ - -#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) -#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) -#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) -#define EXT2_SET_COMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) -#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) -#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) -#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) -#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) -#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ - EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) - -#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 -#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 -#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 -#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 -#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010 -#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 -#define EXT2_FEATURE_COMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 -#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 -#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 -#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 -#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 -#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 -#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 -#define EXT3_FEATURE_INCOMPAT_META_BG 0x0010 -#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff - -#define EXT2_FEATURE_COMPAT_SUPP 0 -#define EXT2_FEATURE_INCOMPAT_SUPP EXT2_FEATURE_INCOMPAT_FILETYPE -#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ - EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ - EXT2_FEATURE_RO_COMPAT_BTREE_DIR) -#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP -#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP - -/* - * Default values for user and/or group using reserved blocks - */ -#define EXT2_DEF_RESUID 0 -#define EXT2_DEF_RESGID 0 - -/* - * Structure of a directory entry - */ -#define EXT2_NAME_LEN 255 - -struct ext2_dir_entry { - __u32 inode; /* Inode number */ - __u16 rec_len; /* Directory entry length */ - __u16 name_len; /* Name length */ - char name[EXT2_NAME_LEN]; /* File name */ -}; - -/* - * The new version of the directory entry. Since EXT2 structures are - * stored in intel byte order, and the name_len field could never be - * bigger than 255 chars, it's safe to reclaim the extra byte for the - * file_type field. - */ -struct ext2_dir_entry_2 { - __u32 inode; /* Inode number */ - __u16 rec_len; /* Directory entry length */ - __u8 name_len; /* Name length */ - __u8 file_type; - char name[EXT2_NAME_LEN]; /* File name */ -}; - -/* - * Ext2 directory file types. Only the low 3 bits are used. The - * other bits are reserved for now. - */ -enum { - EXT2_FT_UNKNOWN, - EXT2_FT_REG_FILE, - EXT2_FT_DIR, - EXT2_FT_CHRDEV, - EXT2_FT_BLKDEV, - EXT2_FT_FIFO, - EXT2_FT_SOCK, - EXT2_FT_SYMLINK, - EXT2_FT_MAX -}; - -/* - * EXT2_DIR_PAD defines the directory entries boundaries - * - * NOTE: It must be a multiple of 4 - */ -#define EXT2_DIR_PAD 4 -#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) -#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ - ~EXT2_DIR_ROUND) - -#ifdef __KERNEL__ -/* - * Function prototypes - */ - -/* - * Ok, these declarations are also in <linux/kernel.h> but none of the - * ext2 source programs needs to include it so they are duplicated here. - */ -# define NORET_TYPE /**/ -# define ATTRIB_NORET __attribute__((noreturn)) -# define NORET_AND noreturn, - -/* balloc.c */ -extern int ext2_bg_has_super(struct super_block *sb, int group); -extern unsigned long ext2_bg_num_gdb(struct super_block *sb, int group); -extern int ext2_new_block (struct inode *, unsigned long, - __u32 *, __u32 *, int *); -extern void ext2_free_blocks (struct inode *, unsigned long, - unsigned long); -extern unsigned long ext2_count_free_blocks (struct super_block *); -extern void ext2_check_blocks_bitmap (struct super_block *); -extern struct ext2_group_desc * ext2_get_group_desc(struct super_block * sb, - unsigned int block_group, - struct buffer_head ** bh); - -/* dir.c */ -extern int ext2_add_link (struct dentry *, struct inode *); -extern ino_t ext2_inode_by_name(struct inode *, struct dentry *); -extern int ext2_make_empty(struct inode *, struct inode *); -extern struct ext2_dir_entry_2 * ext2_find_entry (struct inode *,struct dentry *, struct page **); -extern int ext2_delete_entry (struct ext2_dir_entry_2 *, struct page *); -extern int ext2_empty_dir (struct inode *); -extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **); -extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *); - -/* fsync.c */ -extern int ext2_sync_file (struct file *, struct dentry *, int); -extern int ext2_fsync_inode (struct inode *, int); - -/* ialloc.c */ -extern struct inode * ext2_new_inode (const struct inode *, int); -extern void ext2_free_inode (struct inode *); -extern unsigned long ext2_count_free_inodes (struct super_block *); -extern void ext2_check_inodes_bitmap (struct super_block *); -extern unsigned long ext2_count_free (struct buffer_head *, unsigned); - -/* inode.c */ -extern void ext2_read_inode (struct inode *); -extern void ext2_write_inode (struct inode *, int); -extern void ext2_put_inode (struct inode *); -extern void ext2_delete_inode (struct inode *); -extern int ext2_sync_inode (struct inode *); -extern void ext2_discard_prealloc (struct inode *); -extern void ext2_truncate (struct inode *); - -/* ioctl.c */ -extern int ext2_ioctl (struct inode *, struct file *, unsigned int, - unsigned long); - -/* super.c */ -extern void ext2_error (struct super_block *, const char *, const char *, ...) - __attribute__ ((format (printf, 3, 4))); -extern NORET_TYPE void ext2_panic (struct super_block *, const char *, - const char *, ...) - __attribute__ ((NORET_AND format (printf, 3, 4))); -extern void ext2_warning (struct super_block *, const char *, const char *, ...) - __attribute__ ((format (printf, 3, 4))); -extern void ext2_update_dynamic_rev (struct super_block *sb); -extern void ext2_put_super (struct super_block *); -extern void ext2_write_super (struct super_block *); -extern int ext2_remount (struct super_block *, int *, char *); -extern struct super_block * ext2_read_super (struct super_block *,void *,int); -extern int ext2_statfs (struct super_block *, struct statfs *); - -/* - * Inodes and files operations - */ - -/* dir.c */ -extern struct file_operations ext2_dir_operations; - -/* file.c */ -extern struct inode_operations ext2_file_inode_operations; -extern struct file_operations ext2_file_operations; - -/* inode.c */ -extern struct address_space_operations ext2_aops; - -/* namei.c */ -extern struct inode_operations ext2_dir_inode_operations; - -/* symlink.c */ -extern struct inode_operations ext2_fast_symlink_inode_operations; - -#endif /* __KERNEL__ */ - -#endif /* _LINUX_EXT2_FS_H */ Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -229,4 +229,5 @@ /* unloading nls of utf8 */ UNLOAD_NLS(exit_nls_utf8); -} +} + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -396,4 +396,5 @@ return Status; } -#endif //(_WIN32_WINNT >= 0x0500) +#endif //(_WIN32_WINNT >= 0x0500) + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -117,4 +117,5 @@ } return Status; -} +} + Modified: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c [iso-8859-1] Sun Nov 15 15:19:22 2009 @@ -402,4 +402,5 @@ } return Status; -} +} +

1 0

[pschweitzer] 44172: Added the missing rbuild file. Previous commit message was : "Really imported Ext3Fsd from vendor branch. Added rbuild but commented out as it needs some work to build". Sorry for SVN mess.
by pschweitzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: pschweitzer Date: Sun Nov 15 13:20:13 2009 New Revision: 44172 URL: http://svn.reactos.org/svn/reactos?rev=44172&view=rev Log: Added the missing rbuild file. Previous commit message was : "Really imported Ext3Fsd from vendor branch. Added rbuild but commented out as it needs some work to build". Sorry for SVN mess. Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild (with props) Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild (added) +++ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild [iso-8859-1] Sun Nov 15 13:20:13 2009 @@ -1,0 +1,36 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ext3fsd" type="kernelmodedriver" installbase="system32/drivers" installname="Ext3Fsd.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <include base="ext3fsd">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <file>block.c</file> + <file>cleanup.c</file> + <file>close.c</file> + <file>cmcb.c</file> + <file>create.c</file> + <file>debug.c</file> + <file>devctl.c</file> + <file>dirctl.c</file> + <file>dispatch.c</file> + <file>except.c</file> + <file>fastio.c</file> + <file>fileinfo.c</file> + <file>flush.c</file> + <file>fsctl.c</file> + <file>init.c</file> + <file>linux.c</file> + <file>lock.c</file> + <file>memory.c</file> + <file>misc.c</file> + <file>nls.c</file> + <file>pnp.c</file> + <file>read.c</file> + <file>shutdown.c</file> + <file>volinfo.c</file> + <file>write.c</file> + <file>Ext3Fsd.rc</file> + +</module> Propchange: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 44171: Finally fixed all pierre-fsd branch build. It now builds. Nothing says if it works...
by pschweitzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: pschweitzer Date: Sun Nov 15 12:43:51 2009 New Revision: 44171 URL: http://svn.reactos.org/svn/reactos?rev=44171&view=rev Log: Finally fixed all pierre-fsd branch build. It now builds. Nothing says if it works... Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/COPYRIGHT.TXT (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/DDKBuild.bat (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/DIRS (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext2fsd.reg (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rc (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/FAQ.txt (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cleanup.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/close.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/create.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/debug.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/devctl.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dispatch.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/except.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/MAKEFILE (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/Sources (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/generic.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_w2K_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_w2K_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_wnet_AMD64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_wnet_AMD64/amd64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_wnet_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/objfre_wnet_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/recover.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3fsd.dsp (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3fsd.dsw (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fastio.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fileinfo.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fsctl.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/page.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/semaphore.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/uaccess.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/common.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ext2fs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/bit_spinlock.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/bitops.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/buffer_head.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/config.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/debugfs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/errno.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs_i.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs_sb.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_jbd.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/freezer.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/fs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/highmem.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/init.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/jbd.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/journal-head.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/kernel.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/kthread.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/list.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/lockdep.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/log2.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/magic.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/mm.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/module.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/mutex.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/nls.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/pagemap.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/poison.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/proc_fs.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/sched.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/slab.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/spinlock.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/stddef.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/string.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/time.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/timer.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/types.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/version.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ntifs.gnu.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/resource.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/MAKEFILE (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/Sources (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/jbd.dsp (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_w2K_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_w2K_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_wnet_AMD64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_wnet_AMD64/amd64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_wnet_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/objfre_wnet_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/recovery.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/replay.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/revoke.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/linux.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/lock.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/memory.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/misc.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/MAKEFILE (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/Sources (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_ascii.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_base.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1250.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1251.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1255.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp437.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp737.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp775.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp850.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp852.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp855.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp857.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp860.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp861.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp862.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp863.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp864.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp865.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp866.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp869.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp874.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp932.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp936.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp949.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp950.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_euc-jp.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-1.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-13.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-14.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-15.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-2.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-3.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-4.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-5.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-6.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-7.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-9.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-r.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-ru.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-u.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_utf8.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_w2K_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_w2K_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_wnet_AMD64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_wnet_AMD64/amd64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_wnet_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/objfre_wnet_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/notes.txt (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/read.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/readme.txt (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/resource.h (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/MAKEFILE (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/Sources (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_w2K_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_w2K_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_wnet_AMD64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_wnet_AMD64/amd64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_wnet_x86/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/objfre_wnet_x86/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c (with props) branches/pierre-fsd/drivers/filesystems/Ext3Fsd/win2k/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/win2k/fre/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/win2k/fre/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/winnet/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/winnet/fre/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/winnet/fre/amd64/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/winnet/fre/i386/ branches/pierre-fsd/drivers/filesystems/Ext3Fsd/write.c (with props) Modified: branches/pierre-fsd/drivers/filesystems/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/COPYRIGHT.TXT URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/DDKBuild.bat URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/DIRS URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext2fsd.reg URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/Ext3Fsd.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/FAQ.txt URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/block.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/close.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/cmcb.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/create.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/debug.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/devctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dirctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/except.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/MAKEFILE URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/Sources URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/generic.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3/recover.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3fsd.dsp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/ext3fsd.dsw URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/flush.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/page.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/semaphore.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/asm/uaccess.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/common.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ext2fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/Ext2_fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/bit_spinlock.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/bitops.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/buffer_head.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/config.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/debugfs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/errno.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs_i.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_fs_sb.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/ext3_jbd.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/freezer.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/highmem.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/init.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/jbd.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/journal-head.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/kernel.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/kthread.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/list.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/lockdep.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/log2.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/magic.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/mm.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/module.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/mutex.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/nls.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/pagemap.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/poison.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/proc_fs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/sched.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/slab.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/spinlock.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/string.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/time.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/timer.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/types.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/linux/version.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/ntifs.gnu.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/include/resource.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/init.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/MAKEFILE URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/Sources URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/jbd.dsp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/recovery.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/replay.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/jbd/revoke.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/linux.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/MAKEFILE URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/Sources URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_ascii.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_base.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1250.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1251.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp1255.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp437.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp737.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp775.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp850.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp852.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp855.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp857.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp860.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp861.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp862.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp863.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp864.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp865.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp866.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp869.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp874.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp932.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp936.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp949.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_cp950.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_euc-jp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-1.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-13.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-14.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-15.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-2.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-4.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-5.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-6.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-7.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_iso8859-9.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-r.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-ru.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_koi8-u.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/nls/nls_utf8.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/notes.txt URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/read.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/resource.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/MAKEFILE URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/sys/Sources URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Added: branches/pierre-fsd/drivers/filesystems/Ext3Fsd/write.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… Modified: branches/pierre-fsd/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/…

1 0

[pschweitzer] 44170: Import new ext3fsd from vendor branch
by pschweitzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: pschweitzer Date: Sun Nov 15 11:15:24 2009 New Revision: 44170 URL: http://svn.reactos.org/svn/reactos?rev=44170&view=rev Log: Import new ext3fsd from vendor branch Modified: vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE (contents, props changed) vendor/ext2fsd/Ext3Fsd/ext3/Sources (contents, props changed) vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE (contents, props changed) vendor/ext2fsd/Ext3Fsd/sys/Sources (contents, props changed) Modified: vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE?rev… ============================================================================== --- vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE [iso-8859-1] (original) +++ vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE [iso-8859-1] Sun Nov 15 11:15:24 2009 @@ -1,7 +1,7 @@ -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!INCLUDE $(NTMAKEENV)\makefile.def +# +# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source +# file to this component. This file merely indirects to the real make file +# that is shared by all the driver components of the Windows NT DDK +# + +!INCLUDE $(NTMAKEENV)\makefile.def Propchange: vendor/ext2fsd/Ext3Fsd/ext3/MAKEFILE ------------------------------------------------------------------------------ svn:eol-style = native Modified: vendor/ext2fsd/Ext3Fsd/ext3/Sources URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/ext3/Sources?rev=… ============================================================================== --- vendor/ext2fsd/Ext3Fsd/ext3/Sources [iso-8859-1] (original) +++ vendor/ext2fsd/Ext3Fsd/ext3/Sources [iso-8859-1] Sun Nov 15 11:15:24 2009 @@ -1,24 +1,24 @@ -# -# Sources for Ext2 file system driver for windows -# mattwu(a)163.com / http://ext2fsd.sf.net -# - -# Name and type of the output file: -MAJORCOMP=ext2fsd -MINORCOMP=ext3 - -TARGETNAME=ext3 -TARGETTYPE=LIBRARY -TARGETPATH=..\$(DDK_TARGET_OS)\$(DDKBUILDENV)\ - -# Creates a file used by Visual Studio to navigate the source code. -BROWSER_INFO=TRUE -RCNOFONTMAP=TRUE - -C_DEFINES = $(C_DEFINES) /D__KERNEL__ -DRIVERTYPE=FS - -INCLUDES=.;..;..\include;$(DRIVER_INC_PATH); - -# The source code: -SOURCES= generic.c recover.c +# +# Sources for Ext2 file system driver for windows +# mattwu(a)163.com / http://ext2fsd.sf.net +# + +# Name and type of the output file: +MAJORCOMP=ext2fsd +MINORCOMP=ext3 + +TARGETNAME=ext3 +TARGETTYPE=LIBRARY +TARGETPATH=..\$(DDK_TARGET_OS)\$(DDKBUILDENV)\ + +# Creates a file used by Visual Studio to navigate the source code. +BROWSER_INFO=TRUE +RCNOFONTMAP=TRUE + +C_DEFINES = $(C_DEFINES) /D__KERNEL__ +DRIVERTYPE=FS + +INCLUDES=.;..;..\include;$(DRIVER_INC_PATH); + +# The source code: +SOURCES= generic.c recover.c Propchange: vendor/ext2fsd/Ext3Fsd/ext3/Sources ------------------------------------------------------------------------------ svn:eol-style = native Modified: vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE?rev=… ============================================================================== --- vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE [iso-8859-1] (original) +++ vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE [iso-8859-1] Sun Nov 15 11:15:24 2009 @@ -1,7 +1,7 @@ -# -# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source -# file to this component. This file merely indirects to the real make file -# that is shared by all the driver components of the Windows NT DDK -# - -!INCLUDE $(NTMAKEENV)\makefile.def +# +# DO NOT EDIT THIS FILE!!! Edit .\sources. if you want to add a new source +# file to this component. This file merely indirects to the real make file +# that is shared by all the driver components of the Windows NT DDK +# + +!INCLUDE $(NTMAKEENV)\makefile.def Propchange: vendor/ext2fsd/Ext3Fsd/sys/MAKEFILE ------------------------------------------------------------------------------ svn:eol-style = native Modified: vendor/ext2fsd/Ext3Fsd/sys/Sources URL: http://svn.reactos.org/svn/reactos/vendor/ext2fsd/Ext3Fsd/sys/Sources?rev=4… ============================================================================== --- vendor/ext2fsd/Ext3Fsd/sys/Sources [iso-8859-1] (original) +++ vendor/ext2fsd/Ext3Fsd/sys/Sources [iso-8859-1] Sun Nov 15 11:15:24 2009 @@ -1,49 +1,49 @@ -# -# Sources for Ext2 file system driver for windows -# mattwu(a)163.com / http://ext2fsd.sf.net -# - -# Name and type of the output file: -TARGETNAME=ext2fsd -TARGETTYPE=DRIVER -TARGETPATH=..\$(DDK_TARGET_OS)\$(DDKBUILDENV) - -DRIVERTYPE=FS - -# Creates a file used by Visual Studio to navigate the source code. -BROWSER_INFO=TRUE -RCNOFONTMAP=TRUE - -C_DEFINES = $(C_DEFINES) /D__KERNEL__ -INCLUDES=..\include; -TARGETLIBS= $(TARGETPATH)\*\nlssup.lib \ - $(TARGETPATH)\*\jbd.lib \ - $(TARGETPATH)\*\ext3.lib - -# The source code: -SOURCES= ..\Ext3fsd.rc \ - ..\fastio.c \ - ..\memory.c \ - ..\close.c \ - ..\dirctl.c \ - ..\except.c \ - ..\read.c \ - ..\misc.c \ - ..\devctl.c \ - ..\volinfo.c \ - ..\lock.c \ - ..\cleanup.c \ - ..\block.c \ - ..\cmcb.c \ - ..\fileinfo.c \ - ..\dispatch.c \ - ..\init.c \ - ..\debug.c \ - ..\create.c \ - ..\fsctl.c \ - ..\pnp.c \ - ..\write.c \ - ..\flush.c \ - ..\shutdown.c \ - ..\nls.c \ - ..\linux.c +# +# Sources for Ext2 file system driver for windows +# mattwu(a)163.com / http://ext2fsd.sf.net +# + +# Name and type of the output file: +TARGETNAME=ext2fsd +TARGETTYPE=DRIVER +TARGETPATH=..\$(DDK_TARGET_OS)\$(DDKBUILDENV) + +DRIVERTYPE=FS + +# Creates a file used by Visual Studio to navigate the source code. +BROWSER_INFO=TRUE +RCNOFONTMAP=TRUE + +C_DEFINES = $(C_DEFINES) /D__KERNEL__ +INCLUDES=..\include; +TARGETLIBS= $(TARGETPATH)\*\nlssup.lib \ + $(TARGETPATH)\*\jbd.lib \ + $(TARGETPATH)\*\ext3.lib + +# The source code: +SOURCES= ..\Ext3fsd.rc \ + ..\fastio.c \ + ..\memory.c \ + ..\close.c \ + ..\dirctl.c \ + ..\except.c \ + ..\read.c \ + ..\misc.c \ + ..\devctl.c \ + ..\volinfo.c \ + ..\lock.c \ + ..\cleanup.c \ + ..\block.c \ + ..\cmcb.c \ + ..\fileinfo.c \ + ..\dispatch.c \ + ..\init.c \ + ..\debug.c \ + ..\create.c \ + ..\fsctl.c \ + ..\pnp.c \ + ..\write.c \ + ..\flush.c \ + ..\shutdown.c \ + ..\nls.c \ + ..\linux.c Propchange: vendor/ext2fsd/Ext3Fsd/sys/Sources ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 44169: Get rid of old ext3fsd
by pschweitzer＠svn.reactos.org 15 Nov '09

15 Nov '09

Author: pschweitzer Date: Sun Nov 15 11:02:06 2009 New Revision: 44169 URL: http://svn.reactos.org/svn/reactos?rev=44169&view=rev Log: Get rid of old ext3fsd Removed: branches/pierre-fsd/drivers/filesystems/ext3fsd/

1 0

[arty] 44168: Fix image sections. One of the last things needed before merging to trunk.
by arty＠svn.reactos.org 14 Nov '09

14 Nov '09

Author: arty Date: Sat Nov 14 23:55:29 2009 New Revision: 44168 URL: http://svn.reactos.org/svn/reactos?rev=44168&view=rev Log: Fix image sections. One of the last things needed before merging to trunk. Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/image.c Modified: branches/arty-newcc/ntoskrnl/include/internal/newmm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/newmm.h [iso-8859-1] Sat Nov 14 23:55:29 2009 @@ -1905,6 +1905,13 @@ ULONG AllocationAttributes, PFILE_OBJECT FileObject); +BOOLEAN +NTAPI +MmUnsharePageEntryImageSectionSegment +(PROS_SECTION_OBJECT Section, + PMM_SECTION_SEGMENT Segment, + PLARGE_INTEGER Offset); + NTSTATUS NTAPI MiAwaitPageOps(PMMSUPPORT AddressSpace, PMEMORY_AREA MemoryArea, PVOID BaseAddress); Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Sat Nov 14 23:55:29 2009 @@ -662,6 +662,7 @@ { ASSERT(FALSE); } + DPRINT("Allocated page %x\n", NewPage); /* * Copy the old page @@ -705,7 +706,10 @@ */ MmDeleteRmap(OldPage, Process, PAddress); MmInsertRmap(NewPage, Process, PAddress); - MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE); + if (MemoryArea->Type == MEMORY_AREA_IMAGE_SECTION) + MmUnsharePageEntryImageSectionSegment(Section, Segment, &Offset); + else + MmUnsharePageEntrySectionSegment(Section, Segment, &Offset, FALSE, FALSE); MmUnlockSectionSegment(Segment); DPRINT("Address 0x%.8X\n", Address); Modified: branches/arty-newcc/ntoskrnl/mm/section/image.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/image.c [iso-8859-1] Sat Nov 14 23:55:29 2009 @@ -86,13 +86,10 @@ MmUnsharePageEntryImageSectionSegment (PROS_SECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, - PLARGE_INTEGER Offset, - BOOLEAN Dirty, - BOOLEAN PageOut) + PLARGE_INTEGER Offset) { ULONG Entry; - - DPRINT("MmUnsharePageEntrySectionSegment(%p,%x)\n", Segment, Offset->u.LowPart); + SWAPENTRY SwapEntry; Entry = MiGetPageEntrySectionSegment(Segment, Offset); if (Entry == 0) @@ -127,48 +124,43 @@ SavedSwapEntry = MmGetSavedSwapEntryPage(Page); if (SavedSwapEntry == 0) { - if (!PageOut && (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED)) - { - /* - * FIXME: - * Try to page out this page and set the swap entry - * within the section segment. There exist no rmap entry - * for this page. The pager thread can't page out a - * page without a rmap entry. - */ - MiSetPageEntrySectionSegment(Segment, Offset, Entry); - } - else - { - MiSetPageEntrySectionSegment(Segment, Offset, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); - } - } - else - { if (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) { - if (!PageOut) - { - if (Dirty) - { - /* - * FIXME: - * We hold all locks. Nobody can do something with the current - * process and the current segment (also not within an other process). - */ - NTSTATUS Status; - Status = MmWriteToSwapPage(SavedSwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); - ASSERT(FALSE); - } - } - MiSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); - MmSetSavedSwapEntryPage(Page, 0); - } - MmReleasePageMemoryConsumer(MC_USER, Page); + // XXX + SwapEntry = MmAllocSwapPage(); + if (!SwapEntry) + { + // Out of swap space + ASSERT(FALSE); + } + MmWriteToSwapPage(SwapEntry, Page); + MiSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SwapEntry)); + } + else + MiSetPageEntrySectionSegment(Segment, Offset, 0); + MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); + } + else + { + if (Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) + { + /* + * FIXME: + * We hold all locks. Nobody can do something with the current + * process and the current segment (also not within an other process). + */ + NTSTATUS Status; + Status = MmWriteToSwapPage(SavedSwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", Status); + ASSERT(FALSE); + } + MiSetPageEntrySectionSegment(Segment, Offset, MAKE_SWAP_SSE(SavedSwapEntry)); + MmSetSavedSwapEntryPage(Page, 0); + MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); } else { @@ -181,7 +173,6 @@ { MiSetPageEntrySectionSegment(Segment, Offset, Entry); } - DPRINT("MmUnsharePageEntrySectionSegment(%p,%x) -> Done\n", Segment, Offset->u.LowPart); return(SHARE_COUNT_FROM_SSE(Entry) > 0); } @@ -209,7 +200,7 @@ BoundaryAddressMultiple.QuadPart = 0; - DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); + //DPRINT("Not Present: %p %p (%p-%p)\n", AddressSpace, Address, MemoryArea->StartingAddress, MemoryArea->EndingAddress); /* * There is a window between taking the page fault and locking the @@ -241,7 +232,6 @@ Entry = MiGetPageEntrySectionSegment(Segment, &Offset); HasSwapEntry = MmIsPageSwapEntry(Process, (PVOID)PAddress); - DPRINT("Entry %x HasSwapEntry %x Offset %x\n", Entry, HasSwapEntry, Offset.u.LowPart); if (Entry == 0 && !HasSwapEntry && Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart)) { @@ -263,12 +253,10 @@ { MmUnlockSectionSegment(Segment); MmReleasePageMemoryConsumer(MC_USER, Page); - DPRINT("Handled elsewhere\n"); + DPRINT("Release page %x\n", Page); return STATUS_SUCCESS; // We'll re-fault if we need more } } - - DPRINT("Entry %x\n", Entry); /* * Check if this page needs to be mapped COW @@ -299,6 +287,7 @@ { ASSERT(FALSE); } + DPRINT("Allocated page %x\n", Page); Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) @@ -314,7 +303,7 @@ 1); if (!NT_SUCCESS(Status)) { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); + DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); ASSERT(FALSE); return(Status); } @@ -337,7 +326,7 @@ MmLockPage(Page); } MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } @@ -354,6 +343,7 @@ MmUnlockSectionSegment(Segment); return Status; } + DPRINT("Allocated page %x\n", Page); MmLockAddressSpace(AddressSpace); Status = MmCreateVirtualMapping(Process, Address, @@ -363,7 +353,7 @@ if (!NT_SUCCESS(Status)) { MmReleasePageMemoryConsumer(MC_USER, Page); - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); + DPRINT("Release page %x\n", Page); MmUnlockSectionSegment(Segment); return(Status); } @@ -377,16 +367,14 @@ * Cleanup and release locks */ MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } /* * Get the entry corresponding to the offset within the section */ - DPRINT("MmNotPresentFaultSectionView -> MmGetPageEntrySectionSegment(%p, %x)\n", Segment, Offset); Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - DPRINT("Got entry %x\n", Entry); if (Entry == 0) { @@ -410,6 +398,7 @@ MmUnlockSectionSegment(Segment); return Status; } + DPRINT("Allocated page %x\n", Page); Status = MmCreateVirtualMapping(Process, Address, Attributes, @@ -419,6 +408,7 @@ { DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); MmLockAddressSpace(AddressSpace); MmUnlockSectionSegment(Segment); return Status; @@ -435,6 +425,7 @@ { DPRINT1("Unable to create virtual mapping\n"); MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); MmLockAddressSpace(AddressSpace); MmUnlockSectionSegment(Segment); return Status; @@ -462,7 +453,7 @@ MmLockPage(Page); } MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } else if (IS_SWAP_FROM_SSE(Entry)) @@ -473,7 +464,7 @@ MmLockPage(Page); } MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } else @@ -503,7 +494,7 @@ MmLockPage(Page); } MmUnlockSectionSegment(Segment); - DPRINT("Address 0x%.8X\n", Address); + //DPRINT("Address 0x%.8X\n", Address); return(STATUS_SUCCESS); } } @@ -558,7 +549,6 @@ /* * Get the section segment entry and the physical address. */ - DPRINT("MmPageOutSectionView -> MmGetPageEntrySectionSegment(%p, %x)\n", Context.Segment, Context.Offset); Entry = MiGetPageEntrySectionSegment(Context.Segment, &Context.Offset); if (!MmIsPagePresent(Process, Address)) { @@ -611,37 +601,12 @@ MiSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); } MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); } } - else if (!Context.Private && DirectMapped) - { - IO_STATUS_BLOCK IOSB; - - if (SwapEntry != 0) - { - DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n", - Address); - ASSERT(FALSE); - } - CcFlushCache - (FileObject->SectionObjectPointer, - &FileOffset, - PAGE_SIZE, - &IOSB); - Status = IOSB.Status; - if (!NT_SUCCESS(Status)) - { - DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status); - ASSERT(FALSE); - } - MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - MmspCompleteAndReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } else if (!Context.WasDirty && !DirectMapped && !Context.Private) { if (SwapEntry != 0) @@ -651,6 +616,7 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -668,6 +634,7 @@ ASSERT(FALSE); } MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); return(STATUS_SUCCESS); @@ -772,7 +739,6 @@ /* * Otherwise we have succeeded. */ - DPRINT("MM: Wrote section page 0x%.8X to swap!\n", Page << PAGE_SHIFT); MmSetSavedSwapEntryPage(Page, 0); if (Context.Segment->Image.Characteristics & IMAGE_SCN_MEM_SHARED) { @@ -781,6 +747,7 @@ else { MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); } if (Context.Private) @@ -1320,8 +1287,6 @@ &FileHeaderBuffer, &FileHeaderSize); - DPRINT("ExeFmtpReadFile %x\n", Status); - if (!NT_SUCCESS(Status)) return Status; @@ -1508,9 +1473,12 @@ return(Status); } + RtlZeroMemory(Section, sizeof(ROS_SECTION_OBJECT)); + /* * Initialize it */ + Section->FileObject = FileObject; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; @@ -1521,7 +1489,6 @@ ImageSectionObject = ExAllocatePoolWithTag(PagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); if (ImageSectionObject == NULL) { - ObDereferenceObject(FileObject); ObDereferenceObject(Section); DPRINT1("STATUS_NO_MEMORY"); return(STATUS_NO_MEMORY); @@ -1529,15 +1496,11 @@ RtlZeroMemory(ImageSectionObject, sizeof(MM_IMAGE_SECTION_OBJECT)); - DPRINT("ExeFmtpCreateImageSection %wZ\n", &FileObject->FileName); StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject); - DPRINT("Status %x\n", StatusExeFmt); if (!NT_SUCCESS(StatusExeFmt)) { - DPRINT("StatusExeFmt %08x\n", StatusExeFmt); ObDereferenceObject(Section); - ObDereferenceObject(FileObject); DPRINT1("StatusExeFmt %x\n", StatusExeFmt); return(StatusExeFmt); } @@ -1552,7 +1515,6 @@ if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); DPRINT1("Status %x\n", Status); return(Status); } @@ -1586,7 +1548,6 @@ if (Status != STATUS_SUCCESS) { ObDereferenceObject(Section); - ObDereferenceObject(FileObject); DPRINT1("Status %x\n", Status); return(Status); } @@ -1605,7 +1566,6 @@ Status = STATUS_SUCCESS; } - Section->FileObject = FileObject; //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(Status); @@ -1626,7 +1586,6 @@ Length = PAGE_ROUND_UP(Segment->Length.QuadPart); for (Offset.QuadPart = 0; Offset.QuadPart < Length; Offset.QuadPart += PAGE_SIZE) { - DPRINT("MmAlterViewAttributes -> MmGetPageEntrySectionSegment(%p, %x)\n", Segment, Offset.u.LowPart); Entry = MiGetPageEntrySectionSegment(Segment, &Offset); if (Entry) { @@ -1644,6 +1603,7 @@ MmFreeSwapPage(SavedSwapEntry); } MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT1("Release page %x\n", Page); } MiSetPageEntrySectionSegment(Segment,& Offset, 0); } @@ -1781,16 +1741,15 @@ PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) { ULONG Entry; - PFILE_OBJECT FileObject; SWAPENTRY SavedSwapEntry; - PMM_PAGEOP PageOp; - NTSTATUS Status; LARGE_INTEGER Offset; PROS_SECTION_OBJECT Section; PMM_SECTION_SEGMENT Segment; PMMSUPPORT AddressSpace; PEPROCESS Process; + DPRINT("MmFreeImagePage(%x,%x,%x,%d)\n", Address, Page, SwapEntry, Dirty); + AddressSpace = (PMMSUPPORT)Context; Process = MmGetAddressSpaceOwner(AddressSpace); @@ -1802,56 +1761,16 @@ Section = MemoryArea->Data.SectionData.Section; Segment = MemoryArea->Data.SectionData.Segment; - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - - while (PageOp) - { - MmUnlockSectionSegment(Segment); - MmUnlockAddressSpace(AddressSpace); - - Status = MmspWaitForPageOpCompletionEvent(PageOp); - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op, status = %x\n", Status); - ASSERT(FALSE); - } - - MmLockAddressSpace(AddressSpace); - MmLockSectionSegment(Segment); - MmspCompleteAndReleasePageOp(PageOp); - PageOp = MmCheckForPageOp(MemoryArea, NULL, NULL, Segment, Offset.QuadPart); - } - - DPRINT("MmFreeSectionPage -> MmGetPageEntrySectionSegment(%p, %x)\n", Segment, Offset.u.LowPart); Entry = MiGetPageEntrySectionSegment(Segment, &Offset); - /* - * For a dirty, datafile, non-private page mark it as dirty in the - * cache manager. - */ - if (Segment->Flags & MM_DATAFILE_SEGMENT) - { - if (Page == PFN_FROM_SSE(Entry) && Dirty) - { - IO_STATUS_BLOCK IOSB; - FileObject = MemoryArea->Data.SectionData.Section->FileObject; - LARGE_INTEGER ForNow; - ForNow.QuadPart = Segment->Image.FileOffset/*.QuadPart*/; - CcFlushCache - (FileObject->SectionObjectPointer, - &ForNow, - Segment->Length.u.LowPart, - &IOSB); - ASSERT(SwapEntry == 0); - } - } - if (SwapEntry != 0) { + DPRINT("SwapEntry %x\n", SwapEntry); MmFreeSwapPage(SwapEntry); } - else if (Page != 0) - { + if (Page != 0) + { + DPRINT("Page %x vs %x\n", PFN_FROM_SSE(Entry), Page); if (IS_SWAP_FROM_SSE(Entry) || Page != PFN_FROM_SSE(Entry)) { @@ -1861,16 +1780,19 @@ SavedSwapEntry = MmGetSavedSwapEntryPage(Page); if (SavedSwapEntry != 0) { + DPRINT("SavedSwapEntry %x\n", SavedSwapEntry); MmFreeSwapPage(SavedSwapEntry); MmSetSavedSwapEntryPage(Page, 0); } MmDeleteRmap(Page, Process, Address); MmReleasePageMemoryConsumer(MC_USER, Page); + DPRINT("Release page %x\n", Page); } else { + DPRINT("Unshare %x -> %x @ %08x%08x\n", Address, Page, Offset.HighPart, Offset.LowPart); MmDeleteRmap(Page, Process, Address); - MmUnsharePageEntryImageSectionSegment(Section, Segment, &Offset, Dirty, FALSE); + MmUnsharePageEntryImageSectionSegment(Section, Segment, &Offset); } } } @@ -1926,7 +1848,7 @@ PVOID ImageBaseAddress = 0; PROS_SECTION_OBJECT Section; - DPRINT("MiUnmapImageSection @ %x\n", BaseAddress); + //DPRINT("MiUnmapImageSection @ %x\n", BaseAddress); MemoryArea->DeleteInProgress = TRUE; MiAwaitPageOps(AddressSpace, MemoryArea, BaseAddress); @@ -1970,7 +1892,7 @@ { PVOID SBaseAddress = (PVOID) ((char*)ImageBaseAddress + (ULONG_PTR)SectionSegments[i].Image.VirtualAddress); - Status = MmUnmapViewOfSegment(AddressSpace, SBaseAddress); + Status = MiUnmapViewOfSectionSegment(AddressSpace, SBaseAddress); } } } @@ -1978,7 +1900,7 @@ /* Notify debugger */ if (ImageBaseAddress) DbgkUnMapViewOfSection(ImageBaseAddress); - DPRINT("MiUnmapImageSection Status %x ImageBase %x\n", Status, ImageBaseAddress); + //DPRINT("MiUnmapImageSection Status %x ImageBase %x\n", Status, ImageBaseAddress); return Status; }

1 0

[pschweitzer] 44167: Finally fixed all pierre-fsd branch build. It now builds. Nothing says if it works...
by pschweitzer＠svn.reactos.org 14 Nov '09

14 Nov '09

Author: pschweitzer Date: Sat Nov 14 20:26:19 2009 New Revision: 44167 URL: http://svn.reactos.org/svn/reactos?rev=44167&view=rev Log: Finally fixed all pierre-fsd branch build. It now builds. Nothing says if it works... Modified: branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild branches/pierre-fsd/dll/win32/shell32/folder_options.c branches/pierre-fsd/dll/win32/shell32/fprop.c branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc branches/pierre-fsd/dll/win32/shell32/shell32_main.h branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c branches/pierre-fsd/dll/win32/shell32/shresdef.h branches/pierre-fsd/dll/win32/syssetup/wizard.c branches/pierre-fsd/dll/win32/user32/windows/defwnd.c branches/pierre-fsd/dll/win32/user32/windows/message.c branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c branches/pierre-fsd/include/ndk/rtlfuncs.h Modified: branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/rpcrt4/rpc… ============================================================================== --- branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -16,6 +16,7 @@ <library>secur32</library> <library>iphlpapi</library> <library>ws2_32</library> + <library>ntdll</library> <library>pseh</library> <file>cproxy.c</file> <file>cpsf.c</file> Modified: branches/pierre-fsd/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/fo… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/folder_options.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -22,6 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (fprop); +#define MAX_PROPERTY_SHEET_PAGE (32) /// Folder Options: /// CLASSKEY = HKEY_CLASSES_ROOT\CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF} @@ -252,7 +253,12 @@ LPARAM lParam ) { - + switch(uMsg) + { + case WM_INITDIALOG: + InitializeFileTypesListCtrl(hwndDlg); + return TRUE; + } return FALSE; } @@ -264,7 +270,7 @@ PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[3]; HPROPSHEETPAGE hpage; - UINT num_pages = 0; + UINT num_pages = 0; WCHAR szOptions[100]; hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_GENERAL_DLG", FolderOptionsGeneralDlg, 0, NULL); @@ -278,14 +284,14 @@ hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_FILETYPES_DLG", FolderOptionsFileTypesDlg, 0, NULL); if (hpage) hppages[num_pages++] = hpage; - + szOptions[0] = L'\0'; - LoadStringW(hInst, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); - szOptions[99] = L'\0'; - + LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); + szOptions[(sizeof(szOptions)/sizeof(WCHAR))-1] = L'\0'; + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.dwFlags = PSH_NOCONTEXTHELP; pinfo.nPages = num_pages; pinfo.u3.phpage = hppages; pinfo.pszCaption = szOptions; @@ -334,7 +340,20 @@ Options_RunDLLCommon(hWnd, hInst, StrToIntW(cmd), nCmdShow); } - +static +DWORD WINAPI +CountFolderAndFiles(LPVOID lParam) +{ + WIN32_FIND_DATAW FindData; + HANDLE hFile; + UINT Length; + LPWSTR pOffset; + BOOL ret; + PFOLDER_PROPERTIES_CONTEXT pContext = (PFOLDER_PROPERTIES_CONTEXT) lParam; + + pOffset = PathAddBackslashW(pContext->szFolderPath); + if (!pOffset) + return 0; Length = pOffset - pContext->szFolderPath; Modified: branches/pierre-fsd/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/fp… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/fprop.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -699,6 +699,7 @@ UINT Length; DWORD dwName; int Pages; + CLSID clsid; pOffset = wcsrchr(wFileName, L'.'); @@ -804,10 +805,9 @@ wcscpy(wFileName, lpf); } - if (PathIsDirectoryW(wFileName) || strlenW(wFileName) == 3) - { - FIXME("directory / drive resources are missing\n"); - return FALSE; + if (PathIsDirectoryW(wFileName)) + { + return SH_ShowFolderProperties(wFileName); } if (wcslen(wFileName) == 3) Modified: branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -199,6 +199,27 @@ CHECKBOX "Spustit v oddìleném pamìovém prostoru", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Storno", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Obecné" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -721,6 +742,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -200,6 +200,28 @@ PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abbrechen", 2, 120, 124, 50, 15, WS_VISIBLE END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Typ:", 14004, 8, 35, 50, 10 + LTEXT "Dateiordner", 14005, 68, 35, 160, 10 + LTEXT "Ort:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Größe:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Inhalt:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Erstellt:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Schreibgeschützt", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Versteckt", 14022, 126, 150, 50, 10 +END + SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -723,6 +745,8 @@ IDS_PRINT_VERB "Drucken" IDS_PLAY_VERB "Abspielen" IDS_PREVIEW_VERB "Vorschau" + + IDS_FILE_FOLDER "%u Dateien, %u Ordner" IDS_PRINTERS "Drucker" IDS_FONTS "Schriftarten" IDS_INSTALLNEWFONT "Neue Schriftart installieren..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "ÅêôÝëåóç óå äéáöïñåôéêÞ ðåñéï÷Þ ìíÞìçò", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE PUSHBUTTON "¢êõñï", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 @@ -721,6 +742,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -198,6 +198,28 @@ PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 +END + SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -720,6 +742,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -101,7 +101,7 @@ BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Dossier:", IDD_FOLDER, 10, 152, 40, 12 + LTEXT "Dossier :", IDD_FOLDER, 10, 152, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP @@ -171,19 +171,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE - LTEXT "Type de la cible:", 14004, 8, 38, 64, 10 + LTEXT "Type de la cible :", 14004, 8, 38, 64, 10 LTEXT "", 14005, 78, 38, 142, 10 - LTEXT "Localisation de la cible:", 14006, 8, 58, 64, 10 + LTEXT "Localisation de la cible :", 14006, 8, 58, 64, 10 LTEXT "", 14007, 79, 58, 141, 10 - LTEXT "Cible:", 14008, 8, 77, 45, 10 + LTEXT "Cible :", 14008, 8, 77, 45, 10 EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL - LTEXT "Démarrer dans:", 14010, 8, 96, 57, 10 + LTEXT "Démarrer dans :", 14010, 8, 96, 57, 10 EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "Touche de raccourci:", 14014, 8, 115, 57, 10 + LTEXT "Touche de raccourci :", 14014, 8, 115, 57, 10 EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT - LTEXT "Exécuter:", 14016, 8, 134, 57, 10 + LTEXT "Exécuter :", 14016, 8, 134, 57, 10 EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL - LTEXT "C&ommentaire:", 14018, 8, 152, 57, 10 + LTEXT "C&ommentaire :", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "&Changer d'icône...", 14021, 84, 172, 70, 14, ES_LEFT @@ -203,28 +203,49 @@ PUSHBUTTON "Annuler", 2, 120, 124, 50, 15, WS_VISIBLE END -SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type de fichier:", 14004, 8, 35, 50, 10 + LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 + LTEXT "Dossier", 14005, 68, 35, 160, 10 + LTEXT "Localisation :", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Taille :", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contient :", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Créé :", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "Lectu&re-seule", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "Cac&hé", 14022, 126, 150, 50, 10 +END + +SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 LTEXT "Fichier", 14005, 68, 35, 160, 10 - LTEXT "Ouvrir avec:", 14006, 8, 53, 50, 10 + LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "Localisation:", 14008, 8, 72, 45, 10 + LTEXT "Localisation :", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Taille:", 14010, 8, 93, 45, 10 + LTEXT "Taille :", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Créé:", 14014, 8, 118, 45, 10 + LTEXT "Créé :", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Modifié:", 14016, 8, 140, 45, 10 + LTEXT "Modifié :", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Accédé:", 14018, 8, 160, 45, 10 + LTEXT "Accédé :", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributs:", 14020, 8, 189, 45, 10 + LTEXT "Attributs :", 14020, 8, 189, 45, 10 CHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10 CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 @@ -235,15 +256,15 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Version du fichier: ", 14000, 10, 10, 55, 10 + LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10 LTEXT "", 14001, 77, 10, 152, 10 - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Description : ", 14002, 10, 27, 45, 10 LTEXT "", 14003, 77, 27, 152, 10 - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "Copyright : ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Autres informations de version: ", 14006, 6, 70, 222, 115 - LTEXT "Nom de l'élément: ", 14007, 13, 82, 50, 10 - LTEXT "Valeur: ", 14008, 112, 82, 45, 10 + GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115 + LTEXT "Nom de l'élément : ", 14007, 13, 82, 50, 10 + LTEXT "Valeur : ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END @@ -254,23 +275,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Type :", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 LTEXT "Système de fichiers :", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Espace utilisé:", -1, 25, 90, 120, 10 + LTEXT "Espace utilisé :", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Espace libre:", -1, 25, 105, 70, 10 + LTEXT "Espace libre :", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacité:", -1, 25, 125, 80, 10 + LTEXT "Capacité :", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 @@ -314,12 +335,12 @@ CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10 LTEXT "Protéger mon ordinateur et mes données des activités des programmes non autorisés", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "L'utilisateur suivant:", 14002, 10, 100, 90, 10 - LTEXT "Nom d'utilisateur:", -1, 20, 118, 54, 10 + CHECKBOX "L'utilisateur suivant :", 14002, 10, 100, 90, 10 + LTEXT "Nom d'utilisateur :", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Mot de passe:", -1, 20, 143, 53, 10 + LTEXT "Mot de passe :", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP @@ -629,14 +650,14 @@ IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" - IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1' ?" IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" - IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s)?" - IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille?" - IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille?" - IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille?" - IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer?" - IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s) ?" + IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille ?" + IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille ?" + IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille ?" + IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer ?" + IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer ?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\n"\ "Si les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\n"\ @@ -645,9 +666,9 @@ /* message box strings */ IDS_RESTART_TITLE "Redémarrer" - IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur?" + IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS?" + IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes" Modified: branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -200,6 +200,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -723,6 +744,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -204,6 +204,27 @@ CHECKBOX "Uruchom w osobnym przedziale pamiêci", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Przerwij", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Rozszerzenie:", 14004, 8, 35, 50, 10 + LTEXT "Katalog", 14005, 68, 35, 160, 10 + LTEXT "Lokalizacja:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Rozmiar:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Zawiera:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Utworzony:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Tylko-do-odczytu", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Ukryty", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 Modified: branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -199,6 +199,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -722,6 +743,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -199,6 +199,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -722,6 +743,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -205,6 +205,27 @@ PUSHBUTTON "Prerui", 2, 120, 124, 50, 15, WS_VISIBLE END +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Veobecné" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Typ:", 14004, 8, 35, 50, 10 + LTEXT "Prieèinok", 14005, 68, 35, 160, 10 + LTEXT "Umiestnenie:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Ve¾kos:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Obsahuje:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Vytvorený:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Iba na èítanie", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Skrytý", 14022, 126, 150, 50, 10 +END + SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Veobecné" @@ -220,15 +241,15 @@ LTEXT "", 14009, 68, 72, 315, 10 LTEXT "Ve¾kos:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Vytvorené:", 14014, 8, 118, 45, 10 + LTEXT "Vytvorený:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Zmenené:", 14016, 8, 140, 45, 10 + LTEXT "Zmenený:", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Otvorené:", 14018, 8, 160, 45, 10 + LTEXT "Otvorený:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 LTEXT "Atribúty:", 14020, 8, 189, 45, 10 CHECKBOX "&Iba na èítanie", 14021, 58, 189, 67, 10 - CHECKBOX "S&krytý", 14022, 126, 189, 50, 10 + CHECKBOX "&Skrytý", 14022, 126, 189, 50, 10 CHECKBOX "&Archívny", 14023, 181, 189, 49, 10 END @@ -278,7 +299,7 @@ CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "Jednotka %s", 14010, 100, 170, 40, 10 + LTEXT "Jednotka %s", 14010, 100, 170, 45, 10 PUSHBUTTON "&Èistenie disku", 14011, 180, 175, 50, 15, WS_TABSTOP CHECKBOX "Uetri miesto na disku &kompresiou jednotky", 14012, 10, 205, 180, 10, WS_DISABLED CHECKBOX "&Povoli indexovanie pre tento disk, a zrýchli tak h¾adanie súborov", 14012, 10, 220, 225, 10, WS_DISABLED @@ -339,7 +360,7 @@ EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "&Maximálna ve¾kos (MB):", -1, 20, 105, 70, 10 RADIOBUTTON "Súbory nepremiestòova do &koa. Zmazané súbory hneï odstráni.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "Zobrazova &dialógové okno potvrdenia odstránenia", 14004, 20, 155, 140, 10, WS_TABSTOP + AUTOCHECKBOX "Zobrazova &dialógové okno potvrdenia odstránenia", 14004, 20, 155, 196, 10, WS_TABSTOP END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 @@ -564,13 +585,13 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Zmena ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "Názov súboru:", -1, 7, 14, 208, 10 + PUSHBUTTON "&Preh¾adáva...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Ikony:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 PUSHBUTTON "Zrui",IDCANCEL, 167, 181, 50, 14 @@ -692,9 +713,9 @@ IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< &Spä" - FCIDM_SHVIEW_NEW "&Nový" + FCIDM_SHVIEW_NEW "&Nový" FCIDM_SHVIEW_NEWFOLDER "&Prieèinok" - FCIDM_SHVIEW_NEWLINK "&Odkaz" + FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Monosti prieèinka" IDS_RECYCLEBIN_LOCATION "Umiestnenia Koa" //Recycle Bin Location IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" @@ -719,13 +740,15 @@ IDS_LNK_FILE "Odkaz" IDS_SYS_FILE "Systémový súbor" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" + IDS_OPEN_VERB "Otvori" + IDS_RUNAS_VERB "Spusti ako " + IDS_EDIT_VERB "Upravi" + IDS_FIND_VERB "Find" //Nájs, H¾ada, Vyh¾ada ??? + IDS_PRINT_VERB "Tlaèi" + IDS_PLAY_VERB "Prehra" + IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? + + IDS_FILE_FOLDER "súbory: %u, prieèinky: %u" IDS_PRINTERS "Tlaèiarne" IDS_FONTS "Písma" IDS_INSTALLNEWFONT "&Naintalova nové písmo..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -197,6 +197,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -720,6 +741,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -198,6 +198,27 @@ CHECKBOX "Çàïóñêàòè â îêðåì³é îáëàñò³ ïàì'ÿò³", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Ñêàñóâàòè", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 Modified: branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -1,30 +1,18 @@ /* - * Copyright 2002 Tisheng Chen - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * (Simplified Chinese resources) + * (¼òÌåÖÐÎÄ×ÊÔ´) + * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) + MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "´óÍ¼±ê(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "Ð¡Í¼±ê(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "ÁÐ±í(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "ÏêÏ¸ÐÅÏ¢(&D)", FCIDM_SHVIEW_REPORTVIEW END /* shellview background menu */ @@ -32,31 +20,31 @@ BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "²é¿´(&V)" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "´óÍ¼±ê(&G)", FCIDM_SHVIEW_BIGICON + MENUITEM "Ð¡Í¼±ê(&M)", FCIDM_SHVIEW_SMALLICON + MENUITEM "ÁÐ±í(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "ÏêÏ¸ÐÅÏ¢(&D)", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "ÅÅÁÐÍ¼±ê(&I)" BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 + MENUITEM "Ãû³Æ(&N)", 0x30 /* column 0 */ + MENUITEM "ÀàÐÍ(&T)", 0x32 /* column 2 */ + MENUITEM "´óÐ¡(&S)", 0x31 /* ... */ + MENUITEM "ÐÞ¸ÄÊ±¼ä(&D)", 0x33 MENUITEM SEPARATOR - MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "×Ô¶¯ÅÅÁÐ(&D)", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "ÅÅÁÐÍ¼±ê", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM "Ë¢ÐÂ", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR - MENUITEM "Paste", FCIDM_SHVIEW_INSERT - MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Õ³Ìù", FCIDM_SHVIEW_INSERT + MENUITEM "Õ³Ìù¿ì½Ý·½Ê½", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "ÊôÐÔ", FCIDM_SHVIEW_PROPERTIES END END @@ -66,16 +54,16 @@ POPUP "" BEGIN MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "´ò¿ª(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "¼ôÇÐ(&U)", FCIDM_SHVIEW_CUT + MENUITEM "¸´ÖÆ(&C)", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "´´½¨¿ì½Ý·½Ê½(&L)", FCIDM_SHVIEW_CREATELINK + MENUITEM "É¾³ý(&D)", FCIDM_SHVIEW_DELETE + MENUITEM "ÖØÃüÃû(&R)", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "ÊôÐÔ(&P)", FCIDM_SHVIEW_PROPERTIES END END @@ -84,8 +72,8 @@ CAPTION "Browse for Folder" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "È·¶¨", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "È¡Ïû", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 @@ -102,8 +90,8 @@ CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "È·¶¨", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "È¡Ïû", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END SHELL_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90 @@ -196,8 +184,29 @@ CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED - PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "È·¶¨", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -319,8 +328,8 @@ LTEXT "Password:", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP - PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP - PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "È·¶¨", 14007, 57, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "È¡Ïû", 14008, 122, 170, 60, 14, WS_TABSTOP END BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 @@ -349,8 +358,8 @@ LISTBOX 14002, 16 ,57, 230, 130, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP, WS_EX_STATICEDGE AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 - PUSHBUTTON "OK", 14005, 150, 236, 50, 14 - PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 + PUSHBUTTON "È·¶¨", 14005, 150, 236, 50, 14 + PUSHBUTTON "È¡Ïû", 14006, 206, 236, 50, 14 END FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 @@ -416,7 +425,7 @@ DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX @@ -437,7 +446,7 @@ ICON 45, 14344, 10, 10, 21, 20, SS_REALSIZECONTROL LTEXT "Are you sure you want to log off?", -1, 43, 11, 140, 22 DEFPUSHBUTTON "&Log Off", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 122, 40, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 122, 40, 60, 14 END DISCONNECT_DLG DIALOGEX 0, 0, 190, 60 @@ -448,7 +457,7 @@ ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 123, 40, 60, 14 END AUTOPLAY1_DLG DIALOGEX 0, 0, 227, 218 @@ -474,8 +483,8 @@ LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 - DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 96, 186, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 160, 186, 60, 14 END MIXED_CONTENT2_DLG DIALOGEX 0, 0, 227, 206 @@ -490,8 +499,8 @@ LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 - DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 96, 185, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 160, 185, 60, 14 END AUTOPLAY2_DLG DIALOGEX 0, 0, 227, 181 @@ -504,8 +513,8 @@ LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 - DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 94, 160, 60, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 159, 160, 60, 14 END SHUTDOWN_DLG DIALOGEX 0, 0, 211, 103 @@ -517,30 +526,30 @@ LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 - DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 + DEFPUSHBUTTON "È·¶¨", 1, 7, 82, 60, 14, WS_GROUP + PUSHBUTTON "È¡Ïû", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 END FORMAT_DLG DIALOGEX 50, 50, 184, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "¸ñÊ½»¯" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "¿ªÊ¼(&S)", IDOK, 53, 198, 60, 14 + PUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL, 118, 198, 60, 14 + LTEXT "ÈÝÁ¿(&P):", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "ÎÄ¼þÏµÍ³(&F)", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "·ÖÅäµ¥Ôª´óÐ¡(&A)", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "¾í±ê(&L)", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "¸ñÊ½»¯Ñ¡Ïî(&O)", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "¿ìËÙ¸ñÊ½»¯(&Q)", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "ÆôÓÃÑ¹Ëõ(&E)", 28675, 16, 152, 155, 10 END CHKDSK_DLG DIALOGEX 50, 50, 194, 120 @@ -559,16 +568,16 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "¸ü¸ÄÍ¼±ê" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "ÎÄ¼þÃû:", -1, 7, 14, 208, 10 + PUSHBUTTON "ä¯ÀÀ...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL LTEXT "Icons:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE - DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 - PUSHBUTTON "Cancel",IDCANCEL, 167, 181, 50, 14 + DEFPUSHBUTTON "È·¶¨",IDOK, 107, 181,50, 14 + PUSHBUTTON "È¡Ïû",IDCANCEL, 167, 181, 50, 14 END STRINGTABLE DISCARDABLE @@ -599,17 +608,17 @@ IDS_SHV_COLUMN_MODEL "Model" /* special folders */ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" - IDS_RECYCLEBIN_FOLDER_NAME "Trash" - IDS_CONTROLPANEL "Control Panel" + IDS_DESKTOP "×ÀÃæ" + IDS_MYCOMPUTER "ÎÒµÄµçÄÔ" + IDS_RECYCLEBIN_FOLDER_NAME "»ØÊÕÕ¾" + IDS_CONTROLPANEL "¿ØÖÆÃæ°å" IDS_ADMINISTRATIVETOOLS "Administrative Tools" /* context menus */ - IDS_VIEW_LARGE "Lar&ge Icons" - IDS_VIEW_SMALL "S&mall Icons" - IDS_VIEW_LIST "&List" - IDS_VIEW_DETAILS "&Details" + IDS_VIEW_LARGE "´óÍ¼±ê(&G)" + IDS_VIEW_SMALL "Ð¡Í¼±ê(&M)" + IDS_VIEW_LIST "ÁÐ±í(&L)" + IDS_VIEW_DETAILS "ÏêÏ¸ÐÅÏ¢(&D)" IDS_SELECT "Select" IDS_OPEN "Open" IDS_CREATELINK "´´½¨¿ì½Ý·½Ê½(&L)" @@ -641,14 +650,14 @@ "the folder?" /* message box strings */ - IDS_RESTART_TITLE "Restart" - IDS_RESTART_PROMPT "Do you want to restart the system?" - IDS_SHUTDOWN_TITLE "Shutdown" - IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_RESTART_TITLE "ÖØÐÂÆô¶¯" + IDS_RESTART_PROMPT "ÊÇ·ñÖØÐÂÆô¶¯ÏµÍ³?" + IDS_SHUTDOWN_TITLE "¹Ø»ú" + IDS_SHUTDOWN_PROMPT "ÊÇ·ñ¹Ø±ÕÏµÍ³?" /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programs" - IDS_PERSONAL "My Documents" + IDS_PERSONAL "ÎÒµÄÎÄµµ" IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" IDS_RECENT "Recent" @@ -674,7 +683,7 @@ IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_NETWORKPLACE "My Network Places" + IDS_NETWORKPLACE "ÍøÉÏÁÚ¾Ó" IDS_NEWFOLDER "New Folder" @@ -682,18 +691,17 @@ IDS_DRIVE_CDROM "CDROM" IDS_DRIVE_NETWORK "Network Disk" - IDS_OPEN_WITH "Open With" - IDS_OPEN_WITH_CHOOSE "Select Program" + IDS_OPEN_WITH "´ò¿ª·½Ê½" + IDS_OPEN_WITH_CHOOSE "Ñ¡Ôñ³ÌÐò" IDS_SHELL_ABOUT_AUTHORS "&Authors" IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" - FCIDM_SHVIEW_NEWFOLDER "New &Folder" - FCIDM_SHVIEW_NEWLINK "New &Link" + FCIDM_SHVIEW_NEW "ÐÂ½¨" + FCIDM_SHVIEW_NEWFOLDER "ÎÄ¼þ¼Ð(&F)" + FCIDM_SHVIEW_NEWLINK "¿ì½Ý·½Ê½(&L)" IDS_FOLDER_OPTIONS "Folder Options" IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" IDS_RECYCLEBIN_DISKSPACE "Space Available" - IDS_EMPTY_BITBUCKET "Empty Recycle Bin" IDS_PICK_ICON_TITLE "Choose Icon" IDS_PICK_ICON_FILTER "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0" IDS_OPEN_WITH_FILTER "Executable Files\0*.exe\0" @@ -721,6 +729,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." @@ -728,4 +738,3 @@ IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" END -#pragma code_page(default) Modified: branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/la… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -198,6 +198,27 @@ CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", 2, 120, 124, 50, 15, WS_VISIBLE +END + +SHELL_FOLDER_GENERAL_DLG DIALOGEX 0, 0, 240, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE + EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY + LTEXT "Type of file:", 14004, 8, 35, 50, 10 + LTEXT "Folder", 14005, 68, 35, 160, 10 + LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "", 14007, 68, 53, 315, 10 + LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "", 14009, 68, 72, 315, 10 + LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "", 14011, 68, 93, 160, 10 + LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "", 14015, 68, 118, 160, 10 + AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -721,6 +742,8 @@ IDS_PRINT_VERB "Print" IDS_PLAY_VERB "Play" IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" IDS_PRINTERS "Printers" IDS_FONTS "Fonts" IDS_INSTALLNEWFONT "Install New Font..." Modified: branches/pierre-fsd/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/sh… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/shell32_main.h [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -238,4 +238,5 @@ BOOL SH_ShowDriveProperties(WCHAR * drive, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); BOOL SH_ShowRecycleBinProperties(WCHAR sDrive); BOOL SH_ShowPropertiesDialog(LPWSTR lpf, LPCITEMIDLIST pidlFolder, LPCITEMIDLIST * apidl); +BOOL SH_ShowFolderProperties(LPWSTR pwszFolder); #endif Modified: branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/sh… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/shfldr_mycomp.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -653,18 +653,20 @@ } else if (_ILIsDrive(pidl)) { + _ILSimpleGetTextW (pidl, pszPath, MAX_PATH); /* append my own path */ - /* long view "lw_name (C:)" */ if (!(dwFlags & SHGDN_FORPARSING)) { - DWORD dwVolumeSerialNumber, dwMaximumComponetLength, dwFileSystemFlags; WCHAR wszDrive[18] = {0}; + DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; static const WCHAR wszOpenBracket[] = {' ','(',0}; static const WCHAR wszCloseBracket[] = {')',0}; - GetVolumeInformationW (pszPath, wszDrive, - sizeof(wszDrive)/sizeof(wszDrive[0]) - 6, + lstrcpynW(wszDrive, pszPath, 4); + pszPath[0] = L'\0'; + GetVolumeInformationW (wszDrive, pszPath, + MAX_PATH - 7, &dwVolumeSerialNumber, &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); pszPath[MAX_PATH-1] = L'\0'; Modified: branches/pierre-fsd/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/shell32/sh… ============================================================================== --- branches/pierre-fsd/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -142,7 +142,7 @@ #define IDS_PRINT_VERB 304 #define IDS_PLAY_VERB 305 #define IDS_PREVIEW_VERB 306 - +#define IDS_FILE_FOLDER 307 #define IDS_CREATELINK 308 #define IDS_INSTALLNEWFONT 309 #define IDS_SHV_COLUMN_FONTTYPE 310 Modified: branches/pierre-fsd/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/syssetup/w… ============================================================================== --- branches/pierre-fsd/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -1812,6 +1812,7 @@ { PSETUPDATA SetupData; PREGISTRATIONNOTIFY RegistrationNotify; + static UINT oldActivityID = -1; WCHAR Title[64]; /* Retrieve pointer to the global setup data */ @@ -1863,7 +1864,10 @@ { WCHAR Activity[64]; RegistrationNotify = (PREGISTRATIONNOTIFY) lParam; - if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, + // update if necessary only + if (oldActivityID != RegistrationNotify->ActivityID) + { + if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, Activity, sizeof(Activity) / sizeof(Activity[0]))) { Modified: branches/pierre-fsd/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/win… ============================================================================== --- branches/pierre-fsd/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -682,6 +682,13 @@ DeleteObject(DesktopRgn); } } +#if 0 + if (ISITHOOKED(WH_CBT)) + { + if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, (LPARAM)&sizingRect, 0, FNID_DEFWINDOWPROC, FALSE)) + moved = FALSE; + } +#endif (void)NtUserSetGUIThreadHandle(MSQ_STATE_MOVESIZE, NULL); SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); @@ -761,6 +768,13 @@ WINDOWPLACEMENT wp; POINT Pt; +#if 0 + if (ISITHOOKED(WH_CBT)) + { + if (NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE)) + return 0; + } +#endif switch (wParam & 0xfff0) { case SC_MOVE: @@ -1451,7 +1465,8 @@ case WM_SHOWWINDOW: { - NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, NUMC_DEFWINDOWPROC, FALSE); + if (lParam) // Call when it is necessary. + NtUserMessageCall( hWnd, Msg, wParam, lParam, 0, FNID_DEFWINDOWPROC, FALSE); break; } Modified: branches/pierre-fsd/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/user32/win… ============================================================================== --- branches/pierre-fsd/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/user32/windows/message.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -1472,6 +1472,11 @@ MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg); return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.AnsiMsg; Conversion.Ansi = TRUE; Conversion.FinalMsg = lpMsg; @@ -1512,6 +1517,11 @@ { return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.UnicodeMsg; Conversion.Ansi = FALSE; Conversion.FinalMsg = lpMsg; @@ -1558,6 +1568,11 @@ MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg); return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.AnsiMsg; Conversion.Ansi = TRUE; Conversion.FinalMsg = lpMsg; @@ -1601,6 +1616,11 @@ { return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.UnicodeMsg; Conversion.Ansi = FALSE; Conversion.FinalMsg = lpMsg; @@ -1882,7 +1902,7 @@ wParam, lParam, (ULONG_PTR)&lpCallBack, - NUMC_SENDMESSAGECALLBACK, + FNID_SENDMESSAGECALLBACK, TRUE); } @@ -1904,7 +1924,7 @@ wParam, lParam, (ULONG_PTR)&lpCallBack, - NUMC_SENDMESSAGECALLBACK, + FNID_SENDMESSAGECALLBACK, FALSE); } @@ -2571,15 +2591,6 @@ return IsDialogMessageW( hwndDlg, &msg ); } -typedef struct _BROADCASTPARM -{ - DWORD flags; - DWORD recipients; - HDESK hDesk; - HWND hWnd; - LUID luid; -} BROADCASTPARM, *PBROADCASTPARM; - LONG WINAPI IntBroadcastSystemMessage( @@ -2647,7 +2658,7 @@ wParam, lParam, (ULONG_PTR)&parm, - NUMC_BROADCASTSYSTEMMESSAGE, + FNID_BROADCASTSYSTEMMESSAGE, Ansi); } Modified: branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/win32/ws2_32/mis… ============================================================================== --- branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ branches/pierre-fsd/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -313,7 +313,8 @@ UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -346,7 +347,8 @@ UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -402,7 +404,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -417,7 +420,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -476,6 +480,7 @@ { UNIMPLEMENTED + WSASetLastError(WSASYSCALLFAILURE); return FALSE; } @@ -491,7 +496,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -506,7 +512,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -539,6 +546,7 @@ { UNIMPLEMENTED + WSASetLastError(WSASYSCALLFAILURE); return INVALID_SOCKET; } @@ -554,7 +562,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -569,7 +578,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -610,7 +620,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -623,7 +634,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* WinSock Service Provider support functions */ @@ -641,7 +653,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -658,7 +671,7 @@ { UNIMPLEMENTED - return 0; + return WSASYSCALLFAILURE; } @@ -672,7 +685,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -688,7 +702,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -704,7 +719,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -721,7 +737,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -735,7 +752,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -752,7 +770,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -765,7 +784,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -779,7 +799,7 @@ { UNIMPLEMENTED - return 0; + return WSASYSCALLFAILURE; } /* @@ -796,9 +816,10 @@ LPDWORD lpcbBytesReturned, LPWSACOMPLETION lpCompletion) { - //UNIMPLEMENTED - - return 0; + UNIMPLEMENTED + + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } @@ -815,7 +836,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* @@ -828,32 +850,7 @@ { UNIMPLEMENTED - return 0; -} - -/* - * @unimplemented - */ -VOID -EXPORT -freeaddrinfo(struct addrinfo *pAddrInfo) -{ - UNIMPLEMENTED -} - -/* - * @unimplemented - */ -INT -EXPORT -getaddrinfo(const char FAR * nodename, - const char FAR * servname, - const struct addrinfo FAR * hints, - struct addrinfo FAR * FAR * res) -{ - UNIMPLEMENTED - - return EAI_NONAME; + return WSASYSCALLFAILURE; } /* @@ -871,7 +868,8 @@ { UNIMPLEMENTED - return 0; + WSASetLastError(WSASYSCALLFAILURE); + return SOCKET_ERROR; } /* @@ -889,7 +887,7 @@ { UNIMPLEMENTED - return 0; + return FALSE; } /* EOF */ Modified: branches/pierre-fsd/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ndk/rtlfuncs… ============================================================================== --- branches/pierre-fsd/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ndk/rtlfuncs.h [iso-8859-1] Sat Nov 14 20:26:19 2009 @@ -2681,6 +2681,7 @@ // Generic Table Functions // #if defined(NTOS_MODE_USER) || defined(_NTIFS_) +NTSYSAPI PVOID NTAPI RtlInsertElementGenericTable( @@ -2690,6 +2691,7 @@ OUT PBOOLEAN NewElement OPTIONAL ); +NTSYSAPI PVOID NTAPI RtlInsertElementGenericTableFull( @@ -2701,12 +2703,14 @@ IN TABLE_SEARCH_RESULT SearchResult ); +NTSYSAPI BOOLEAN NTAPI RtlIsGenericTableEmpty( IN PRTL_GENERIC_TABLE Table ); +NTSYSAPI PVOID NTAPI RtlLookupElementGenericTableFull(

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